From 2c41ecbac948a72b8fcb1e463832735b9c2d8b8d Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 19 Dec 2011 12:58:15 +0100 Subject: [PATCH] Fix invisibility icon shown for speed item in minstagib --- qcsrc/client/hud.qc | 10 +++++----- qcsrc/common/constants.qh | 6 +++--- qcsrc/server/defs.qh | 4 ++-- qcsrc/server/g_world.qc | 4 ++-- qcsrc/server/t_items.qc | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index c4925f43d..160a988db 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4789,8 +4789,8 @@ string GetItemsTimePicture(float i) { case 0: return "armor"; case 1: return "health"; - case 2: return "shield"; - case 3: return "strength"; + case 2: return "strength"; + case 3: return "shield"; case 4: return "health"; case 5: return "strength"; case 6: return "shield"; @@ -4853,10 +4853,10 @@ void HUD_ItemsTime(void) ItemsTime_time[0] = getstatf(STAT_ARMOR_LARGE_TIME); ItemsTime_time[1] = getstatf(STAT_HEALTH_MEGA_TIME); - ItemsTime_time[2] = getstatf(STAT_STRENGTH_TIME); - ItemsTime_time[3] = getstatf(STAT_INVISIBLE_TIME); + ItemsTime_time[2] = getstatf(STAT_INVISIBLE_TIME); + ItemsTime_time[3] = getstatf(STAT_SPEED_TIME); ItemsTime_time[4] = getstatf(STAT_EXTRALIFE_TIME); - ItemsTime_time[5] = getstatf(STAT_SPEED_TIME); + ItemsTime_time[5] = getstatf(STAT_STRENGTH_TIME); ItemsTime_time[6] = getstatf(STAT_SHIELD_TIME); ItemsTime_time[7] = getstatf(STAT_FUELREGEN_TIME); ItemsTime_time[8] = getstatf(STAT_JETPACK_TIME); diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index f7d97c5aa..162375773 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -217,10 +217,10 @@ const float STAT_SECRETS_FOUND = 71; const float STAT_ARMOR_LARGE_TIME = 80; const float STAT_HEALTH_MEGA_TIME = 81; -const float STAT_STRENGTH_TIME = 82; -const float STAT_INVISIBLE_TIME = 83; +const float STAT_INVISIBLE_TIME = 82; +const float STAT_SPEED_TIME = 83; const float STAT_EXTRALIFE_TIME = 84; -const float STAT_SPEED_TIME = 85; +const float STAT_STRENGTH_TIME = 85; const float STAT_SHIELD_TIME = 86; const float STAT_FUELREGEN_TIME = 87; const float STAT_JETPACK_TIME = 88; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d70dd1937..528b74c3b 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -654,10 +654,10 @@ string deathmessage; .float item_armor_large_time; .float item_health_mega_time; -.float item_strength_time; .float item_invisible_time; -.float item_extralife_time; .float item_speed_time; +.float item_extralife_time; +.float item_strength_time; .float item_shield_time; .float item_fuelregen_time; .float item_jetpack_time; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 36f1da955..12daf1b48 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -862,10 +862,10 @@ void spawnfunc_worldspawn (void) addstat(STAT_ARMOR_LARGE_TIME, AS_FLOAT, item_armor_large_time); addstat(STAT_HEALTH_MEGA_TIME, AS_FLOAT, item_health_mega_time); - addstat(STAT_STRENGTH_TIME, AS_FLOAT, item_strength_time); addstat(STAT_INVISIBLE_TIME, AS_FLOAT, item_invisible_time); - addstat(STAT_EXTRALIFE_TIME, AS_FLOAT, item_extralife_time); addstat(STAT_SPEED_TIME, AS_FLOAT, item_speed_time); + addstat(STAT_EXTRALIFE_TIME, AS_FLOAT, item_extralife_time); + addstat(STAT_STRENGTH_TIME, AS_FLOAT, item_strength_time); addstat(STAT_SHIELD_TIME, AS_FLOAT, item_shield_time); addstat(STAT_FUELREGEN_TIME, AS_FLOAT, item_fuelregen_time); addstat(STAT_JETPACK_TIME, AS_FLOAT, item_jetpack_time); diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 2bc5e2336..ad03d50ae 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -181,10 +181,10 @@ void Item_Show (entity e, float mode) float it_armor_large_time; float it_health_mega_time; -float it_strength_time; float it_invisible_time; -float it_extralife_time; float it_speed_time; +float it_extralife_time; +float it_strength_time; float it_shield_time; float it_fuelregen_time; float it_jetpack_time; @@ -193,10 +193,10 @@ void Item_ItemsTime_Init() { it_armor_large_time = -1; it_health_mega_time = -1; - it_strength_time = -1; it_invisible_time = -1; - it_extralife_time = -1; it_speed_time = -1; + it_extralife_time = -1; + it_strength_time = -1; it_shield_time = -1; it_fuelregen_time = -1; it_jetpack_time = -1; @@ -205,10 +205,10 @@ void Item_ClearItemsTime() { self.item_armor_large_time = (it_armor_large_time == -1) ? -1 : 0; self.item_health_mega_time = (it_health_mega_time == -1) ? -1 : 0; - self.item_strength_time = (it_strength_time == -1) ? -1 : 0; self.item_invisible_time = (it_invisible_time == -1) ? -1 : 0; - self.item_extralife_time = (it_extralife_time == -1) ? -1 : 0; self.item_speed_time = (it_speed_time == -1) ? -1 : 0; + self.item_extralife_time = (it_extralife_time == -1) ? -1 : 0; + self.item_strength_time = (it_strength_time == -1) ? -1 : 0; self.item_shield_time = (it_shield_time == -1) ? -1 : 0; self.item_fuelregen_time = (it_fuelregen_time == -1) ? -1 : 0; self.item_jetpack_time = (it_jetpack_time == -1) ? -1 : 0; @@ -217,10 +217,10 @@ void Item_GetItemsTime(entity e) { e.item_armor_large_time = it_armor_large_time; e.item_health_mega_time = it_health_mega_time; - e.item_strength_time = it_strength_time; e.item_invisible_time = it_invisible_time; - e.item_extralife_time = it_extralife_time; e.item_speed_time = it_speed_time; + e.item_extralife_time = it_extralife_time; + e.item_strength_time = it_strength_time; e.item_shield_time = it_shield_time; e.item_fuelregen_time = it_fuelregen_time; e.item_jetpack_time = it_jetpack_time; -- 2.39.2