diff --git a/addons/medical_gui/data/body_image/arm_left.paa b/addons/medical_gui/data/body_image/arm_left.paa index 245cc4ba316..02ab6a75879 100644 Binary files a/addons/medical_gui/data/body_image/arm_left.paa and b/addons/medical_gui/data/body_image/arm_left.paa differ diff --git a/addons/medical_gui/data/body_image/arm_left_b.paa b/addons/medical_gui/data/body_image/arm_left_b.paa index 9d4cefd89b5..232cf38e7d8 100644 Binary files a/addons/medical_gui/data/body_image/arm_left_b.paa and b/addons/medical_gui/data/body_image/arm_left_b.paa differ diff --git a/addons/medical_gui/data/body_image/arm_left_s.paa b/addons/medical_gui/data/body_image/arm_left_s.paa index 4c55e6143ea..f7e4d01b48d 100644 Binary files a/addons/medical_gui/data/body_image/arm_left_s.paa and b/addons/medical_gui/data/body_image/arm_left_s.paa differ diff --git a/addons/medical_gui/data/body_image/arm_left_t.paa b/addons/medical_gui/data/body_image/arm_left_t.paa index 0f8ac03f2e8..6ff23f9f524 100644 Binary files a/addons/medical_gui/data/body_image/arm_left_t.paa and b/addons/medical_gui/data/body_image/arm_left_t.paa differ diff --git a/addons/medical_gui/data/body_image/arm_lower_left_t.paa b/addons/medical_gui/data/body_image/arm_lower_left_t.paa new file mode 100644 index 00000000000..f2918488a1a Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_lower_left_t.paa differ diff --git a/addons/medical_gui/data/body_image/arm_lower_right_t.paa b/addons/medical_gui/data/body_image/arm_lower_right_t.paa new file mode 100644 index 00000000000..8455562548f Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_lower_right_t.paa differ diff --git a/addons/medical_gui/data/body_image/arm_right.paa b/addons/medical_gui/data/body_image/arm_right.paa index 2023d1e0b4c..36ce41183e3 100644 Binary files a/addons/medical_gui/data/body_image/arm_right.paa and b/addons/medical_gui/data/body_image/arm_right.paa differ diff --git a/addons/medical_gui/data/body_image/arm_right_b.paa b/addons/medical_gui/data/body_image/arm_right_b.paa index c5ae90dcbf5..2535aa2a9f2 100644 Binary files a/addons/medical_gui/data/body_image/arm_right_b.paa and b/addons/medical_gui/data/body_image/arm_right_b.paa differ diff --git a/addons/medical_gui/data/body_image/arm_right_s.paa b/addons/medical_gui/data/body_image/arm_right_s.paa index daff9d099e1..fb7861926f4 100644 Binary files a/addons/medical_gui/data/body_image/arm_right_s.paa and b/addons/medical_gui/data/body_image/arm_right_s.paa differ diff --git a/addons/medical_gui/data/body_image/arm_right_t.paa b/addons/medical_gui/data/body_image/arm_right_t.paa index 5e64adf0f24..ef1d4233571 100644 Binary files a/addons/medical_gui/data/body_image/arm_right_t.paa and b/addons/medical_gui/data/body_image/arm_right_t.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_left.paa b/addons/medical_gui/data/body_image/arm_upper_left.paa new file mode 100644 index 00000000000..d1952d7ee7c Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_left.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_left_b.paa b/addons/medical_gui/data/body_image/arm_upper_left_b.paa new file mode 100644 index 00000000000..dfa8516f70d Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_left_b.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_left_s.paa b/addons/medical_gui/data/body_image/arm_upper_left_s.paa new file mode 100644 index 00000000000..95e3eb56006 Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_left_s.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_right.paa b/addons/medical_gui/data/body_image/arm_upper_right.paa new file mode 100644 index 00000000000..eb85f1cc9f8 Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_right.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_right_b.paa b/addons/medical_gui/data/body_image/arm_upper_right_b.paa new file mode 100644 index 00000000000..a7d1284e69f Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_right_b.paa differ diff --git a/addons/medical_gui/data/body_image/arm_upper_right_s.paa b/addons/medical_gui/data/body_image/arm_upper_right_s.paa new file mode 100644 index 00000000000..59c751826c1 Binary files /dev/null and b/addons/medical_gui/data/body_image/arm_upper_right_s.paa differ diff --git a/addons/medical_gui/data/body_image/chest.paa b/addons/medical_gui/data/body_image/chest.paa new file mode 100644 index 00000000000..afd598b93ca Binary files /dev/null and b/addons/medical_gui/data/body_image/chest.paa differ diff --git a/addons/medical_gui/data/body_image/chest_s.paa b/addons/medical_gui/data/body_image/chest_s.paa new file mode 100644 index 00000000000..3cb157566fb Binary files /dev/null and b/addons/medical_gui/data/body_image/chest_s.paa differ diff --git a/addons/medical_gui/data/body_image/head.paa b/addons/medical_gui/data/body_image/head.paa index 77ddd995bc7..f3056bc21dc 100644 Binary files a/addons/medical_gui/data/body_image/head.paa and b/addons/medical_gui/data/body_image/head.paa differ diff --git a/addons/medical_gui/data/body_image/head_s.paa b/addons/medical_gui/data/body_image/head_s.paa index 9acf69a1558..69ac9547f18 100644 Binary files a/addons/medical_gui/data/body_image/head_s.paa and b/addons/medical_gui/data/body_image/head_s.paa differ diff --git a/addons/medical_gui/data/body_image/leg_left.paa b/addons/medical_gui/data/body_image/leg_left.paa index a1163052589..620ac0664c1 100644 Binary files a/addons/medical_gui/data/body_image/leg_left.paa and b/addons/medical_gui/data/body_image/leg_left.paa differ diff --git a/addons/medical_gui/data/body_image/leg_left_b.paa b/addons/medical_gui/data/body_image/leg_left_b.paa index f8780749959..65b5d68fdb4 100644 Binary files a/addons/medical_gui/data/body_image/leg_left_b.paa and b/addons/medical_gui/data/body_image/leg_left_b.paa differ diff --git a/addons/medical_gui/data/body_image/leg_left_s.paa b/addons/medical_gui/data/body_image/leg_left_s.paa index 1f25d44b819..9350ef48937 100644 Binary files a/addons/medical_gui/data/body_image/leg_left_s.paa and b/addons/medical_gui/data/body_image/leg_left_s.paa differ diff --git a/addons/medical_gui/data/body_image/leg_left_t.paa b/addons/medical_gui/data/body_image/leg_left_t.paa index 035586906d1..111426a0042 100644 Binary files a/addons/medical_gui/data/body_image/leg_left_t.paa and b/addons/medical_gui/data/body_image/leg_left_t.paa differ diff --git a/addons/medical_gui/data/body_image/leg_lower_left_t.paa b/addons/medical_gui/data/body_image/leg_lower_left_t.paa new file mode 100644 index 00000000000..aa274f284ec Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_lower_left_t.paa differ diff --git a/addons/medical_gui/data/body_image/leg_lower_right_t.paa b/addons/medical_gui/data/body_image/leg_lower_right_t.paa new file mode 100644 index 00000000000..2894ddf80d3 Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_lower_right_t.paa differ diff --git a/addons/medical_gui/data/body_image/leg_right.paa b/addons/medical_gui/data/body_image/leg_right.paa index 02ce66ba706..6dc2adfa024 100644 Binary files a/addons/medical_gui/data/body_image/leg_right.paa and b/addons/medical_gui/data/body_image/leg_right.paa differ diff --git a/addons/medical_gui/data/body_image/leg_right_b.paa b/addons/medical_gui/data/body_image/leg_right_b.paa index 3b0dc02605e..00cc8c4585b 100644 Binary files a/addons/medical_gui/data/body_image/leg_right_b.paa and b/addons/medical_gui/data/body_image/leg_right_b.paa differ diff --git a/addons/medical_gui/data/body_image/leg_right_s.paa b/addons/medical_gui/data/body_image/leg_right_s.paa index 4fcace26ed1..47000de784e 100644 Binary files a/addons/medical_gui/data/body_image/leg_right_s.paa and b/addons/medical_gui/data/body_image/leg_right_s.paa differ diff --git a/addons/medical_gui/data/body_image/leg_right_t.paa b/addons/medical_gui/data/body_image/leg_right_t.paa index 3a1f397e39b..18d5bdcbd32 100644 Binary files a/addons/medical_gui/data/body_image/leg_right_t.paa and b/addons/medical_gui/data/body_image/leg_right_t.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_left.paa b/addons/medical_gui/data/body_image/leg_upper_left.paa new file mode 100644 index 00000000000..fb32820907a Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_left.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_left_b.paa b/addons/medical_gui/data/body_image/leg_upper_left_b.paa new file mode 100644 index 00000000000..3a8cd9e1a1a Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_left_b.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_left_s.paa b/addons/medical_gui/data/body_image/leg_upper_left_s.paa new file mode 100644 index 00000000000..86930c689fc Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_left_s.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_right.paa b/addons/medical_gui/data/body_image/leg_upper_right.paa new file mode 100644 index 00000000000..dc8c197d8cc Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_right.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_right_b.paa b/addons/medical_gui/data/body_image/leg_upper_right_b.paa new file mode 100644 index 00000000000..eb1bc61a6df Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_right_b.paa differ diff --git a/addons/medical_gui/data/body_image/leg_upper_right_s.paa b/addons/medical_gui/data/body_image/leg_upper_right_s.paa new file mode 100644 index 00000000000..0b6ba7c013b Binary files /dev/null and b/addons/medical_gui/data/body_image/leg_upper_right_s.paa differ diff --git a/addons/medical_gui/data/body_image/neck.paa b/addons/medical_gui/data/body_image/neck.paa new file mode 100644 index 00000000000..09b0be46ef1 Binary files /dev/null and b/addons/medical_gui/data/body_image/neck.paa differ diff --git a/addons/medical_gui/data/body_image/neck_s.paa b/addons/medical_gui/data/body_image/neck_s.paa new file mode 100644 index 00000000000..46b758c2c29 Binary files /dev/null and b/addons/medical_gui/data/body_image/neck_s.paa differ diff --git a/addons/medical_gui/data/body_image/torso.paa b/addons/medical_gui/data/body_image/torso.paa index 0a7212ac957..2d0a8e965bb 100644 Binary files a/addons/medical_gui/data/body_image/torso.paa and b/addons/medical_gui/data/body_image/torso.paa differ diff --git a/addons/medical_gui/data/body_image/torso_s.paa b/addons/medical_gui/data/body_image/torso_s.paa index 58614f277fe..dac7145289c 100644 Binary files a/addons/medical_gui/data/body_image/torso_s.paa and b/addons/medical_gui/data/body_image/torso_s.paa differ diff --git a/addons/medical_gui/gui.hpp b/addons/medical_gui/gui.hpp index b7adf089456..d787218f132 100644 --- a/addons/medical_gui/gui.hpp +++ b/addons/medical_gui/gui.hpp @@ -28,11 +28,11 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class Neck: Background { idc = IDC_BODY_NECK; - text = QPATHTOF(data\body_image\head.paa); + text = QPATHTOF(data\body_image\neck.paa); }; class Chest: Background { idc = IDC_BODY_CHEST; - text = QPATHTOF(data\body_image\torso.paa); + text = QPATHTOF(data\body_image\chest.paa); }; class Torso: Background { idc = IDC_BODY_TORSO; @@ -44,7 +44,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class ArmUpperLeft: Background { idc = IDC_BODY_ARMUPPERLEFT; - text = QPATHTOF(data\body_image\arm_left.paa); + text = QPATHTOF(data\body_image\arm_upper_left.paa); }; class ArmRight: Background { idc = IDC_BODY_ARMRIGHT; @@ -52,7 +52,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class ArmUpperRight: Background { idc = IDC_BODY_ARMUPPERRIGHT; - text = QPATHTOF(data\body_image\arm_right.paa); + text = QPATHTOF(data\body_image\arm_upper_right.paa); }; class LegLeft: Background { idc = IDC_BODY_LEGLEFT; @@ -60,7 +60,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class LegUpperLeft: Background { idc = IDC_BODY_LEGUPPERLEFT; - text = QPATHTOF(data\body_image\leg_left.paa); + text = QPATHTOF(data\body_image\leg_upper_left.paa); }; class LegRight: Background { idc = IDC_BODY_LEGRIGHT; @@ -68,7 +68,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class LegUpperRight: Background { idc = IDC_BODY_LEGUPPERRIGHT; - text = QPATHTOF(data\body_image\leg_right.paa); + text = QPATHTOF(data\body_image\leg_upper_right.paa); }; class ArmLeftB: Background { idc = IDC_BODY_ARMLEFT_B; @@ -78,7 +78,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class ArmUpperLeftB: ArmLeftB { idc = IDC_BODY_ARMUPPERLEFT_B; - text = QPATHTOF(data\body_image\arm_left_b.paa); + text = QPATHTOF(data\body_image\arm_upper_left_b.paa); }; class ArmRightB: ArmLeftB { idc = IDC_BODY_ARMRIGHT_B; @@ -86,7 +86,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class ArmUpperRightB: ArmLeftB { idc = IDC_BODY_ARMUPPERRIGHT_B; - text = QPATHTOF(data\body_image\arm_right_b.paa); + text = QPATHTOF(data\body_image\arm_upper_right_b.paa); }; class LegLeftB: ArmLeftB { idc = IDC_BODY_LEGLEFT_B; @@ -94,7 +94,7 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class LegUpperLeftB: ArmLeftB { idc = IDC_BODY_LEGUPPERLEFT_B; - text = QPATHTOF(data\body_image\leg_left_b.paa); + text = QPATHTOF(data\body_image\leg_upper_left_b.paa); }; class LegRightB: ArmLeftB { idc = IDC_BODY_LEGRIGHT_B; @@ -102,25 +102,25 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class LegUpperRightB: ArmLeftB { idc = IDC_BODY_LEGUPPERRIGHT_B; - text = QPATHTOF(data\body_image\leg_right_b.paa); + text = QPATHTOF(data\body_image\leg_upper_right_b.paa); }; class ArmLeftT: Background { idc = IDC_BODY_ARMLEFT_T; - text = QPATHTOF(data\body_image\arm_left_t.paa); + text = QPATHTOF(data\body_image\arm_lower_left_t.paa); colorText[] = {0, 0, 0.8, 1}; show = 0; }; class ArmRightT: ArmLeftT { idc = IDC_BODY_ARMRIGHT_T; - text = QPATHTOF(data\body_image\arm_right_t.paa); + text = QPATHTOF(data\body_image\arm_lower_right_t.paa); }; class LegLeftT: ArmLeftT { idc = IDC_BODY_LEGLEFT_T; - text = QPATHTOF(data\body_image\leg_left_t.paa); + text = QPATHTOF(data\body_image\leg_lower_left_t.paa); }; class LegRightT: ArmLeftT { idc = IDC_BODY_LEGRIGHT_T; - text = QPATHTOF(data\body_image\leg_right_t.paa); + text = QPATHTOF(data\body_image\leg_lower_right_t.paa); }; class ArmUpperLeftT: ArmLeftT { idc = IDC_BODY_ARMUPPERLEFT_T; @@ -146,13 +146,13 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class NeckS: Background { idc = IDC_BODY_NECK_S; - text = QPATHTOF(data\body_image\head_s.paa); + text = QPATHTOF(data\body_image\neck_s.paa); colorText[] = {1.0, 1.0, 1.0, 1.0}; show = 0; }; class ChestS: HeadS { idc = IDC_BODY_CHEST_S; - text = QPATHTOF(data\body_image\torso_s.paa); + text = QPATHTOF(data\body_image\chest_s.paa); }; class TorsoS: HeadS { idc = IDC_BODY_TORSO_S; @@ -176,19 +176,19 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { }; class ArmUpperLeftS: HeadS { idc = IDC_BODY_ARMUPPERLEFT_S; - text = QPATHTOF(data\body_image\arm_left_s.paa); + text = QPATHTOF(data\body_image\arm_upper_left_s.paa); }; class ArmUpperRightS: HeadS { idc = IDC_BODY_ARMUPPERRIGHT_S; - text = QPATHTOF(data\body_image\arm_right_s.paa); + text = QPATHTOF(data\body_image\arm_upper_right_s.paa); }; class LegUpperLeftS: HeadS { idc = IDC_BODY_LEGUPPERLEFT_S; - text = QPATHTOF(data\body_image\leg_left_s.paa); + text = QPATHTOF(data\body_image\leg_upper_left_s.paa); }; class LegUpperRightS: HeadS { idc = IDC_BODY_LEGUPPERRIGHT_S; - text = QPATHTOF(data\body_image\leg_right_s.paa); + text = QPATHTOF(data\body_image\leg_upper_right_s.paa); }; }; }; @@ -517,15 +517,15 @@ class ACE_Medical_Menu { x = QUOTE(POS_X(20.0)); y = QUOTE(POS_Y(11.7)); w = QUOTE(POS_W(1.1)); - h = QUOTE(POS_H(2.9)); + h = QUOTE(POS_H(2.4)); }; class SelectLegLeft: SelectUpperLegLeft { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 9); tooltip = CSTRING(SelectLeftUpperLeg); x = QUOTE(POS_X(20.0)); - y = QUOTE(POS_Y(8.8)); + y = QUOTE(POS_Y(8.4)); w = QUOTE(POS_W(1.1)); - h = QUOTE(POS_H(2.9)); + h = QUOTE(POS_H(3.3)); }; class SelectUpperLegRight: SelectHead { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 10); @@ -533,7 +533,7 @@ class ACE_Medical_Menu { x = QUOTE(POS_X(18.9)); y = QUOTE(POS_Y(11.7)); w = QUOTE(POS_W(1.1)); - h = QUOTE(POS_H(2.9)); + h = QUOTE(POS_H(2.4)); }; class SelectLegRight: SelectUpperLegRight { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 11); @@ -541,7 +541,7 @@ class ACE_Medical_Menu { x = QUOTE(POS_X(18.9)); y = QUOTE(POS_Y(8.8)); w = QUOTE(POS_W(1.1)); - h = QUOTE(POS_H(2.9)); + h = QUOTE(POS_H(3.3)); }; class Injuries: TriageCard { idc = IDC_INJURIES;