From: Mario Date: Sat, 25 Apr 2015 04:03:18 +0000 (+1000) Subject: Boolinterize hud.qc X-Git-Tag: xonotic-v0.8.1~67 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=475464cd15239448e76060298062f8247d8c2f38;p=xonotic%2Fxonotic-data.pk3dir.git Boolinterize hud.qc --- diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 74a5df166..ef3d91813 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -140,13 +140,13 @@ vector HUD_Get_Num_Color (float x, float maxvalue) return color; } -float HUD_GetRowCount(float item_count, vector size, float item_aspect) +float HUD_GetRowCount(int item_count, vector size, float item_aspect) { float aspect = size_y / size_x; return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count); } -vector HUD_GetTableSize(float item_count, vector psize, float item_aspect) +vector HUD_GetTableSize(int item_count, vector psize, float item_aspect) { float columns, rows; float ratio, best_ratio = 0; @@ -196,20 +196,20 @@ float stringwidth_nocolors(string s, vector theSize) return stringwidth(s, false, theSize); } -void drawstringright(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag) +void drawstringright(vector position, string text, vector theScale, vector rgb, float theAlpha, int flag) { position.x -= 2 / 3 * strlen(text) * theScale.x; drawstring(position, text, theScale, rgb, theAlpha, flag); } -void drawstringcenter(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag) +void drawstringcenter(vector position, string text, vector theScale, vector rgb, float theAlpha, int flag) { position.x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * theScale.x); drawstring(position, text, theScale, rgb, theAlpha, flag); } // return the string of the onscreen race timer -string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname) +string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname) { string col; string timestr; @@ -217,7 +217,7 @@ string MakeRaceString(float cp, float mytime, float histime, float lapdelta, str string lapstr; lapstr = ""; - if(histime == 0) // goal hit + if(theirtime == 0) // goal hit { if(mytime > 0) { @@ -246,12 +246,12 @@ string MakeRaceString(float cp, float mytime, float histime, float lapdelta, str col = "^1"; } } - else if(histime > 0) // anticipation + else if(theirtime > 0) // anticipation { - if(mytime >= histime) - timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS)); + if(mytime >= theirtime) + timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS)); else - timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime)); + timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime)); col = "^3"; } else @@ -269,24 +269,25 @@ string MakeRaceString(float cp, float mytime, float histime, float lapdelta, str else cpname = _("Finish line"); - if(histime < 0) + if(theirtime < 0) return strcat(col, cpname); - else if(hisname == "") + else if(theirname == "") return strcat(col, sprintf("%s (%s)", cpname, timestr)); else - return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(hisname, col, lapstr))); + return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr))); } // Check if the given name already exist in race rankings? In that case, where? (otherwise return 0) -float race_CheckName(string net_name) { - float i; +int race_CheckName(string net_name) +{ + int i; for (i=RANKINGS_CNT-1;i>=0;--i) if(grecordholder[i] == net_name) return i+1; return 0; } -float GetPlayerColorForce(int i) +int GetPlayerColorForce(int i) { if(!teamplay) return 0; @@ -294,7 +295,7 @@ float GetPlayerColorForce(int i) return stof(getplayerkeyvalue(i, "colors")) & 15; } -float GetPlayerColor(int i) +int GetPlayerColor(int i) { if(!playerslots[i].gotscores) // unconnected return NUM_SPECTATOR; @@ -323,7 +324,7 @@ HUD panels } while(0) //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu -void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, float vertical, float baralign, vector theColor, float theAlpha, float drawflag) +void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag) { if(!length_ratio || !theAlpha) return; @@ -426,7 +427,7 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo } } -void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, float drawflag) +void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag) { if(!theAlpha) return; @@ -454,9 +455,9 @@ void weaponorder_swap(int i, int j, entity pass) } string weaponorder_cmp_str; -float weaponorder_cmp(float i, float j, entity pass) +int weaponorder_cmp(int i, int j, entity pass) { - float ai, aj; + int ai, aj; ai = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[i].weapon), 0); aj = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[j].weapon), 0); return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string) @@ -466,11 +467,12 @@ void HUD_Weapons(void) { // declarations WepSet weapons_stat = WepSet_GetFromStat(); - float i, f, a; + int i; + float f, a; float screen_ar; vector center = '0 0 0'; - float weapon_count, weapon_id; - float row, column, rows = 0, columns = 0; + int weapon_count, weapon_id; + int row, column, rows = 0, columns = 0; bool vertical_order = true; float aspect = autocvar_hud_panel_weapons_aspect; @@ -597,7 +599,7 @@ void HUD_Weapons(void) if(padded_panel_size.x / padded_panel_size.y < aspect) { // maximum number of rows that allows to display items with the desired aspect ratio - float max_rows = floor(padded_panel_size.y / (weapon_size.x / aspect)); + int max_rows = floor(padded_panel_size.y / (weapon_size.x / aspect)); columns = min(columns, ceil(weapon_count / max_rows)); rows = ceil(weapon_count / columns); weapon_size.y = min(padded_panel_size.y / rows, weapon_size.x / aspect); @@ -606,7 +608,7 @@ void HUD_Weapons(void) } else { - float max_columns = floor(padded_panel_size.x / (weapon_size.y * aspect)); + int max_columns = floor(padded_panel_size.x / (weapon_size.y * aspect)); rows = min(rows, ceil(weapon_count / max_columns)); columns = ceil(weapon_count / rows); weapon_size.x = min(padded_panel_size.x / columns, aspect * weapon_size.y); @@ -957,7 +959,7 @@ void DrawNadeScoreBar(vector myPos, vector mySize, vector color) } -void DrawAmmoNades(vector myPos, vector mySize, float draw_expanding, float expand_time) +void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expand_time) { float theAlpha = 1, a, b; vector nade_color, picpos, numpos; @@ -993,14 +995,14 @@ void DrawAmmoNades(vector myPos, vector mySize, float draw_expanding, float expa } } -void DrawAmmoItem(vector myPos, vector mySize, .float ammoType, float isCurrent, float isInfinite) +void DrawAmmoItem(vector myPos, vector mySize, .int ammoType, bool isCurrent, bool isInfinite) { if(ammoType == ammo_none) return; // Initialize variables - float ammo; + int ammo; if(autocvar__hud_configure) { isCurrent = (ammoType == ammo_rockets); // Rockets always current @@ -1028,7 +1030,7 @@ void DrawAmmoItem(vector myPos, vector mySize, .float ammoType, float isCurrent, textPos = myPos + eX * mySize.y; } - float isShadowed = (ammo <= 0 && !isCurrent && !isInfinite); + bool isShadowed = (ammo <= 0 && !isCurrent && !isInfinite); vector iconColor = isShadowed ? '0 0 0' : '1 1 1'; vector textColor; @@ -1065,8 +1067,8 @@ void DrawAmmoItem(vector myPos, vector mySize, .float ammoType, float isCurrent, drawpic_aspect_skin(iconPos, GetAmmoPicture(ammoType), '1 1 0' * mySize.y, iconColor, alpha, DRAWFLAG_NORMAL); } -float nade_prevstatus; -float nade_prevframe; +int nade_prevstatus; +int nade_prevframe; float nade_statuschange_time; void HUD_Ammo(void) { @@ -1092,10 +1094,11 @@ void HUD_Ammo(void) mySize -= '2 2 0' * panel_bg_padding; } - float rows = 0, columns, row, column; + int rows = 0, columns, row, column; float nade_cnt = getstatf(STAT_NADE_BONUS), nade_score = getstatf(STAT_NADE_BONUS_SCORE); - float draw_nades = (nade_cnt > 0 || nade_score > 0), nade_statuschange_elapsedtime; - float total_ammo_count; + bool draw_nades = (nade_cnt > 0 || nade_score > 0); + float nade_statuschange_elapsedtime; + int total_ammo_count; vector ammo_size; if (autocvar_hud_panel_ammo_onlycurrent) @@ -1137,8 +1140,8 @@ void HUD_Ammo(void) ammo_size.y = newSize; } - float i; - float infinite_ammo = (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_WEAPON_AMMO); + int i; + bool infinite_ammo = (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_WEAPON_AMMO); row = column = 0; if(autocvar_hud_panel_ammo_onlycurrent) { @@ -1166,7 +1169,7 @@ void HUD_Ammo(void) } else { - .float ammotype; + .int ammotype; row = column = 0; for(i = 0; i < AMMO_COUNT; ++i) { @@ -1200,7 +1203,7 @@ void HUD_Ammo(void) draw_endBoldFont(); } -void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, float vertical, float icon_right_align, vector color, float theAlpha, float fadelerp) +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp) { vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; @@ -1279,7 +1282,7 @@ void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, fl drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); } -void DrawNumIcon(vector myPos, vector mySize, float x, string icon, float vertical, float icon_right_align, vector color, float theAlpha) +void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha) { DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0); } @@ -1330,10 +1333,10 @@ void HUD_Powerups(void) } float panel_ar = mySize.x/mySize.y; - float is_vertical = (panel_ar < 1); + bool is_vertical = (panel_ar < 1); vector shield_offset = '0 0 0', strength_offset = '0 0 0', superweapons_offset = '0 0 0'; - float superweapons_is = -1; + int superweapons_is = -1; if(superweapons_time) { @@ -1395,8 +1398,8 @@ void HUD_Powerups(void) } } - float shield_baralign, strength_baralign, superweapons_baralign; - float shield_iconalign, strength_iconalign, superweapons_iconalign; + bool shield_baralign, strength_baralign, superweapons_baralign; + bool shield_iconalign, strength_iconalign, superweapons_iconalign; if (autocvar_hud_panel_powerups_flip) { @@ -1484,19 +1487,19 @@ void HUD_Powerups(void) // prev_* vars contain the health/armor at the previous FRAME // set to -1 when player is dead or was not playing -float prev_health, prev_armor; +int prev_health, prev_armor; float health_damagetime, armor_damagetime; -float health_beforedamage, armor_beforedamage; +int health_beforedamage, armor_beforedamage; // old_p_* vars keep track of previous values when smoothing value changes of the progressbar -float old_p_health, old_p_armor; +int old_p_health, old_p_armor; float old_p_healthtime, old_p_armortime; // prev_p_* vars contain the health/armor progressbar value at the previous FRAME // set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h) -float prev_p_health, prev_p_armor; +int prev_p_health, prev_p_armor; void HUD_HealthArmor(void) { - float armor, health, fuel; + int armor, health, fuel; if(!autocvar__hud_configure) { if(!autocvar_hud_panel_healtharmor) return; @@ -1557,11 +1560,11 @@ void HUD_HealthArmor(void) mySize -= '2 2 0' * panel_bg_padding; } - float baralign = autocvar_hud_panel_healtharmor_baralign; - float iconalign = autocvar_hud_panel_healtharmor_iconalign; + int baralign = autocvar_hud_panel_healtharmor_baralign; + int iconalign = autocvar_hud_panel_healtharmor_iconalign; - float maxhealth = autocvar_hud_panel_healtharmor_maxhealth; - float maxarmor = autocvar_hud_panel_healtharmor_maxarmor; + int maxhealth = autocvar_hud_panel_healtharmor_maxhealth; + int maxarmor = autocvar_hud_panel_healtharmor_maxarmor; if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display { vector v; @@ -1599,7 +1602,7 @@ void HUD_HealthArmor(void) else { float panel_ar = mySize.x/mySize.y; - float is_vertical = (panel_ar < 1); + bool is_vertical = (panel_ar < 1); vector health_offset = '0 0 0', armor_offset = '0 0 0'; if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1)) { @@ -1618,8 +1621,8 @@ void HUD_HealthArmor(void) armor_offset.y = mySize.y; } - float health_baralign, armor_baralign, fuel_baralign; - float health_iconalign, armor_iconalign; + bool health_baralign, armor_baralign, fuel_baralign; + bool health_iconalign, armor_iconalign; if (autocvar_hud_panel_healtharmor_flip) { armor_baralign = (autocvar_hud_panel_healtharmor_baralign == 2 || autocvar_hud_panel_healtharmor_baralign == 1); @@ -1823,7 +1826,7 @@ void HUD_Notify(void) float fade_time = max(0, autocvar_hud_panel_notify_fadetime); float icon_aspect = max(1, autocvar_hud_panel_notify_icon_aspect); - float entry_count = bound(1, floor(NOTIFY_MAX_ENTRIES * size.y / size.x), NOTIFY_MAX_ENTRIES); + int entry_count = bound(1, floor(NOTIFY_MAX_ENTRIES * size.y / size.x), NOTIFY_MAX_ENTRIES); float entry_height = size.y / entry_count; float panel_width_half = size.x * 0.5; @@ -1838,7 +1841,8 @@ void HUD_Notify(void) vector attacker_pos, victim_pos, icon_pos; string attacker, victim, icon; - float i, j, count, step, limit, alpha; + int i, j, count, step, limit; + float alpha; if (autocvar_hud_panel_notify_flip) { @@ -2089,7 +2093,7 @@ void HUD_Radar(void) mySize -= '2 2 0' * panel_bg_padding; } - float color2; + int color2; entity tm; float scale2d, normalsize, bigsize; @@ -2172,9 +2176,9 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me) { float score; entity tm = world, pl; - float SCOREPANEL_MAX_ENTRIES = 6; + int SCOREPANEL_MAX_ENTRIES = 6; float SCOREPANEL_ASPECTRATIO = 2; - float entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize.y/mySize.x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES); + int entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize.y/mySize.x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES); vector fontsize = '1 1 0' * (mySize.y/entries); vector rgb, score_color; @@ -2184,7 +2188,8 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me) float name_size = mySize.x*0.75; float spacing_size = mySize.x*0.04; const float highlight_alpha = 0.2; - float i = 0, me_printed = 0, first_pl = 0; + int i = 0, first_pl = 0; + bool me_printed = false; string s; if (autocvar__hud_configure) { @@ -2275,7 +2280,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me) { if (i == first_pl) rgb = '0 1 0'; //first: green - me_printed = 1; + me_printed = true; drawfill(pos, eX * mySize.x + eY * fontsize.y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (team_count) @@ -2619,13 +2624,13 @@ void HUD_RaceTimer (void) // Vote window (#9) // -float vote_yescount; -float vote_nocount; -float vote_needed; -float vote_highlighted; // currently selected vote +int vote_yescount; +int vote_nocount; +int vote_needed; +int vote_highlighted; // currently selected vote -float vote_active; // is there an active vote? -float vote_prev; // previous state of vote_active to check for a change +int vote_active; // is there an active vote? +int vote_prev; // previous state of vote_active to check for a change float vote_alpha; float vote_change; // "time" when vote_active changed @@ -2769,11 +2774,11 @@ void HUD_Vote(void) // Mod icons panel (#10) // -float mod_active; // is there any active mod icon? +bool mod_active; // is there any active mod icon? -void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) +void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i) { - float stat = -1; + int stat = -1; string pic = ""; vector color = '0 0 0'; switch(i) @@ -2833,7 +2838,8 @@ void HUD_Mod_CA(vector myPos, vector mySize) layout = autocvar_hud_panel_modicons_ca_layout; else //if(gametype == MAPINFO_TYPE_FREEZETAG) layout = autocvar_hud_panel_modicons_freezetag_layout; - float rows, columns, aspect_ratio; + int rows, columns; + float aspect_ratio; aspect_ratio = (layout) ? 2 : 1; rows = HUD_GetRowCount(team_count, mySize, aspect_ratio); columns = ceil(team_count/rows); @@ -2859,7 +2865,7 @@ void HUD_Mod_CA(vector myPos, vector mySize) // CTF HUD modicon section float redflag_prevframe, blueflag_prevframe; // status during previous frame -float redflag_prevstatus, blueflag_prevstatus; // last remembered status +int redflag_prevstatus, blueflag_prevstatus; // last remembered status float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed void HUD_Mod_CTF_Reset(void) @@ -2873,9 +2879,9 @@ void HUD_Mod_CTF(vector pos, vector mySize) vector flag_size; float f; // every function should have that - float redflag, blueflag; // current status + int redflag, blueflag; // current status float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed - float stat_items; + int stat_items; stat_items = getstati(STAT_ITEMS, 0, 24); redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3; @@ -3017,9 +3023,9 @@ void HUD_Mod_KH(vector pos, vector mySize) // Read current state - float state = getstati(STAT_KH_KEYS); - float i, key_state; - float all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys; + int state = getstati(STAT_KH_KEYS); + int i, key_state; + int all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys; all_keys = team1_keys = team2_keys = team3_keys = team4_keys = dropped_keys = carrying_keys = 0; for(i = 0; i < 4; ++i) @@ -3138,7 +3144,7 @@ void HUD_Mod_KH(vector pos, vector mySize) } // Keepaway HUD mod icon -float kaball_prevstatus; // last remembered status +int kaball_prevstatus; // last remembered status float kaball_statuschange_time; // time when the status changed // we don't need to reset for keepaway since it immediately @@ -3153,8 +3159,8 @@ void HUD_Mod_Keepaway(vector pos, vector mySize) float BLINK_FREQ = 5; float kaball_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); - float stat_items = getstati(STAT_ITEMS, 0, 24); - float kaball = (stat_items/IT_KEY1) & 1; + int stat_items = getstati(STAT_ITEMS, 0, 24); + int kaball = (stat_items/IT_KEY1) & 1; if(kaball != kaball_prevstatus) { @@ -3186,7 +3192,8 @@ void HUD_Mod_Keepaway(vector pos, vector mySize) // Nexball HUD mod icon void HUD_Mod_NexBall(vector pos, vector mySize) { - float stat_items, nb_pb_starttime, dt, p; + float nb_pb_starttime, dt, p; + int stat_items; stat_items = getstati(STAT_ITEMS, 0, 24); nb_pb_starttime = getstatf(STAT_NB_METERSTART); @@ -3219,7 +3226,7 @@ float srecordtime_prev; // last remembered srecordtime float srecordtime_change_time; // time when srecordtime last changed float race_status_time; -float race_status_prev; +int race_status_prev; string race_status_name_prev; void HUD_Mod_Race(vector pos, vector mySize) { @@ -3359,7 +3366,7 @@ void HUD_Mod_Race(vector pos, vector mySize) } } -void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i) +void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i) { float stat = -1; string pic = ""; @@ -3428,7 +3435,8 @@ void HUD_Mod_Dom(vector myPos, vector mySize) mod_active = 1; // required in each mod function that always shows something int layout = autocvar_hud_panel_modicons_dom_layout; - float rows, columns, aspect_ratio; + int rows, columns; + float aspect_ratio; aspect_ratio = (layout) ? 3 : 1; rows = HUD_GetRowCount(team_count, mySize, aspect_ratio); columns = ceil(team_count/rows); @@ -3468,7 +3476,7 @@ void HUD_ModIcons_SetFunc() } } -float mod_prev; // previous state of mod_active to check for a change +int mod_prev; // previous state of mod_active to check for a change float mod_alpha; float mod_change; // "time" when mod_active changed @@ -3662,7 +3670,7 @@ void HUD_Chat(void) // float prevfps; float prevfps_time; -float framecounter; +int framecounter; float frametimeavg; float frametimeavg1; // 1 frame ago @@ -4018,7 +4026,7 @@ void HUD_Physics(void) else acceleration_offset.y = panel_size.y; } - float speed_baralign, acceleration_baralign; + int speed_baralign, acceleration_baralign; if (autocvar_hud_panel_physics_baralign == 1) acceleration_baralign = speed_baralign = 1; else if(autocvar_hud_panel_physics_baralign == 4) @@ -4174,21 +4182,21 @@ void HUD_Physics(void) // CenterPrint (#16) // -const float CENTERPRINT_MAX_MSGS = 10; -const float CENTERPRINT_MAX_ENTRIES = 50; +const int CENTERPRINT_MAX_MSGS = 10; +const int CENTERPRINT_MAX_ENTRIES = 50; const float CENTERPRINT_SPACING = 0.7; -float cpm_index; +int cpm_index; string centerprint_messages[CENTERPRINT_MAX_MSGS]; -float centerprint_msgID[CENTERPRINT_MAX_MSGS]; +int centerprint_msgID[CENTERPRINT_MAX_MSGS]; float centerprint_time[CENTERPRINT_MAX_MSGS]; float centerprint_expire_time[CENTERPRINT_MAX_MSGS]; -float centerprint_countdown_num[CENTERPRINT_MAX_MSGS]; -float centerprint_showing; +int centerprint_countdown_num[CENTERPRINT_MAX_MSGS]; +bool centerprint_showing; -void centerprint_generic(float new_id, string strMessage, float duration, float countdown_num) +void centerprint_generic(int new_id, string strMessage, float duration, int countdown_num) { //printf("centerprint_generic(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num); - float i, j; + int i, j; if(strMessage == "" && new_id == 0) return; @@ -4268,7 +4276,7 @@ void centerprint_hud(string strMessage) void reset_centerprint_messages(void) { - float i; + int i; for (i=0; i