diff --git a/src/c_cmds.c b/src/c_cmds.c index 87057514e..151aa9e56 100644 --- a/src/c_cmds.c +++ b/src/c_cmds.c @@ -6054,55 +6054,55 @@ static weapontype_t favoriteweapon(bool total) { uint64_t shotsfiredstat = 0; - if (shotsfiredstat < stat_shotsfired_fists) + if (shotsfiredstat < stat_shotsfired[wp_fist]) { - shotsfiredstat = stat_shotsfired_fists; + shotsfiredstat = stat_shotsfired[wp_fist]; favorite = wp_fist; } - if (shotsfiredstat < stat_shotsfired_chainsaw) + if (shotsfiredstat < stat_shotsfired[wp_chainsaw]) { - shotsfiredstat = stat_shotsfired_chainsaw; + shotsfiredstat = stat_shotsfired[wp_chainsaw]; favorite = wp_chainsaw; } - if (shotsfiredstat < stat_shotsfired_pistol) + if (shotsfiredstat < stat_shotsfired[wp_pistol]) { - shotsfiredstat = stat_shotsfired_pistol; + shotsfiredstat = stat_shotsfired[wp_pistol]; favorite = wp_pistol; } - if (shotsfiredstat < stat_shotsfired_shotgun) + if (shotsfiredstat < stat_shotsfired[wp_shotgun]) { - shotsfiredstat = stat_shotsfired_shotgun; + shotsfiredstat = stat_shotsfired[wp_shotgun]; favorite = wp_shotgun; } - if (shotsfiredstat < stat_shotsfired_supershotgun) + if (shotsfiredstat < stat_shotsfired[wp_supershotgun]) { - shotsfiredstat = stat_shotsfired_supershotgun; + shotsfiredstat = stat_shotsfired[wp_supershotgun]; favorite = wp_supershotgun; } - if (shotsfiredstat < stat_shotsfired_chaingun) + if (shotsfiredstat < stat_shotsfired[wp_chaingun]) { - shotsfiredstat = stat_shotsfired_chaingun; + shotsfiredstat = stat_shotsfired[wp_chaingun]; favorite = wp_chaingun; } - if (shotsfiredstat < stat_shotsfired_rocketlauncher) + if (shotsfiredstat < stat_shotsfired[wp_missile]) { - shotsfiredstat = stat_shotsfired_rocketlauncher; + shotsfiredstat = stat_shotsfired[wp_missile]; favorite = wp_missile; } - if (shotsfiredstat < stat_shotsfired_plasmarifle) + if (shotsfiredstat < stat_shotsfired[wp_plasma]) { - shotsfiredstat = stat_shotsfired_plasmarifle; + shotsfiredstat = stat_shotsfired[wp_plasma]; favorite = wp_plasma; } - if (shotsfiredstat < stat_shotsfired_bfg9000) + if (shotsfiredstat < stat_shotsfired[wp_bfg]) favorite = wp_bfg; } else @@ -6501,15 +6501,15 @@ static void C_PlayerStats_Game(void) temp1 = commify(viewplayer->itemspickedup_ammo_bullets + viewplayer->itemspickedup_ammo_shells + viewplayer->itemspickedup_ammo_rockets + viewplayer->itemspickedup_ammo_cells); - temp2 = commify(stat_itemspickedup_ammo_bullets + stat_itemspickedup_ammo_shells - + stat_itemspickedup_ammo_rockets + stat_itemspickedup_ammo_cells); + temp2 = commify(stat_itemspickedup_ammo[am_clip] + stat_itemspickedup_ammo[am_shell] + + stat_itemspickedup_ammo[am_misl] + stat_itemspickedup_ammo[am_cell]); C_TabbedOutput(tabs, INDENT "Ammo\t%s\t%s", temp1, temp2); free(temp1); free(temp2); temp1 = sentencecase(weaponinfo[wp_pistol].ammoplural); temp2 = commify(viewplayer->itemspickedup_ammo_bullets); - temp3 = commifystat(stat_itemspickedup_ammo_bullets); + temp3 = commifystat(stat_itemspickedup_ammo[am_clip]); C_TabbedOutput(tabs, INDENT INDENT "%s\t%s\t%s", temp1, temp2, temp3); free(temp1); free(temp2); @@ -6517,7 +6517,7 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_shotgun].ammoplural); temp2 = commify(viewplayer->itemspickedup_ammo_shells); - temp3 = commifystat(stat_itemspickedup_ammo_shells); + temp3 = commifystat(stat_itemspickedup_ammo[am_shell]); C_TabbedOutput(tabs, INDENT INDENT "%s\t%s\t%s", temp1, temp2, temp3); free(temp1); free(temp2); @@ -6525,7 +6525,7 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_missile].ammoplural); temp2 = commify(viewplayer->itemspickedup_ammo_rockets); - temp3 = commifystat(stat_itemspickedup_ammo_rockets); + temp3 = commifystat(stat_itemspickedup_ammo[am_misl]); C_TabbedOutput(tabs, INDENT INDENT "%s\t%s\t%s", temp1, temp2, temp3); free(temp1); free(temp2); @@ -6535,7 +6535,7 @@ static void C_PlayerStats_Game(void) { temp1 = sentencecase(weaponinfo[wp_plasma].ammoplural); temp2 = commify(viewplayer->itemspickedup_ammo_cells); - temp3 = commifystat(stat_itemspickedup_ammo_cells); + temp3 = commifystat(stat_itemspickedup_ammo[am_cell]); C_TabbedOutput(tabs, INDENT INDENT "%s\t%s\t%s", temp1, temp2, temp3); free(temp1); free(temp2); @@ -6656,35 +6656,48 @@ static void C_PlayerStats_Game(void) free(temp1); free(temp2); - for (int i = 0; i < NUMWEAPONS; i++) - shotsfired1 += viewplayer->shotsfired[i]; - - for (int i = 0; i < NUMWEAPONS; i++) - shotssuccessful1 += viewplayer->shotssuccessful[i]; - + shotssuccessful1 = viewplayer->shotssuccessful[wp_fist] + + viewplayer->shotssuccessful[wp_chainsaw] + + viewplayer->shotssuccessful[wp_pistol] + + viewplayer->shotssuccessful[wp_shotgun] + + viewplayer->shotssuccessful[wp_supershotgun] + + viewplayer->shotssuccessful[wp_chaingun] + + viewplayer->shotssuccessful[wp_missile] + + (legacyofrust ? viewplayer->shotssuccessful_incinerator : viewplayer->shotssuccessful[wp_plasma]) + + (legacyofrust ? viewplayer->shotssuccessful_calamityblade : viewplayer->shotssuccessful[wp_bfg]); temp1 = commify(shotssuccessful1); + + shotsfired1 = viewplayer->shotsfired[wp_fist] + + viewplayer->shotsfired[wp_chainsaw] + + viewplayer->shotsfired[wp_pistol] + + viewplayer->shotsfired[wp_shotgun] + + viewplayer->shotsfired[wp_supershotgun] + + viewplayer->shotsfired[wp_chaingun] + + viewplayer->shotsfired[wp_missile] + + (legacyofrust ? viewplayer->shotsfired_incinerator : viewplayer->shotsfired[wp_plasma]) + + (legacyofrust ? viewplayer->shotsfired_calamityblade : viewplayer->shotsfired[wp_bfg]); temp2 = commify(shotsfired1); - shotssuccessful2 = stat_shotssuccessful_fists - + stat_shotssuccessful_chainsaw - + stat_shotssuccessful_pistol - + stat_shotssuccessful_shotgun - + stat_shotssuccessful_supershotgun - + stat_shotssuccessful_chaingun - + stat_shotssuccessful_rocketlauncher - + stat_shotssuccessful_plasmarifle - + stat_shotssuccessful_bfg9000; + shotssuccessful2 = stat_shotssuccessful[wp_fist] + + stat_shotssuccessful[wp_chainsaw] + + stat_shotssuccessful[wp_pistol] + + stat_shotssuccessful[wp_shotgun] + + stat_shotssuccessful[wp_supershotgun] + + stat_shotssuccessful[wp_chaingun] + + stat_shotssuccessful[wp_missile] + + (legacyofrust ? stat_shotssuccessful_incinerator : stat_shotssuccessful[wp_plasma]) + + (legacyofrust ? stat_shotssuccessful_calamityblade : stat_shotssuccessful[wp_bfg]); temp3 = commify(shotssuccessful2); - shotsfired2 = stat_shotsfired_fists - + stat_shotsfired_chainsaw - + stat_shotsfired_pistol - + stat_shotsfired_shotgun - + stat_shotsfired_supershotgun - + stat_shotsfired_chaingun - + stat_shotsfired_rocketlauncher - + stat_shotsfired_plasmarifle - + stat_shotsfired_bfg9000; + shotsfired2 = stat_shotsfired[wp_fist] + + stat_shotsfired[wp_chainsaw] + + stat_shotsfired[wp_pistol] + + stat_shotsfired[wp_shotgun] + + stat_shotsfired[wp_supershotgun] + + stat_shotsfired[wp_chaingun] + + stat_shotsfired[wp_missile] + + (legacyofrust ? stat_shotsfired_incinerator : stat_shotsfired[wp_plasma]) + + (legacyofrust ? stat_shotsfired_calamityblade : stat_shotsfired[wp_bfg]); temp4 = commify(shotsfired2); C_TabbedOutput(tabs, "Shots successful/fired\t%s of %s (%i%%)\t%s of %s (%i%%)", @@ -6698,13 +6711,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_fist].name); temp2 = commify(viewplayer->shotssuccessful[wp_fist]); temp3 = commify(viewplayer->shotsfired[wp_fist]); - temp4 = commifystat(stat_shotssuccessful_fists); - temp5 = commifystat(stat_shotsfired_fists); + temp4 = commifystat(stat_shotssuccessful[wp_fist]); + temp5 = commifystat(stat_shotsfired[wp_fist]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_fist] ? viewplayer->shotssuccessful[wp_fist] * 100 / viewplayer->shotsfired[wp_fist] : 0), temp4, temp5, - (stat_shotsfired_fists ? (int)(stat_shotssuccessful_fists * 100 / stat_shotsfired_fists) : 0)); + (stat_shotsfired[wp_fist] ? (int)(stat_shotssuccessful[wp_fist] * 100 / stat_shotsfired[wp_fist]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6714,13 +6727,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_chainsaw].name); temp2 = commify(viewplayer->shotssuccessful[wp_chainsaw]); temp3 = commify(viewplayer->shotsfired[wp_chainsaw]); - temp4 = commifystat(stat_shotssuccessful_chainsaw); - temp5 = commifystat(stat_shotsfired_chainsaw); + temp4 = commifystat(stat_shotssuccessful[wp_chainsaw]); + temp5 = commifystat(stat_shotsfired[wp_chainsaw]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_chainsaw] ? viewplayer->shotssuccessful[wp_chainsaw] * 100 / viewplayer->shotsfired[wp_chainsaw] : 0), temp4, temp5, - (stat_shotsfired_chainsaw ? (int)(stat_shotssuccessful_chainsaw * 100 / stat_shotsfired_chainsaw) : 0)); + (stat_shotsfired[wp_chainsaw] ? (int)(stat_shotssuccessful[wp_chainsaw] * 100 / stat_shotsfired[wp_chainsaw]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6730,13 +6743,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_pistol].name); temp2 = commify(viewplayer->shotssuccessful[wp_pistol]); temp3 = commify(viewplayer->shotsfired[wp_pistol]); - temp4 = commifystat(stat_shotssuccessful_pistol); - temp5 = commifystat(stat_shotsfired_pistol); + temp4 = commifystat(stat_shotssuccessful[wp_pistol]); + temp5 = commifystat(stat_shotsfired[wp_pistol]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_pistol] ? viewplayer->shotssuccessful[wp_pistol] * 100 / viewplayer->shotsfired[wp_pistol] : 0), temp4, temp5, - (stat_shotsfired_pistol ? (int)(stat_shotssuccessful_pistol * 100 / stat_shotsfired_pistol) : 0)); + (stat_shotsfired[wp_pistol] ? (int)(stat_shotssuccessful[wp_pistol] * 100 / stat_shotsfired[wp_pistol]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6746,13 +6759,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_shotgun].name); temp2 = commify(viewplayer->shotssuccessful[wp_shotgun]); temp3 = commify(viewplayer->shotsfired[wp_shotgun]); - temp4 = commifystat(stat_shotssuccessful_shotgun); - temp5 = commifystat(stat_shotsfired_shotgun); + temp4 = commifystat(stat_shotssuccessful[wp_shotgun]); + temp5 = commifystat(stat_shotsfired[wp_shotgun]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_shotgun] ? viewplayer->shotssuccessful[wp_shotgun] * 100 / viewplayer->shotsfired[wp_shotgun] : 0), temp4, temp5, - (stat_shotsfired_shotgun ? (int)(stat_shotssuccessful_shotgun * 100 / stat_shotsfired_shotgun) : 0)); + (stat_shotsfired[wp_shotgun] ? (int)(stat_shotssuccessful[wp_shotgun] * 100 / stat_shotsfired[wp_shotgun]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6764,14 +6777,14 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_supershotgun].name); temp2 = commify(viewplayer->shotssuccessful[wp_supershotgun]); temp3 = commify(viewplayer->shotsfired[wp_supershotgun]); - temp4 = commifystat(stat_shotssuccessful_supershotgun); - temp5 = commifystat(stat_shotsfired_supershotgun); + temp4 = commifystat(stat_shotssuccessful[wp_supershotgun]); + temp5 = commifystat(stat_shotsfired[wp_supershotgun]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_supershotgun] ? viewplayer->shotssuccessful[wp_supershotgun] * 100 / viewplayer->shotsfired[wp_supershotgun] : 0), temp4, temp5, - (stat_shotsfired_supershotgun ? (int)(stat_shotssuccessful_supershotgun * 100 / stat_shotsfired_supershotgun) : 0)); + (stat_shotsfired[wp_supershotgun] ? (int)(stat_shotssuccessful[wp_supershotgun] * 100 / stat_shotsfired[wp_supershotgun]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6782,13 +6795,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_chaingun].name); temp2 = commify(viewplayer->shotssuccessful[wp_chaingun]); temp3 = commify(viewplayer->shotsfired[wp_chaingun]); - temp4 = commifystat(stat_shotssuccessful_chaingun); - temp5 = commifystat(stat_shotsfired_chaingun); + temp4 = commifystat(stat_shotssuccessful[wp_chaingun]); + temp5 = commifystat(stat_shotsfired[wp_chaingun]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_chaingun] ? viewplayer->shotssuccessful[wp_chaingun] * 100 / viewplayer->shotsfired[wp_chaingun] : 0), temp4, temp5, - (stat_shotsfired_chaingun ? (int)(stat_shotssuccessful_chaingun * 100 / stat_shotsfired_chaingun) : 0)); + (stat_shotsfired[wp_chaingun] ? (int)(stat_shotssuccessful[wp_chaingun] * 100 / stat_shotsfired[wp_chaingun]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6798,13 +6811,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_missile].name); temp2 = commify(viewplayer->shotssuccessful[wp_missile]); temp3 = commify(viewplayer->shotsfired[wp_missile]); - temp4 = commifystat(stat_shotssuccessful_rocketlauncher); - temp5 = commifystat(stat_shotsfired_rocketlauncher); + temp4 = commifystat(stat_shotssuccessful[wp_missile]); + temp5 = commifystat(stat_shotsfired[wp_missile]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_missile] ? viewplayer->shotssuccessful[wp_missile] * 100 / viewplayer->shotsfired[wp_missile] : 0), temp4, temp5, - (stat_shotsfired_rocketlauncher ? (int)(stat_shotssuccessful_rocketlauncher * 100 / stat_shotsfired_rocketlauncher) : 0)); + (stat_shotsfired[wp_missile] ? (int)(stat_shotssuccessful[wp_missile] * 100 / stat_shotsfired[wp_missile]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6816,13 +6829,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_plasma].name); temp2 = commify(viewplayer->shotssuccessful[wp_plasma]); temp3 = commify(viewplayer->shotsfired[wp_plasma]); - temp4 = commifystat(stat_shotssuccessful_plasmarifle); - temp5 = commifystat(stat_shotsfired_plasmarifle); + temp4 = commifystat(stat_shotssuccessful[wp_plasma]); + temp5 = commifystat(stat_shotsfired[wp_plasma]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_plasma] ? viewplayer->shotssuccessful[wp_plasma] * 100 / viewplayer->shotsfired[wp_plasma] : 0), temp4, temp5, - (stat_shotsfired_plasmarifle ? (int)(stat_shotssuccessful_plasmarifle * 100 / stat_shotsfired_plasmarifle) : 0)); + (stat_shotsfired[wp_plasma] ? (int)(stat_shotssuccessful[wp_plasma] * 100 / stat_shotsfired[wp_plasma]) : 0)); free(temp1); free(temp2); free(temp3); @@ -6832,13 +6845,13 @@ static void C_PlayerStats_Game(void) temp1 = sentencecase(weaponinfo[wp_bfg].name); temp2 = commify(viewplayer->shotssuccessful[wp_bfg]); temp3 = commify(viewplayer->shotsfired[wp_bfg]); - temp4 = commifystat(stat_shotssuccessful_bfg9000); - temp5 = commifystat(stat_shotsfired_bfg9000); + temp4 = commifystat(stat_shotssuccessful[wp_bfg]); + temp5 = commifystat(stat_shotsfired[wp_bfg]); C_TabbedOutput(tabs, INDENT "%s\t%s of %s (%i%%)\t%s of %s (%i%%)", temp1, temp2, temp3, (viewplayer->shotsfired[wp_bfg] ? viewplayer->shotssuccessful[wp_bfg] * 100 / viewplayer->shotsfired[wp_bfg] : 0), temp4, temp5, - (stat_shotsfired_bfg9000 ? (int)(stat_shotssuccessful_bfg9000 * 100 / stat_shotsfired_bfg9000) : 0)); + (stat_shotsfired[wp_bfg] ? (int)(stat_shotssuccessful[wp_bfg] * 100 / stat_shotsfired[wp_bfg]) : 0)); free(temp1); free(temp2); free(temp3); @@ -7093,25 +7106,25 @@ static void C_PlayerStats_NoGame(void) C_TabbedOutput(tabs, "Items picked up\t\x96\t%s", temp1); free(temp1); - temp1 = commify(stat_itemspickedup_ammo_bullets + stat_itemspickedup_ammo_shells - + stat_itemspickedup_ammo_rockets + stat_itemspickedup_ammo_cells); + temp1 = commify(stat_itemspickedup_ammo[am_clip] + stat_itemspickedup_ammo[am_shell] + + stat_itemspickedup_ammo[am_misl] + stat_itemspickedup_ammo[am_cell]); C_TabbedOutput(tabs, INDENT "Ammo\t\x96\t%s", temp1); free(temp1); temp1 = sentencecase(weaponinfo[wp_pistol].ammoplural); - temp2 = commifystat(stat_itemspickedup_ammo_bullets); + temp2 = commifystat(stat_itemspickedup_ammo[am_clip]); C_TabbedOutput(tabs, INDENT INDENT "%s\t\x96\t%s", temp1, temp2); free(temp1); free(temp2); temp1 = sentencecase(weaponinfo[wp_shotgun].ammoplural); - temp2 = commifystat(stat_itemspickedup_ammo_shells); + temp2 = commifystat(stat_itemspickedup_ammo[am_shell]); C_TabbedOutput(tabs, INDENT INDENT "%s\t\x96\t%s", temp1, temp2); free(temp1); free(temp2); temp1 = sentencecase(weaponinfo[wp_missile].ammoplural); - temp2 = commifystat(stat_itemspickedup_ammo_rockets); + temp2 = commifystat(stat_itemspickedup_ammo[am_misl]); C_TabbedOutput(tabs, INDENT INDENT "%s\t\x96\t%s", temp1, temp2); free(temp1); free(temp2); @@ -7119,7 +7132,7 @@ static void C_PlayerStats_NoGame(void) if (gamemode != shareware) { temp1 = sentencecase(weaponinfo[wp_plasma].ammoplural); - temp2 = commifystat(stat_itemspickedup_ammo_cells); + temp2 = commifystat(stat_itemspickedup_ammo[am_cell]); C_TabbedOutput(tabs, INDENT INDENT "%s\t\x96\t%s", temp1, temp2); free(temp1); free(temp2); @@ -7184,49 +7197,63 @@ static void C_PlayerStats_NoGame(void) C_TabbedOutput(tabs, "Cheats entered\t\x96\t%s", temp1); free(temp1); - temp1 = commify((shotssuccessful = stat_shotssuccessful_fists + stat_shotssuccessful_chainsaw + stat_shotssuccessful_pistol - + stat_shotssuccessful_shotgun + stat_shotssuccessful_supershotgun + stat_shotssuccessful_chaingun - + stat_shotssuccessful_rocketlauncher + stat_shotssuccessful_plasmarifle + stat_shotssuccessful_bfg9000)); - temp2 = commify((shotsfired = stat_shotsfired_fists + stat_shotsfired_chainsaw + stat_shotsfired_pistol + stat_shotsfired_shotgun - + stat_shotsfired_supershotgun + stat_shotsfired_chaingun + stat_shotsfired_rocketlauncher + stat_shotsfired_plasmarifle - + stat_shotsfired_bfg9000)); + shotssuccessful = stat_shotssuccessful[wp_fist] + + stat_shotssuccessful[wp_chainsaw] + + stat_shotssuccessful[wp_pistol] + + stat_shotssuccessful[wp_shotgun] + + stat_shotssuccessful[wp_supershotgun] + + stat_shotssuccessful[wp_chaingun] + + stat_shotssuccessful[wp_missile] + + (legacyofrust ? stat_shotssuccessful_incinerator : stat_shotssuccessful[wp_plasma]) + + (legacyofrust ? stat_shotssuccessful_calamityblade : stat_shotssuccessful[wp_bfg]); + temp1 = commify(shotssuccessful); + shotsfired = stat_shotsfired[wp_fist] + + stat_shotsfired[wp_chainsaw] + + stat_shotsfired[wp_pistol] + + stat_shotsfired[wp_shotgun] + + stat_shotsfired[wp_supershotgun] + + stat_shotsfired[wp_chaingun] + + stat_shotsfired[wp_missile] + + (legacyofrust ? stat_shotsfired_incinerator : stat_shotsfired[wp_plasma]) + + (legacyofrust ? stat_shotsfired_calamityblade : stat_shotsfired[wp_bfg]); + temp2 = commify(shotsfired); C_TabbedOutput(tabs, "Shots successful/fired\t\x96\t%s of %s (%i%%)", temp1, temp2, (shotsfired ? (int)(shotssuccessful * 100 / shotsfired) : 0)); free(temp1); free(temp2); temp1 = sentencecase(weaponinfo[wp_fist].name); - temp2 = commifystat(stat_shotssuccessful_fists); - temp3 = commifystat(stat_shotsfired_fists); + temp2 = commifystat(stat_shotssuccessful[wp_fist]); + temp3 = commifystat(stat_shotsfired[wp_fist]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_fists ? (int)(stat_shotssuccessful_fists * 100 / stat_shotsfired_fists) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_fist] ? (int)(stat_shotssuccessful[wp_fist] * 100 / stat_shotsfired[wp_fist]) : 0)); free(temp1); free(temp2); free(temp3); temp1 = sentencecase(weaponinfo[wp_chainsaw].name); - temp2 = commifystat(stat_shotssuccessful_chainsaw); - temp3 = commifystat(stat_shotsfired_chainsaw); + temp2 = commifystat(stat_shotssuccessful[wp_chainsaw]); + temp3 = commifystat(stat_shotsfired[wp_chainsaw]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_chainsaw ? (int)(stat_shotssuccessful_chainsaw * 100 / stat_shotsfired_chainsaw) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_chainsaw] ? (int)(stat_shotssuccessful[wp_chainsaw] * 100 / stat_shotsfired[wp_chainsaw]) : 0)); free(temp1); free(temp2); free(temp3); temp1 = sentencecase(weaponinfo[wp_pistol].name); - temp2 = commifystat(stat_shotssuccessful_pistol); - temp3 = commifystat(stat_shotsfired_pistol); + temp2 = commifystat(stat_shotssuccessful[wp_pistol]); + temp3 = commifystat(stat_shotsfired[wp_pistol]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_pistol ? (int)(stat_shotssuccessful_pistol * 100 / stat_shotsfired_pistol) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_pistol] ? (int)(stat_shotssuccessful[wp_pistol] * 100 / stat_shotsfired[wp_pistol]) : 0)); free(temp1); free(temp2); free(temp3); temp1 = sentencecase(weaponinfo[wp_shotgun].name); - temp2 = commifystat(stat_shotssuccessful_shotgun); - temp3 = commifystat(stat_shotsfired_shotgun); + temp2 = commifystat(stat_shotssuccessful[wp_shotgun]); + temp3 = commifystat(stat_shotsfired[wp_shotgun]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_shotgun ? (int)(stat_shotssuccessful_shotgun * 100 / stat_shotsfired_shotgun) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_shotgun] ? (int)(stat_shotssuccessful[wp_shotgun] * 100 / stat_shotsfired[wp_shotgun]) : 0)); free(temp1); free(temp2); free(temp3); @@ -7234,31 +7261,31 @@ static void C_PlayerStats_NoGame(void) if (gamemode == commercial) { temp1 = sentencecase(weaponinfo[wp_supershotgun].name); - temp2 = commifystat(stat_shotssuccessful_supershotgun); - temp3 = commifystat(stat_shotsfired_supershotgun); + temp2 = commifystat(stat_shotssuccessful[wp_supershotgun]); + temp3 = commifystat(stat_shotsfired[wp_supershotgun]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", temp1, temp2, temp3, - (stat_shotsfired_supershotgun ? (int)(stat_shotssuccessful_supershotgun * 100 / stat_shotsfired_supershotgun) : 0)); + (stat_shotsfired[wp_supershotgun] ? (int)(stat_shotssuccessful[wp_supershotgun] * 100 / stat_shotsfired[wp_supershotgun]) : 0)); free(temp1); free(temp2); free(temp3); } temp1 = sentencecase(weaponinfo[wp_chaingun].name); - temp2 = commifystat(stat_shotssuccessful_chaingun); - temp3 = commifystat(stat_shotsfired_chaingun); + temp2 = commifystat(stat_shotssuccessful[wp_chaingun]); + temp3 = commifystat(stat_shotsfired[wp_chaingun]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_chaingun ? (int)(stat_shotssuccessful_chaingun * 100 / stat_shotsfired_chaingun) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_chaingun] ? (int)(stat_shotssuccessful[wp_chaingun] * 100 / stat_shotsfired[wp_chaingun]) : 0)); free(temp1); free(temp2); free(temp3); temp1 = sentencecase(weaponinfo[wp_missile].name); - temp2 = commifystat(stat_shotssuccessful_rocketlauncher); - temp3 = commifystat(stat_shotsfired_rocketlauncher); + temp2 = commifystat(stat_shotssuccessful[wp_missile]); + temp3 = commifystat(stat_shotsfired[wp_missile]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", temp1, temp2, temp3, - (stat_shotsfired_rocketlauncher ? (int)(stat_shotssuccessful_rocketlauncher * 100 / stat_shotsfired_rocketlauncher) : 0)); + (stat_shotsfired[wp_missile] ? (int)(stat_shotssuccessful[wp_missile] * 100 / stat_shotsfired[wp_missile]) : 0)); free(temp1); free(temp2); free(temp3); @@ -7266,20 +7293,20 @@ static void C_PlayerStats_NoGame(void) if (gamemode != shareware) { temp1 = sentencecase(weaponinfo[wp_plasma].name); - temp2 = commifystat(stat_shotssuccessful_plasmarifle); - temp3 = commifystat(stat_shotsfired_plasmarifle); + temp2 = commifystat(stat_shotssuccessful[wp_plasma]); + temp3 = commifystat(stat_shotsfired[wp_plasma]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", temp1, temp2, temp3, - (stat_shotsfired_plasmarifle ? (int)(stat_shotssuccessful_plasmarifle * 100 / stat_shotsfired_plasmarifle) : 0)); + (stat_shotsfired[wp_plasma] ? (int)(stat_shotssuccessful[wp_plasma] * 100 / stat_shotsfired[wp_plasma]) : 0)); free(temp1); free(temp2); free(temp3); temp1 = sentencecase(weaponinfo[wp_bfg].name); - temp2 = commifystat(stat_shotssuccessful_bfg9000); - temp3 = commifystat(stat_shotsfired_bfg9000); + temp2 = commifystat(stat_shotssuccessful[wp_bfg]); + temp3 = commifystat(stat_shotsfired[wp_bfg]); C_TabbedOutput(tabs, INDENT "%s\t\x96\t%s of %s (%i%%)", - temp1, temp2, temp3, (stat_shotsfired_bfg9000 ? (int)(stat_shotssuccessful_bfg9000 * 100 / stat_shotsfired_bfg9000) : 0)); + temp1, temp2, temp3, (stat_shotsfired[wp_bfg] ? (int)(stat_shotssuccessful[wp_bfg] * 100 / stat_shotsfired[wp_bfg]) : 0)); free(temp1); free(temp2); free(temp3); diff --git a/src/m_config.c b/src/m_config.c index b7bb9fe10..bcea296ae 100644 --- a/src/m_config.c +++ b/src/m_config.c @@ -246,11 +246,8 @@ uint64_t stat_firstrun = 0; uint64_t stat_gamesloaded = 0; uint64_t stat_gamessaved = 0; uint64_t stat_itemspickedup = 0; -uint64_t stat_itemspickedup_ammo_bullets = 0; -uint64_t stat_itemspickedup_ammo_cells = 0; +uint64_t stat_itemspickedup_ammo[NUMAMMO] = { 0 }; uint64_t stat_itemspickedup_ammo_fuel = 0; -uint64_t stat_itemspickedup_ammo_rockets = 0; -uint64_t stat_itemspickedup_ammo_shells = 0; uint64_t stat_itemspickedup_armor = 0; uint64_t stat_itemspickedup_health = 0; uint64_t stat_itemspickedup_keys = 0; @@ -272,26 +269,10 @@ uint64_t stat_monstersresurrected = 0; uint64_t stat_monsterstelefragged = 0; uint64_t stat_runs = 0; uint64_t stat_secretsfound = 0; -uint64_t stat_shotsfired_fists = 0; -uint64_t stat_shotsfired_chainsaw = 0; -uint64_t stat_shotsfired_pistol = 0; -uint64_t stat_shotsfired_shotgun = 0; -uint64_t stat_shotsfired_supershotgun = 0; -uint64_t stat_shotsfired_chaingun = 0; -uint64_t stat_shotsfired_rocketlauncher = 0; -uint64_t stat_shotsfired_plasmarifle = 0; -uint64_t stat_shotsfired_bfg9000 = 0; +uint64_t stat_shotsfired[NUMWEAPONS] = { 0 }; uint64_t stat_shotsfired_incinerator = 0; uint64_t stat_shotsfired_calamityblade = 0; -uint64_t stat_shotssuccessful_fists = 0; -uint64_t stat_shotssuccessful_chainsaw = 0; -uint64_t stat_shotssuccessful_pistol = 0; -uint64_t stat_shotssuccessful_shotgun = 0; -uint64_t stat_shotssuccessful_supershotgun = 0; -uint64_t stat_shotssuccessful_chaingun = 0; -uint64_t stat_shotssuccessful_rocketlauncher = 0; -uint64_t stat_shotssuccessful_plasmarifle = 0; -uint64_t stat_shotssuccessful_bfg9000 = 0; +uint64_t stat_shotssuccessful[NUMWEAPONS] = { 0 }; uint64_t stat_shotssuccessful_incinerator = 0; uint64_t stat_shotssuccessful_calamityblade = 0; uint64_t stat_skilllevel_imtooyoungtodie = 0; @@ -319,272 +300,272 @@ static int widestcvar; static default_t cvars[] = { COMMENT("; CVARs\n"), - CVAR_BOOL (alwaysrun, alwaysrun, alwaysrun, BOOLVALUEALIAS ), - CVAR_INT (am_allmapcdwallcolor, am_allmapcdwallcolour, am_allmapcdwallcolor, NOVALUEALIAS ), - CVAR_INT (am_allmapfdwallcolor, am_allmapfdwallcolour, am_allmapfdwallcolor, NOVALUEALIAS ), - CVAR_INT (am_allmapwallcolor, am_allmapwallcolour, am_allmapwallcolor, NOVALUEALIAS ), - CVAR_BOOL (am_antialiasing, am_antialiasing, am_antialiasing, BOOLVALUEALIAS ), - CVAR_INT (am_backcolor, am_backcolour, am_backcolor, NOVALUEALIAS ), - CVAR_INT (am_bloodsplatcolor, am_bloodsplatcolour, am_bloodsplatcolor, NOVALUEALIAS ), - CVAR_INT (am_bluedoorcolor, am_bluedoorcolour, am_bluedoorcolor, NOVALUEALIAS ), - CVAR_INT (am_bluekeycolor, am_bluekeycolour, am_bluekeycolor, NOVALUEALIAS ), - CVAR_INT (am_cdwallcolor, am_cdwallcolour, am_cdwallcolor, NOVALUEALIAS ), - CVAR_INT (am_corpsecolor, am_corpsecolour, am_corpsecolor, NOVALUEALIAS ), - CVAR_INT (am_crosshaircolor, am_crosshaircolour, am_crosshaircolor, NOVALUEALIAS ), - CVAR_INT (am_display, am_display, am_display, NOVALUEALIAS ), - CVAR_BOOL (am_external, am_external, am_external, BOOLVALUEALIAS ), - CVAR_INT (am_fdwallcolor, am_fdwallcolour, am_fdwallcolor, NOVALUEALIAS ), - CVAR_BOOL (am_grid, am_grid, am_grid, BOOLVALUEALIAS ), - CVAR_INT (am_gridcolor, am_gridcolour, am_gridcolor, NOVALUEALIAS ), - CVAR_OTHER (am_gridsize, am_gridsize, am_gridsize, NOVALUEALIAS ), - CVAR_INT (am_markcolor, am_markcolour, am_markcolor, NOVALUEALIAS ), - CVAR_BOOL (am_path, am_path, am_path, BOOLVALUEALIAS ), - CVAR_INT (am_pathcolor, am_pathcolour, am_pathcolor, NOVALUEALIAS ), - CVAR_INT (am_playercolor, am_playercolour, am_playercolor, NOVALUEALIAS ), - CVAR_BOOL (am_playerstats, am_playerstats, am_playerstats, BOOLVALUEALIAS ), - CVAR_INT (am_playerstatscolor, am_playerstatscolour, am_playerstatscolor, NOVALUEALIAS ), - CVAR_INT (am_reddoorcolor, am_reddoorcolour, am_reddoorcolor, NOVALUEALIAS ), - CVAR_INT (am_redkeycolor, am_redkeycolour, am_redkeycolor, NOVALUEALIAS ), - CVAR_BOOL (am_rotatemode, am_rotatemode, am_rotatemode, BOOLVALUEALIAS ), - CVAR_INT (am_teleportercolor, am_teleportercolour, am_teleportercolor, NOVALUEALIAS ), - CVAR_INT (am_thingcolor, am_thingcolour, am_thingcolor, NOVALUEALIAS ), - CVAR_INT (am_tswallcolor, am_tswallcolour, am_tswallcolor, NOVALUEALIAS ), - CVAR_INT (am_wallcolor, am_wallcolour, am_wallcolor, NOVALUEALIAS ), - CVAR_INT (am_yellowdoorcolor, am_yellowdoorcolour, am_yellowdoorcolor, NOVALUEALIAS ), - CVAR_INT (am_yellowkeycolor, am_yellowkeycolour, am_yellowkeycolor, NOVALUEALIAS ), - CVAR_BOOL (animatedstats, animatedstats, animatedstats, BOOLVALUEALIAS ), - CVAR_BOOL (autoaim, autoaim, autoaim, BOOLVALUEALIAS ), - CVAR_BOOL (autoload, autoload, autoload, BOOLVALUEALIAS ), - CVAR_BOOL (autosave, autosave, autosave, BOOLVALUEALIAS ), - CVAR_BOOL (autotilt, autotilt, autotilt, BOOLVALUEALIAS ), - CVAR_BOOL (autouse, autouse, autouse, BOOLVALUEALIAS ), - CVAR_BOOL (centerweapon, centreweapon, centerweapon, BOOLVALUEALIAS ), - CVAR_INT (crosshair, crosshair, crosshair, CROSSHAIRVALUEALIAS), - CVAR_INT (crosshaircolor, crosshaircolour, crosshaircolor, NOVALUEALIAS ), - CVAR_BOOL (english, english, english, ENGLISHVALUEALIAS ), - CVAR_INT (episode, episode, episode, NOVALUEALIAS ), - CVAR_INT (expansion, expansion, expansion, NOVALUEALIAS ), - CVAR_INT (facebackcolor, facebackcolour, facebackcolor, NOVALUEALIAS ), - CVAR_BOOL (fade, fade, fade, BOOLVALUEALIAS ), - CVAR_BOOL (flashkeys, flashkeys, flashkeys, BOOLVALUEALIAS ), - CVAR_BOOL (freelook, mouselook, freelook, BOOLVALUEALIAS ), - CVAR_BOOL (groupmessages, groupmessages, groupmessages, BOOLVALUEALIAS ), - CVAR_BOOL (infighting, infighting, infighting, BOOLVALUEALIAS ), - CVAR_BOOL (infiniteheight, infiniteheight, infiniteheight, BOOLVALUEALIAS ), - CVAR_BOOL (joy_analog, gp_analog, joy_analog, BOOLVALUEALIAS ), - CVAR_FLOAT_PERCENT(joy_deadzone_left, gp_deadzone_left, joy_deadzone_left, NOVALUEALIAS ), - CVAR_FLOAT_PERCENT(joy_deadzone_right, gp_deadzone_right, joy_deadzone_right, NOVALUEALIAS ), - CVAR_BOOL (joy_invertyaxis, gp_invertyaxis, joy_invertyaxis, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (joy_rumble_barrels, gp_vibrate_barrels, joy_rumble_barrels, NOVALUEALIAS ), - CVAR_INT_PERCENT (joy_rumble_damage, gp_vibrate_damage, joy_rumble_damage, NOVALUEALIAS ), - CVAR_BOOL (joy_rumble_pickup, joy_rumble_pickup, joy_rumble_pickup, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (joy_rumble_weapons, gp_vibrate_weaponss, joy_rumble_weapons, NOVALUEALIAS ), - CVAR_FLOAT (joy_sensitivity_horizontal, gp_sensitivity_horizontal, joy_sensitivity_horizontal, NOVALUEALIAS ), - CVAR_FLOAT (joy_sensitivity_vertical, gp_sensitivity_vertical, joy_sensitivity_vertical, NOVALUEALIAS ), - CVAR_BOOL (joy_swapthumbsticks, gp_swapthumbsticks, joy_swapthumbsticks, BOOLVALUEALIAS ), - CVAR_INT (joy_thumbsticks, gp_thumbsticks, joy_thumbsticks, NOVALUEALIAS ), - CVAR_BOOL (m_acceleration, m_acceleration, m_acceleration, BOOLVALUEALIAS ), - CVAR_BOOL (m_doubleclick_use, m_doubleclick_use, m_doubleclick_use, BOOLVALUEALIAS ), - CVAR_BOOL (m_invertyaxis, m_invertyaxis, m_invertyaxis, BOOLVALUEALIAS ), - CVAR_BOOL (m_novertical, m_novertical, m_novertical, BOOLVALUEALIAS ), - CVAR_BOOL (m_pointer, m_pointer, m_pointer, BOOLVALUEALIAS ), - CVAR_FLOAT (m_sensitivity, m_sensitivity, m_sensitivity, NOVALUEALIAS ), - CVAR_BOOL (melt, wipe, melt, BOOLVALUEALIAS ), - CVAR_BOOL (menuhighlight, menuhighlight, menuhighlight, BOOLVALUEALIAS ), - CVAR_BOOL (menushadow, menushadow, menushadow, BOOLVALUEALIAS ), - CVAR_BOOL (menuspin, menuspin, menuspin, BOOLVALUEALIAS ), - CVAR_BOOL (messages, messages, messages, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (movebob, movebob, movebob, NOVALUEALIAS ), - CVAR_BOOL (negativehealth, negativehealth, negativehealth, BOOLVALUEALIAS ), - CVAR_BOOL (obituaries, con_obituaries, obituaries, BOOLVALUEALIAS ), - CVAR_INT (playergender, playergender, playergender, GENDERVALUEALIAS ), - CVAR_STRING (playername, playername, playername, NOVALUEALIAS ), - CVAR_BOOL (r_althud, r_althud, r_althud, BOOLVALUEALIAS ), - CVAR_BOOL (r_antialiasing, r_supersampling, r_antialiasing, BOOLVALUEALIAS ), - CVAR_INT (r_berserkeffect, r_berserkeffect, r_berserkeffect, NOVALUEALIAS ), - CVAR_INT (r_blood, r_blood, r_blood, BLOODVALUEALIAS ), - CVAR_BOOL (r_blood_gibs, r_blood_gibs, r_blood_gibs, BOOLVALUEALIAS ), - CVAR_BOOL (r_blood_melee, r_blood_melee, r_blood_melee, BOOLVALUEALIAS ), - CVAR_INT (r_bloodsplats_max, r_bloodsplats_max, r_bloodsplats_max, NOVALUEALIAS ), - CVAR_BOOL (r_bloodsplats_translucency, r_bloodsplats_translucency, r_bloodsplats_translucency, BOOLVALUEALIAS ), - CVAR_BOOL (r_brightmaps, r_brightmaps, r_brightmaps, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_color, r_corpses_colour, r_corpses_color, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_gib, r_corpses_gib, r_corpses_gib, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_mirrored, r_corpses_mirrored, r_corpses_mirrored, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_moreblood, r_corpses_moreblood, r_corpses_moreblood, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_nudge, r_corpses_nudge, r_corpses_nudge, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_slide, r_corpses_slide, r_corpses_slide, BOOLVALUEALIAS ), - CVAR_BOOL (r_corpses_smearblood, r_corpses_smearblood, r_corpses_smearblood, BOOLVALUEALIAS ), - CVAR_BOOL (r_damageeffect, r_damageeffect, r_damageeffect, BOOLVALUEALIAS ), - CVAR_INT (r_detail, r_detail, r_detail, DETAILVALUEALIAS ), - CVAR_BOOL (r_diskicon, r_diskicon, r_diskicon, BOOLVALUEALIAS ), - CVAR_BOOL (r_ditheredlighting, r_ditheredlighting, r_ditheredlighting, BOOLVALUEALIAS ), - CVAR_BOOL (r_fixmaperrors, r_fixmaperrors, r_fixmaperrors, BOOLVALUEALIAS ), - CVAR_BOOL (r_fixspriteoffsets, r_fixspriteoffsets, r_fixspriteoffsets, BOOLVALUEALIAS ), - CVAR_BOOL (r_floatbob, r_floatbob, r_floatbob, BOOLVALUEALIAS ), - CVAR_INT (r_fov, r_fov, r_fov, NOVALUEALIAS ), - CVAR_FLOAT (r_gamma, r_gamma, r_gamma, GAMMAVALUEALIAS ), - CVAR_BOOL (r_graduallighting, r_graduallighting, r_graduallighting, BOOLVALUEALIAS ), - CVAR_BOOL (r_homindicator, r_homindicator, r_homindicator, BOOLVALUEALIAS ), - CVAR_BOOL (r_hud, r_hud, r_hud, BOOLVALUEALIAS ), - CVAR_BOOL (r_hud_translucency, r_hud_translucency, r_hud_translucency, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (r_levelbrightness, r_levelbrightness, r_levelbrightness, NOVALUEALIAS ), - CVAR_BOOL (r_linearskies, r_linearskies, r_linearskies, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_bob, r_liquid_bob, r_liquid_bob, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_bobsprites, r_liquid_bobsprites, r_liquid_bobsprites, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_clipsprites, r_liquid_clipsprites, r_liquid_clipsprites, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_current, r_liquid_current, r_liquid_current, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_lowerview, r_liquid_lowerview, r_liquid_lowerview, BOOLVALUEALIAS ), - CVAR_BOOL (r_liquid_swirl, r_liquid_swirl, r_liquid_swirl, BOOLVALUEALIAS ), - CVAR_OTHER (r_lowpixelsize, r_lowpixelsize, r_lowpixelsize, NOVALUEALIAS ), - CVAR_BOOL (r_mirroredweapons, r_mirroredweapons, r_mirroredweapons, BOOLVALUEALIAS ), - CVAR_BOOL (r_pickupeffect, r_pickupeffect, r_pickupeffect, BOOLVALUEALIAS ), - CVAR_BOOL (r_playersprites, r_playersprites, r_playersprites, BOOLVALUEALIAS ), - CVAR_BOOL (r_radsuiteffect, r_radsuiteffect, r_radsuiteffect, BOOLVALUEALIAS ), - CVAR_BOOL (r_randomstartframes, r_randomstartframes, r_randomstartframes, BOOLVALUEALIAS ), - CVAR_BOOL (r_rockettrails, r_rockettrails, r_rockettrails, BOOLVALUEALIAS ), - CVAR_BOOL (r_rockettrails_translucency, r_rockettrails_translucency, r_rockettrails_translucency, BOOLVALUEALIAS ), - CVAR_INT (r_screensize, r_screensize, r_screensize, NOVALUEALIAS ), - CVAR_BOOL (r_shadows, r_shadows, r_shadows, BOOLVALUEALIAS ), - CVAR_BOOL (r_shadows_translucency, r_shadows_translucency, r_shadows_translucency, BOOLVALUEALIAS ), - CVAR_BOOL (r_shake_barrels, r_shake_barrels, r_shake_barrels, BOOLVALUEALIAS ), - CVAR_BOOL (r_shake_berserk, r_shake_berserk, r_shake_berserk, BOOLVALUEALIAS ), - CVAR_BOOL (r_shake_damage, r_shake_damage, r_shake_damage, BOOLVALUEALIAS ), - CVAR_BOOL (r_sprites_translucency, r_translucency, r_sprites_translucency, BOOLVALUEALIAS ), - CVAR_BOOL (r_textures, r_textures, r_textures, BOOLVALUEALIAS ), - CVAR_BOOL (r_textures_translucency, r_textures_translucency, r_textures_translucency, BOOLVALUEALIAS ), - CVAR_INT (s_channels, s_channels, s_channels, NOVALUEALIAS ), - CVAR_BOOL (s_lowermenumusic, s_lowermenumusic, s_lowermenumusic, BOOLVALUEALIAS ), - CVAR_BOOL (s_musicinbackground, s_musicinbackground, s_musicinbackground, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (s_musicvolume, s_musicvolume, s_musicvolume, NOVALUEALIAS ), - CVAR_BOOL (s_randommusic, s_randommusic, s_randommusic, BOOLVALUEALIAS ), - CVAR_BOOL (s_randompitch, s_randompitch, s_randompitch, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (s_sfxvolume, s_sfxvolume, s_sfxvolume, NOVALUEALIAS ), - CVAR_BOOL (s_stereo, s_stereo, s_stereo, BOOLVALUEALIAS ), - CVAR_INT (savegame, savegame, savegame, NOVALUEALIAS ), - CVAR_BOOL (secretmessages, secretmessages, secretmessages, BOOLVALUEALIAS ), - CVAR_INT (skilllevel, skilllevel, skilllevel, NOVALUEALIAS ), - CVAR_INT_PERCENT (stillbob, stillbob, stillbob, NOVALUEALIAS ), - CVAR_INT (sucktime, sucktime, sucktime, SUCKSVALUEALIAS ), - CVAR_BOOL (tossdrop, tossdrop, tossdrop, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (turbo, turbo, turbo, NOVALUEALIAS ), - CVAR_INT (units, units, units, UNITSVALUEALIAS ), - CVAR_STRING (version, version, version, NOVALUEALIAS ), - CVAR_INT (vid_aspectratio, vid_aspectratio, vid_aspectratio, RATIOVALUEALIAS ), - CVAR_INT_PERCENT (vid_blue, vid_blue, vid_blue, NOVALUEALIAS ), - CVAR_BOOL (vid_borderlesswindow, vid_borderlesswindow, vid_borderlesswindow, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (vid_brightness, vid_brightness, vid_brightness, NOVALUEALIAS ), - CVAR_INT (vid_capfps, vid_capfps, vid_capfps, CAPVALUEALIAS ), - CVAR_INT_PERCENT (vid_contrast, vid_contrast, vid_contrast, NOVALUEALIAS ), - CVAR_INT (vid_display, vid_display, vid_display, NOVALUEALIAS ), + CVAR_BOOL (alwaysrun, alwaysrun, alwaysrun, BOOLVALUEALIAS ), + CVAR_INT (am_allmapcdwallcolor, am_allmapcdwallcolour, am_allmapcdwallcolor, NOVALUEALIAS ), + CVAR_INT (am_allmapfdwallcolor, am_allmapfdwallcolour, am_allmapfdwallcolor, NOVALUEALIAS ), + CVAR_INT (am_allmapwallcolor, am_allmapwallcolour, am_allmapwallcolor, NOVALUEALIAS ), + CVAR_BOOL (am_antialiasing, am_antialiasing, am_antialiasing, BOOLVALUEALIAS ), + CVAR_INT (am_backcolor, am_backcolour, am_backcolor, NOVALUEALIAS ), + CVAR_INT (am_bloodsplatcolor, am_bloodsplatcolour, am_bloodsplatcolor, NOVALUEALIAS ), + CVAR_INT (am_bluedoorcolor, am_bluedoorcolour, am_bluedoorcolor, NOVALUEALIAS ), + CVAR_INT (am_bluekeycolor, am_bluekeycolour, am_bluekeycolor, NOVALUEALIAS ), + CVAR_INT (am_cdwallcolor, am_cdwallcolour, am_cdwallcolor, NOVALUEALIAS ), + CVAR_INT (am_corpsecolor, am_corpsecolour, am_corpsecolor, NOVALUEALIAS ), + CVAR_INT (am_crosshaircolor, am_crosshaircolour, am_crosshaircolor, NOVALUEALIAS ), + CVAR_INT (am_display, am_display, am_display, NOVALUEALIAS ), + CVAR_BOOL (am_external, am_external, am_external, BOOLVALUEALIAS ), + CVAR_INT (am_fdwallcolor, am_fdwallcolour, am_fdwallcolor, NOVALUEALIAS ), + CVAR_BOOL (am_grid, am_grid, am_grid, BOOLVALUEALIAS ), + CVAR_INT (am_gridcolor, am_gridcolour, am_gridcolor, NOVALUEALIAS ), + CVAR_OTHER (am_gridsize, am_gridsize, am_gridsize, NOVALUEALIAS ), + CVAR_INT (am_markcolor, am_markcolour, am_markcolor, NOVALUEALIAS ), + CVAR_BOOL (am_path, am_path, am_path, BOOLVALUEALIAS ), + CVAR_INT (am_pathcolor, am_pathcolour, am_pathcolor, NOVALUEALIAS ), + CVAR_INT (am_playercolor, am_playercolour, am_playercolor, NOVALUEALIAS ), + CVAR_BOOL (am_playerstats, am_playerstats, am_playerstats, BOOLVALUEALIAS ), + CVAR_INT (am_playerstatscolor, am_playerstatscolour, am_playerstatscolor, NOVALUEALIAS ), + CVAR_INT (am_reddoorcolor, am_reddoorcolour, am_reddoorcolor, NOVALUEALIAS ), + CVAR_INT (am_redkeycolor, am_redkeycolour, am_redkeycolor, NOVALUEALIAS ), + CVAR_BOOL (am_rotatemode, am_rotatemode, am_rotatemode, BOOLVALUEALIAS ), + CVAR_INT (am_teleportercolor, am_teleportercolour, am_teleportercolor, NOVALUEALIAS ), + CVAR_INT (am_thingcolor, am_thingcolour, am_thingcolor, NOVALUEALIAS ), + CVAR_INT (am_tswallcolor, am_tswallcolour, am_tswallcolor, NOVALUEALIAS ), + CVAR_INT (am_wallcolor, am_wallcolour, am_wallcolor, NOVALUEALIAS ), + CVAR_INT (am_yellowdoorcolor, am_yellowdoorcolour, am_yellowdoorcolor, NOVALUEALIAS ), + CVAR_INT (am_yellowkeycolor, am_yellowkeycolour, am_yellowkeycolor, NOVALUEALIAS ), + CVAR_BOOL (animatedstats, animatedstats, animatedstats, BOOLVALUEALIAS ), + CVAR_BOOL (autoaim, autoaim, autoaim, BOOLVALUEALIAS ), + CVAR_BOOL (autoload, autoload, autoload, BOOLVALUEALIAS ), + CVAR_BOOL (autosave, autosave, autosave, BOOLVALUEALIAS ), + CVAR_BOOL (autotilt, autotilt, autotilt, BOOLVALUEALIAS ), + CVAR_BOOL (autouse, autouse, autouse, BOOLVALUEALIAS ), + CVAR_BOOL (centerweapon, centreweapon, centerweapon, BOOLVALUEALIAS ), + CVAR_INT (crosshair, crosshair, crosshair, CROSSHAIRVALUEALIAS), + CVAR_INT (crosshaircolor, crosshaircolour, crosshaircolor, NOVALUEALIAS ), + CVAR_BOOL (english, english, english, ENGLISHVALUEALIAS ), + CVAR_INT (episode, episode, episode, NOVALUEALIAS ), + CVAR_INT (expansion, expansion, expansion, NOVALUEALIAS ), + CVAR_INT (facebackcolor, facebackcolour, facebackcolor, NOVALUEALIAS ), + CVAR_BOOL (fade, fade, fade, BOOLVALUEALIAS ), + CVAR_BOOL (flashkeys, flashkeys, flashkeys, BOOLVALUEALIAS ), + CVAR_BOOL (freelook, mouselook, freelook, BOOLVALUEALIAS ), + CVAR_BOOL (groupmessages, groupmessages, groupmessages, BOOLVALUEALIAS ), + CVAR_BOOL (infighting, infighting, infighting, BOOLVALUEALIAS ), + CVAR_BOOL (infiniteheight, infiniteheight, infiniteheight, BOOLVALUEALIAS ), + CVAR_BOOL (joy_analog, gp_analog, joy_analog, BOOLVALUEALIAS ), + CVAR_FLOAT_PERCENT(joy_deadzone_left, gp_deadzone_left, joy_deadzone_left, NOVALUEALIAS ), + CVAR_FLOAT_PERCENT(joy_deadzone_right, gp_deadzone_right, joy_deadzone_right, NOVALUEALIAS ), + CVAR_BOOL (joy_invertyaxis, gp_invertyaxis, joy_invertyaxis, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (joy_rumble_barrels, gp_vibrate_barrels, joy_rumble_barrels, NOVALUEALIAS ), + CVAR_INT_PERCENT (joy_rumble_damage, gp_vibrate_damage, joy_rumble_damage, NOVALUEALIAS ), + CVAR_BOOL (joy_rumble_pickup, joy_rumble_pickup, joy_rumble_pickup, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (joy_rumble_weapons, gp_vibrate_weaponss, joy_rumble_weapons, NOVALUEALIAS ), + CVAR_FLOAT (joy_sensitivity_horizontal, gp_sensitivity_horizontal, joy_sensitivity_horizontal, NOVALUEALIAS ), + CVAR_FLOAT (joy_sensitivity_vertical, gp_sensitivity_vertical, joy_sensitivity_vertical, NOVALUEALIAS ), + CVAR_BOOL (joy_swapthumbsticks, gp_swapthumbsticks, joy_swapthumbsticks, BOOLVALUEALIAS ), + CVAR_INT (joy_thumbsticks, gp_thumbsticks, joy_thumbsticks, NOVALUEALIAS ), + CVAR_BOOL (m_acceleration, m_acceleration, m_acceleration, BOOLVALUEALIAS ), + CVAR_BOOL (m_doubleclick_use, m_doubleclick_use, m_doubleclick_use, BOOLVALUEALIAS ), + CVAR_BOOL (m_invertyaxis, m_invertyaxis, m_invertyaxis, BOOLVALUEALIAS ), + CVAR_BOOL (m_novertical, m_novertical, m_novertical, BOOLVALUEALIAS ), + CVAR_BOOL (m_pointer, m_pointer, m_pointer, BOOLVALUEALIAS ), + CVAR_FLOAT (m_sensitivity, m_sensitivity, m_sensitivity, NOVALUEALIAS ), + CVAR_BOOL (melt, wipe, melt, BOOLVALUEALIAS ), + CVAR_BOOL (menuhighlight, menuhighlight, menuhighlight, BOOLVALUEALIAS ), + CVAR_BOOL (menushadow, menushadow, menushadow, BOOLVALUEALIAS ), + CVAR_BOOL (menuspin, menuspin, menuspin, BOOLVALUEALIAS ), + CVAR_BOOL (messages, messages, messages, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (movebob, movebob, movebob, NOVALUEALIAS ), + CVAR_BOOL (negativehealth, negativehealth, negativehealth, BOOLVALUEALIAS ), + CVAR_BOOL (obituaries, con_obituaries, obituaries, BOOLVALUEALIAS ), + CVAR_INT (playergender, playergender, playergender, GENDERVALUEALIAS ), + CVAR_STRING (playername, playername, playername, NOVALUEALIAS ), + CVAR_BOOL (r_althud, r_althud, r_althud, BOOLVALUEALIAS ), + CVAR_BOOL (r_antialiasing, r_supersampling, r_antialiasing, BOOLVALUEALIAS ), + CVAR_INT (r_berserkeffect, r_berserkeffect, r_berserkeffect, NOVALUEALIAS ), + CVAR_INT (r_blood, r_blood, r_blood, BLOODVALUEALIAS ), + CVAR_BOOL (r_blood_gibs, r_blood_gibs, r_blood_gibs, BOOLVALUEALIAS ), + CVAR_BOOL (r_blood_melee, r_blood_melee, r_blood_melee, BOOLVALUEALIAS ), + CVAR_INT (r_bloodsplats_max, r_bloodsplats_max, r_bloodsplats_max, NOVALUEALIAS ), + CVAR_BOOL (r_bloodsplats_translucency, r_bloodsplats_translucency, r_bloodsplats_translucency, BOOLVALUEALIAS ), + CVAR_BOOL (r_brightmaps, r_brightmaps, r_brightmaps, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_color, r_corpses_colour, r_corpses_color, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_gib, r_corpses_gib, r_corpses_gib, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_mirrored, r_corpses_mirrored, r_corpses_mirrored, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_moreblood, r_corpses_moreblood, r_corpses_moreblood, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_nudge, r_corpses_nudge, r_corpses_nudge, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_slide, r_corpses_slide, r_corpses_slide, BOOLVALUEALIAS ), + CVAR_BOOL (r_corpses_smearblood, r_corpses_smearblood, r_corpses_smearblood, BOOLVALUEALIAS ), + CVAR_BOOL (r_damageeffect, r_damageeffect, r_damageeffect, BOOLVALUEALIAS ), + CVAR_INT (r_detail, r_detail, r_detail, DETAILVALUEALIAS ), + CVAR_BOOL (r_diskicon, r_diskicon, r_diskicon, BOOLVALUEALIAS ), + CVAR_BOOL (r_ditheredlighting, r_ditheredlighting, r_ditheredlighting, BOOLVALUEALIAS ), + CVAR_BOOL (r_fixmaperrors, r_fixmaperrors, r_fixmaperrors, BOOLVALUEALIAS ), + CVAR_BOOL (r_fixspriteoffsets, r_fixspriteoffsets, r_fixspriteoffsets, BOOLVALUEALIAS ), + CVAR_BOOL (r_floatbob, r_floatbob, r_floatbob, BOOLVALUEALIAS ), + CVAR_INT (r_fov, r_fov, r_fov, NOVALUEALIAS ), + CVAR_FLOAT (r_gamma, r_gamma, r_gamma, GAMMAVALUEALIAS ), + CVAR_BOOL (r_graduallighting, r_graduallighting, r_graduallighting, BOOLVALUEALIAS ), + CVAR_BOOL (r_homindicator, r_homindicator, r_homindicator, BOOLVALUEALIAS ), + CVAR_BOOL (r_hud, r_hud, r_hud, BOOLVALUEALIAS ), + CVAR_BOOL (r_hud_translucency, r_hud_translucency, r_hud_translucency, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (r_levelbrightness, r_levelbrightness, r_levelbrightness, NOVALUEALIAS ), + CVAR_BOOL (r_linearskies, r_linearskies, r_linearskies, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_bob, r_liquid_bob, r_liquid_bob, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_bobsprites, r_liquid_bobsprites, r_liquid_bobsprites, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_clipsprites, r_liquid_clipsprites, r_liquid_clipsprites, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_current, r_liquid_current, r_liquid_current, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_lowerview, r_liquid_lowerview, r_liquid_lowerview, BOOLVALUEALIAS ), + CVAR_BOOL (r_liquid_swirl, r_liquid_swirl, r_liquid_swirl, BOOLVALUEALIAS ), + CVAR_OTHER (r_lowpixelsize, r_lowpixelsize, r_lowpixelsize, NOVALUEALIAS ), + CVAR_BOOL (r_mirroredweapons, r_mirroredweapons, r_mirroredweapons, BOOLVALUEALIAS ), + CVAR_BOOL (r_pickupeffect, r_pickupeffect, r_pickupeffect, BOOLVALUEALIAS ), + CVAR_BOOL (r_playersprites, r_playersprites, r_playersprites, BOOLVALUEALIAS ), + CVAR_BOOL (r_radsuiteffect, r_radsuiteffect, r_radsuiteffect, BOOLVALUEALIAS ), + CVAR_BOOL (r_randomstartframes, r_randomstartframes, r_randomstartframes, BOOLVALUEALIAS ), + CVAR_BOOL (r_rockettrails, r_rockettrails, r_rockettrails, BOOLVALUEALIAS ), + CVAR_BOOL (r_rockettrails_translucency, r_rockettrails_translucency, r_rockettrails_translucency, BOOLVALUEALIAS ), + CVAR_INT (r_screensize, r_screensize, r_screensize, NOVALUEALIAS ), + CVAR_BOOL (r_shadows, r_shadows, r_shadows, BOOLVALUEALIAS ), + CVAR_BOOL (r_shadows_translucency, r_shadows_translucency, r_shadows_translucency, BOOLVALUEALIAS ), + CVAR_BOOL (r_shake_barrels, r_shake_barrels, r_shake_barrels, BOOLVALUEALIAS ), + CVAR_BOOL (r_shake_berserk, r_shake_berserk, r_shake_berserk, BOOLVALUEALIAS ), + CVAR_BOOL (r_shake_damage, r_shake_damage, r_shake_damage, BOOLVALUEALIAS ), + CVAR_BOOL (r_sprites_translucency, r_translucency, r_sprites_translucency, BOOLVALUEALIAS ), + CVAR_BOOL (r_textures, r_textures, r_textures, BOOLVALUEALIAS ), + CVAR_BOOL (r_textures_translucency, r_textures_translucency, r_textures_translucency, BOOLVALUEALIAS ), + CVAR_INT (s_channels, s_channels, s_channels, NOVALUEALIAS ), + CVAR_BOOL (s_lowermenumusic, s_lowermenumusic, s_lowermenumusic, BOOLVALUEALIAS ), + CVAR_BOOL (s_musicinbackground, s_musicinbackground, s_musicinbackground, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (s_musicvolume, s_musicvolume, s_musicvolume, NOVALUEALIAS ), + CVAR_BOOL (s_randommusic, s_randommusic, s_randommusic, BOOLVALUEALIAS ), + CVAR_BOOL (s_randompitch, s_randompitch, s_randompitch, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (s_sfxvolume, s_sfxvolume, s_sfxvolume, NOVALUEALIAS ), + CVAR_BOOL (s_stereo, s_stereo, s_stereo, BOOLVALUEALIAS ), + CVAR_INT (savegame, savegame, savegame, NOVALUEALIAS ), + CVAR_BOOL (secretmessages, secretmessages, secretmessages, BOOLVALUEALIAS ), + CVAR_INT (skilllevel, skilllevel, skilllevel, NOVALUEALIAS ), + CVAR_INT_PERCENT (stillbob, stillbob, stillbob, NOVALUEALIAS ), + CVAR_INT (sucktime, sucktime, sucktime, SUCKSVALUEALIAS ), + CVAR_BOOL (tossdrop, tossdrop, tossdrop, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (turbo, turbo, turbo, NOVALUEALIAS ), + CVAR_INT (units, units, units, UNITSVALUEALIAS ), + CVAR_STRING (version, version, version, NOVALUEALIAS ), + CVAR_INT (vid_aspectratio, vid_aspectratio, vid_aspectratio, RATIOVALUEALIAS ), + CVAR_INT_PERCENT (vid_blue, vid_blue, vid_blue, NOVALUEALIAS ), + CVAR_BOOL (vid_borderlesswindow, vid_borderlesswindow, vid_borderlesswindow, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (vid_brightness, vid_brightness, vid_brightness, NOVALUEALIAS ), + CVAR_INT (vid_capfps, vid_capfps, vid_capfps, CAPVALUEALIAS ), + CVAR_INT_PERCENT (vid_contrast, vid_contrast, vid_contrast, NOVALUEALIAS ), + CVAR_INT (vid_display, vid_display, vid_display, NOVALUEALIAS ), #if !defined(_WIN32) - CVAR_STRING (vid_driver, vid_driver, vid_driver, NOVALUEALIAS ), + CVAR_STRING (vid_driver, vid_driver, vid_driver, NOVALUEALIAS ), #endif - CVAR_BOOL (vid_fullscreen, vid_fullscreen, vid_fullscreen, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (vid_green, vid_green, vid_green, NOVALUEALIAS ), - CVAR_INT_PERCENT (vid_motionblur, vid_motionblur, vid_motionblur, NOVALUEALIAS ), - CVAR_BOOL (vid_pillarboxes, vid_pillarboxes, vid_pillarboxes, BOOLVALUEALIAS ), - CVAR_INT_PERCENT (vid_red, vid_red, vid_red, NOVALUEALIAS ), - CVAR_INT_PERCENT (vid_saturation, vid_saturation, vid_saturation, NOVALUEALIAS ), - CVAR_STRING (vid_scaleapi, vid_scaleapi, vid_scaleapi, NOVALUEALIAS ), - CVAR_STRING (vid_scalefilter, vid_scalefilter, vid_scalefilter, NOVALUEALIAS ), - CVAR_OTHER (vid_screenresolution, vid_screenresolution, vid_screenresolution, NOVALUEALIAS ), - CVAR_INT (vid_vsync, vid_vsync, vid_vsync, VSYNCVALUEALIAS ), - CVAR_BOOL (vid_widescreen, vid_widescreen, vid_widescreen, BOOLVALUEALIAS ), - CVAR_OTHER (vid_windowpos, vid_windowposition, vid_windowpos, NOVALUEALIAS ), - CVAR_OTHER (vid_windowsize, vid_windowsize, vid_windowsize, NOVALUEALIAS ), + CVAR_BOOL (vid_fullscreen, vid_fullscreen, vid_fullscreen, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (vid_green, vid_green, vid_green, NOVALUEALIAS ), + CVAR_INT_PERCENT (vid_motionblur, vid_motionblur, vid_motionblur, NOVALUEALIAS ), + CVAR_BOOL (vid_pillarboxes, vid_pillarboxes, vid_pillarboxes, BOOLVALUEALIAS ), + CVAR_INT_PERCENT (vid_red, vid_red, vid_red, NOVALUEALIAS ), + CVAR_INT_PERCENT (vid_saturation, vid_saturation, vid_saturation, NOVALUEALIAS ), + CVAR_STRING (vid_scaleapi, vid_scaleapi, vid_scaleapi, NOVALUEALIAS ), + CVAR_STRING (vid_scalefilter, vid_scalefilter, vid_scalefilter, NOVALUEALIAS ), + CVAR_OTHER (vid_screenresolution, vid_screenresolution, vid_screenresolution, NOVALUEALIAS ), + CVAR_INT (vid_vsync, vid_vsync, vid_vsync, VSYNCVALUEALIAS ), + CVAR_BOOL (vid_widescreen, vid_widescreen, vid_widescreen, BOOLVALUEALIAS ), + CVAR_OTHER (vid_windowpos, vid_windowposition, vid_windowpos, NOVALUEALIAS ), + CVAR_OTHER (vid_windowsize, vid_windowsize, vid_windowsize, NOVALUEALIAS ), #if defined(_WIN32) - CVAR_STRING (wad, wad, wad, NOVALUEALIAS ), + CVAR_STRING (wad, wad, wad, NOVALUEALIAS ), #endif - CVAR_STRING (wadfolder, iwadfolder, wadfolder, NOVALUEALIAS ), - CVAR_INT (warninglevel, warninglevel, warninglevel, NOVALUEALIAS ), - CVAR_INT_PERCENT (weaponbob, weaponbob, weaponbob, NOVALUEALIAS ), - CVAR_BOOL (weaponbounce, weaponbounce, weaponbounce, BOOLVALUEALIAS ), - CVAR_BOOL (weaponrecoil, weaponrecoil, weaponrecoil, BOOLVALUEALIAS ), + CVAR_STRING (wadfolder, iwadfolder, wadfolder, NOVALUEALIAS ), + CVAR_INT (warninglevel, warninglevel, warninglevel, NOVALUEALIAS ), + CVAR_INT_PERCENT (weaponbob, weaponbob, weaponbob, NOVALUEALIAS ), + CVAR_BOOL (weaponbounce, weaponbounce, weaponbounce, BOOLVALUEALIAS ), + CVAR_BOOL (weaponrecoil, weaponrecoil, weaponrecoil, BOOLVALUEALIAS ), BLANKLINE, COMMENT("; player stats\n"), - STAT_INT_UNSIGNED (automapopened, stat_automapopened, stat_automapopened, NOVALUEALIAS ), - STAT_INT_UNSIGNED (barrelsexploded, stat_barrelsexploded, stat_barrelsexploded, NOVALUEALIAS ), - STAT_INT_UNSIGNED (cheatsentered, stat_cheats, stat_cheatsentered, NOVALUEALIAS ), - STAT_INT_UNSIGNED (damageinflicted, stat_damageinflicted, stat_damageinflicted, NOVALUEALIAS ), - STAT_INT_UNSIGNED (damagereceived, stat_damagereceived, stat_damagereceived, NOVALUEALIAS ), - STAT_INT_UNSIGNED (deaths, stat_deaths, stat_deaths, NOVALUEALIAS ), - STAT_INT_UNSIGNED (distancetraveled, stat_distancetraveled, stat_distancetraveled, NOVALUEALIAS ), - STAT_INT_UNSIGNED (firstrun, stat_firstrun, stat_firstrun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (gamesloaded, stat_gamesloaded, stat_gamesloaded, NOVALUEALIAS ), - STAT_INT_UNSIGNED (gamessaved, stat_gamessaved, stat_gamessaved, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup, stat_itemspickedup, stat_itemspickedup, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_ammo_bullets, stat_itemspickedup_ammo_bullets, stat_itemspickedup_ammo_bullets, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_ammo_shells, stat_itemspickedup_ammo_shells, stat_itemspickedup_ammo_shells, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_ammo_rockets, stat_itemspickedup_ammo_rockets, stat_itemspickedup_ammo_rockets, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_ammo_cells, stat_itemspickedup_ammo_cells, stat_itemspickedup_ammo_cells, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_ammo_fuel, stat_itemspickedup_ammo_fuel, stat_itemspickedup_ammo_fuel, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_armor, stat_itemspickedup_armor, stat_itemspickedup_armor, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_health, stat_itemspickedup_health, stat_itemspickedup_health, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_keys, stat_itemspickedup_keys, stat_itemspickedup_keys, NOVALUEALIAS ), - STAT_INT_UNSIGNED (itemspickedup_powerups, stat_itemspickedup_powerups, stat_itemspickedup_powerups, NOVALUEALIAS ), - STAT_INT_UNSIGNED (mapsfinished, mapscompleted, stat_mapsfinished, NOVALUEALIAS ), - STAT_INT_UNSIGNED (mapsstarted, stat_mapsstarted, stat_mapsstarted, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monstersgibbed, stat_monstersgibbed, stat_monstersgibbed, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled, stat_monsterskilled, stat_monsterskilled_total, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_infighting, stat_monsterskilled_infighting, stat_monsterskilled_infighting, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_arachnotrons, stat_monsterskilled_arachnotrons, stat_monsterskilled[MT_BABY], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_archviles, stat_monsterskilled_archviles, stat_monsterskilled[MT_VILE], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_banshees, stat_monsterskilled_banshees, stat_monsterskilled_banshees, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_baronsofhell, stat_monsterskilled_baronsofhell, stat_monsterskilled[MT_BRUISER], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_cacodemons, stat_monsterskilled_cacodemons, stat_monsterskilled[MT_HEAD], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_chaingunners, stat_monsterskilled_heavyweapondudes, stat_monsterskilled[MT_CHAINGUY], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_cyberdemons, stat_monsterskilled_cyberdemons, stat_monsterskilled[MT_CYBORG], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_ghouls, stat_monsterskilled_ghouls, stat_monsterskilled_ghouls, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_hellknights, stat_monsterskilled_hellknights, stat_monsterskilled[MT_KNIGHT], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_imps, stat_monsterskilled_imps, stat_monsterskilled[MT_TROOP], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_lostsouls, stat_monsterskilled_lostsouls, stat_monsterskilled[MT_SKULL], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_mancubi, stat_monsterskilled_mancubi, stat_monsterskilled[MT_FATSO], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_mindweavers, stat_monsterskilled_mindweavers, stat_monsterskilled_mindweavers, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_painelementals, stat_monsterskilled_painelementals, stat_monsterskilled[MT_PAIN], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_pinkydemons, stat_monsterskilled_demons, stat_monsterskilled[MT_SERGEANT], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_revenants, stat_monsterskilled_revenants, stat_monsterskilled[MT_UNDEAD], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_shocktroopers, stat_monsterskilled_shocktroopers, stat_monsterskilled_shocktroopers, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_shotgunguys, stat_monsterskilled_shotgunguys, stat_monsterskilled[MT_SHOTGUY], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_spectres, stat_monsterskilled_spectres, stat_monsterskilled[MT_SHADOWS], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_spidermasterminds, stat_monsterskilled_spidermasterminds, stat_monsterskilled[MT_SPIDER], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_tyrants, stat_monsterskilled_tyrants, stat_monsterskilled_tyrants, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_vassagos, stat_monsterskilled_vassagos, stat_monsterskilled_vassagos, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterskilled_zombiemen, stat_monsterskilled_zombiemen, stat_monsterskilled[MT_POSSESSED], NOVALUEALIAS ), - STAT_INT_UNSIGNED (monstersrespawned, stat_monstersrespawned, stat_monstersrespawned, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monstersresurrected, stat_monstersresurrected, stat_monstersresurrected, NOVALUEALIAS ), - STAT_INT_UNSIGNED (monsterstelefragged, stat_monsterstelefragged, stat_monsterstelefragged, NOVALUEALIAS ), - STAT_INT_UNSIGNED (runs, stat_runs, stat_runs, NOVALUEALIAS ), - STAT_INT_UNSIGNED (secretsfound, stat_secretsrevealed, stat_secretsfound, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_fists, stat_shotsfired_fists, stat_shotsfired_fists, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_chainsaw, stat_shotsfired_chainsaw, stat_shotsfired_chainsaw, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_pistol, stat_shotsfired_pistol, stat_shotsfired_pistol, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_shotgun, stat_shotsfired_shotgun, stat_shotsfired_shotgun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_supershotgun, stat_shotsfired_supershotgun, stat_shotsfired_supershotgun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_chaingun, stat_shotsfired_chaingun, stat_shotsfired_chaingun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_rocketlauncher, stat_shotsfired_rocketlauncher, stat_shotsfired_rocketlauncher, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_plasmarifle, stat_shotsfired_plasmarifle, stat_shotsfired_plasmarifle, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_bfg9000, stat_shotsfired_bfg9000, stat_shotsfired_bfg9000, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_incinerator, stat_shotsfired_incinerator, stat_shotsfired_incinerator, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotsfired_calamityblade, stat_shotsfired_calamityblade, stat_shotsfired_calamityblade, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_fists, stat_shotssuccessful_fists, stat_shotssuccessful_fists, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_chainsaw, stat_shotssuccessful_chainsaw, stat_shotssuccessful_chainsaw, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_pistol, stat_shotssuccessful_pistol, stat_shotssuccessful_pistol, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_shotgun, stat_shotssuccessful_shotgun, stat_shotssuccessful_shotgun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_supershotgun, stat_shotssuccessful_supershotgun, stat_shotssuccessful_supershotgun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_chaingun, stat_shotssuccessful_chaingun, stat_shotssuccessful_chaingun, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_rocketlauncher, stat_shotssuccessful_rocketlauncher, stat_shotssuccessful_rocketlauncher, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_plasmarifle, stat_shotssuccessful_plasmarifle, stat_shotssuccessful_plasmarifle, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_bfg9000, stat_shotssuccessful_bfg9000, stat_shotssuccessful_bfg9000, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_incinerator, stat_shotssuccessful_incinerator, stat_shotssuccessful_incinerator, NOVALUEALIAS ), - STAT_INT_UNSIGNED (shotssuccessful_calamityblade, stat_shotssuccessful_calamityblade, stat_shotssuccessful_calamityblade, NOVALUEALIAS ), - STAT_INT_UNSIGNED (skilllevel_imtooyoungtodie, stat_skilllevel_imtooyoungtodie, stat_skilllevel_imtooyoungtodie, NOVALUEALIAS ), - STAT_INT_UNSIGNED (skilllevel_heynottoorough, stat_skilllevel_heynottoorough, stat_skilllevel_heynottoorough, NOVALUEALIAS ), - STAT_INT_UNSIGNED (skilllevel_hurtmeplenty, stat_skilllevel_hurtmeplenty, stat_skilllevel_hurtmeplenty, NOVALUEALIAS ), - STAT_INT_UNSIGNED (skilllevel_ultraviolence, stat_skilllevel_ultraviolence, stat_skilllevel_ultraviolence, NOVALUEALIAS ), - STAT_INT_UNSIGNED (skilllevel_nightmare, stat_skilllevel_nightmare, stat_skilllevel_nightmare, NOVALUEALIAS ), - STAT_INT_UNSIGNED (suicides, stat_suicides, stat_suicides, NOVALUEALIAS ), - STAT_INT_UNSIGNED (timeplayed, stat_time, stat_timeplayed, NOVALUEALIAS ) + STAT_INT_UNSIGNED (automapopened, stat_automapopened, stat_automapopened, NOVALUEALIAS ), + STAT_INT_UNSIGNED (barrelsexploded, stat_barrelsexploded, stat_barrelsexploded, NOVALUEALIAS ), + STAT_INT_UNSIGNED (cheatsentered, stat_cheats, stat_cheatsentered, NOVALUEALIAS ), + STAT_INT_UNSIGNED (damageinflicted, stat_damageinflicted, stat_damageinflicted, NOVALUEALIAS ), + STAT_INT_UNSIGNED (damagereceived, stat_damagereceived, stat_damagereceived, NOVALUEALIAS ), + STAT_INT_UNSIGNED (deaths, stat_deaths, stat_deaths, NOVALUEALIAS ), + STAT_INT_UNSIGNED (distancetraveled, stat_distancetraveled, stat_distancetraveled, NOVALUEALIAS ), + STAT_INT_UNSIGNED (firstrun, stat_firstrun, stat_firstrun, NOVALUEALIAS ), + STAT_INT_UNSIGNED (gamesloaded, stat_gamesloaded, stat_gamesloaded, NOVALUEALIAS ), + STAT_INT_UNSIGNED (gamessaved, stat_gamessaved, stat_gamessaved, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup, stat_itemspickedup, stat_itemspickedup, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_ammo_bullets, stat_itemspickedup_ammo_bullets, stat_itemspickedup_ammo[am_clip], NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_ammo_shells, stat_itemspickedup_ammo_shells, stat_itemspickedup_ammo[am_shell], NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_ammo_rockets, stat_itemspickedup_ammo_rockets, stat_itemspickedup_ammo[am_misl], NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_ammo_cells, stat_itemspickedup_ammo_cells, stat_itemspickedup_ammo[am_cell], NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_ammo_fuel, stat_itemspickedup_ammo_fuel, stat_itemspickedup_ammo_fuel, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_armor, stat_itemspickedup_armor, stat_itemspickedup_armor, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_health, stat_itemspickedup_health, stat_itemspickedup_health, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_keys, stat_itemspickedup_keys, stat_itemspickedup_keys, NOVALUEALIAS ), + STAT_INT_UNSIGNED (itemspickedup_powerups, stat_itemspickedup_powerups, stat_itemspickedup_powerups, NOVALUEALIAS ), + STAT_INT_UNSIGNED (mapsfinished, mapscompleted, stat_mapsfinished, NOVALUEALIAS ), + STAT_INT_UNSIGNED (mapsstarted, stat_mapsstarted, stat_mapsstarted, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monstersgibbed, stat_monstersgibbed, stat_monstersgibbed, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled, stat_monsterskilled, stat_monsterskilled_total, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_infighting, stat_monsterskilled_infighting, stat_monsterskilled_infighting, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_arachnotrons, stat_monsterskilled_arachnotrons, stat_monsterskilled[MT_BABY], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_archviles, stat_monsterskilled_archviles, stat_monsterskilled[MT_VILE], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_banshees, stat_monsterskilled_banshees, stat_monsterskilled_banshees, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_baronsofhell, stat_monsterskilled_baronsofhell, stat_monsterskilled[MT_BRUISER], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_cacodemons, stat_monsterskilled_cacodemons, stat_monsterskilled[MT_HEAD], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_chaingunners, stat_monsterskilled_heavyweapondudes, stat_monsterskilled[MT_CHAINGUY], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_cyberdemons, stat_monsterskilled_cyberdemons, stat_monsterskilled[MT_CYBORG], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_ghouls, stat_monsterskilled_ghouls, stat_monsterskilled_ghouls, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_hellknights, stat_monsterskilled_hellknights, stat_monsterskilled[MT_KNIGHT], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_imps, stat_monsterskilled_imps, stat_monsterskilled[MT_TROOP], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_lostsouls, stat_monsterskilled_lostsouls, stat_monsterskilled[MT_SKULL], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_mancubi, stat_monsterskilled_mancubi, stat_monsterskilled[MT_FATSO], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_mindweavers, stat_monsterskilled_mindweavers, stat_monsterskilled_mindweavers, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_painelementals, stat_monsterskilled_painelementals, stat_monsterskilled[MT_PAIN], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_pinkydemons, stat_monsterskilled_demons, stat_monsterskilled[MT_SERGEANT], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_revenants, stat_monsterskilled_revenants, stat_monsterskilled[MT_UNDEAD], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_shocktroopers, stat_monsterskilled_shocktroopers, stat_monsterskilled_shocktroopers, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_shotgunguys, stat_monsterskilled_shotgunguys, stat_monsterskilled[MT_SHOTGUY], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_spectres, stat_monsterskilled_spectres, stat_monsterskilled[MT_SHADOWS], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_spidermasterminds, stat_monsterskilled_spidermasterminds, stat_monsterskilled[MT_SPIDER], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_tyrants, stat_monsterskilled_tyrants, stat_monsterskilled_tyrants, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_vassagos, stat_monsterskilled_vassagos, stat_monsterskilled_vassagos, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterskilled_zombiemen, stat_monsterskilled_zombiemen, stat_monsterskilled[MT_POSSESSED], NOVALUEALIAS ), + STAT_INT_UNSIGNED (monstersrespawned, stat_monstersrespawned, stat_monstersrespawned, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monstersresurrected, stat_monstersresurrected, stat_monstersresurrected, NOVALUEALIAS ), + STAT_INT_UNSIGNED (monsterstelefragged, stat_monsterstelefragged, stat_monsterstelefragged, NOVALUEALIAS ), + STAT_INT_UNSIGNED (runs, stat_runs, stat_runs, NOVALUEALIAS ), + STAT_INT_UNSIGNED (secretsfound, stat_secretsrevealed, stat_secretsfound, NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_fists, stat_shotsfired_fists, stat_shotsfired[wp_fist], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_chainsaw, stat_shotsfired_chainsaw, stat_shotsfired[wp_chainsaw], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_pistol, stat_shotsfired_pistol, stat_shotsfired[wp_pistol], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_shotgun, stat_shotsfired_shotgun, stat_shotsfired[wp_shotgun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_supershotgun, stat_shotsfired_supershotgun, stat_shotsfired[wp_supershotgun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_chaingun, stat_shotsfired_chaingun, stat_shotsfired[wp_chaingun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_rocketlauncher, stat_shotsfired_rocketlauncher, stat_shotsfired[wp_missile], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_plasmarifle, stat_shotsfired_plasmarifle, stat_shotsfired[wp_plasma], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_bfg9000, stat_shotsfired_bfg9000, stat_shotsfired[wp_bfg], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_incinerator, stat_shotsfired_incinerator, stat_shotsfired_incinerator, NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotsfired_calamityblade, stat_shotsfired_calamityblade, stat_shotsfired_calamityblade, NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_fists, stat_shotssuccessful_fist, stat_shotssuccessful[wp_fist], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_chainsaw, stat_shotssuccessful_chainsaw, stat_shotssuccessful[wp_chainsaw], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_pistol, stat_shotssuccessful_pistol, stat_shotssuccessful[wp_pistol], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_shotgun, stat_shotssuccessful_shotgun, stat_shotssuccessful[wp_shotgun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_supershotgun, stat_shotssuccessful_supershotgun, stat_shotssuccessful[wp_supershotgun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_chaingun, stat_shotssuccessful_chaingun, stat_shotssuccessful[wp_chaingun], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_rocketlauncher, stat_shotssuccessful_rocketlauncher, stat_shotssuccessful[wp_missile], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_plasmarifle, stat_shotssuccessful_plasmarifle, stat_shotssuccessful[wp_plasma], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_bfg9000, stat_shotssuccessful_bfg9000, stat_shotssuccessful[wp_bfg], NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_incinerator, stat_shotssuccessful_incinerator, stat_shotssuccessful_incinerator, NOVALUEALIAS ), + STAT_INT_UNSIGNED (shotssuccessful_calamityblade, stat_shotssuccessful_calamityblade, stat_shotssuccessful_calamityblade, NOVALUEALIAS ), + STAT_INT_UNSIGNED (skilllevel_imtooyoungtodie, stat_skilllevel_imtooyoungtodie, stat_skilllevel_imtooyoungtodie, NOVALUEALIAS ), + STAT_INT_UNSIGNED (skilllevel_heynottoorough, stat_skilllevel_heynottoorough, stat_skilllevel_heynottoorough, NOVALUEALIAS ), + STAT_INT_UNSIGNED (skilllevel_hurtmeplenty, stat_skilllevel_hurtmeplenty, stat_skilllevel_hurtmeplenty, NOVALUEALIAS ), + STAT_INT_UNSIGNED (skilllevel_ultraviolence, stat_skilllevel_ultraviolence, stat_skilllevel_ultraviolence, NOVALUEALIAS ), + STAT_INT_UNSIGNED (skilllevel_nightmare, stat_skilllevel_nightmare, stat_skilllevel_nightmare, NOVALUEALIAS ), + STAT_INT_UNSIGNED (suicides, stat_suicides, stat_suicides, NOVALUEALIAS ), + STAT_INT_UNSIGNED (timeplayed, stat_time, stat_timeplayed, NOVALUEALIAS ) }; valuealias_t valuealiases[] = diff --git a/src/m_config.h b/src/m_config.h index 8576f5fd2..e7f23506e 100644 --- a/src/m_config.h +++ b/src/m_config.h @@ -236,11 +236,8 @@ extern uint64_t stat_firstrun; extern uint64_t stat_gamesloaded; extern uint64_t stat_gamessaved; extern uint64_t stat_itemspickedup; -extern uint64_t stat_itemspickedup_ammo_bullets; -extern uint64_t stat_itemspickedup_ammo_cells; +extern uint64_t stat_itemspickedup_ammo[NUMAMMO]; extern uint64_t stat_itemspickedup_ammo_fuel; -extern uint64_t stat_itemspickedup_ammo_rockets; -extern uint64_t stat_itemspickedup_ammo_shells; extern uint64_t stat_itemspickedup_armor; extern uint64_t stat_itemspickedup_health; extern uint64_t stat_itemspickedup_keys; @@ -255,33 +252,17 @@ extern uint64_t stat_monsterskilled_banshees; extern uint64_t stat_monsterskilled_ghouls; extern uint64_t stat_monsterskilled_mindweavers; extern uint64_t stat_monsterskilled_shocktroopers; -extern uint64_t stat_monsterskilled_vassagos; extern uint64_t stat_monsterskilled_tyrants; +extern uint64_t stat_monsterskilled_vassagos; extern uint64_t stat_monstersrespawned; extern uint64_t stat_monstersresurrected; extern uint64_t stat_monsterstelefragged; extern uint64_t stat_runs; extern uint64_t stat_secretsfound; -extern uint64_t stat_shotsfired_fists; -extern uint64_t stat_shotsfired_chainsaw; -extern uint64_t stat_shotsfired_pistol; -extern uint64_t stat_shotsfired_shotgun; -extern uint64_t stat_shotsfired_supershotgun; -extern uint64_t stat_shotsfired_chaingun; -extern uint64_t stat_shotsfired_rocketlauncher; -extern uint64_t stat_shotsfired_plasmarifle; -extern uint64_t stat_shotsfired_bfg9000; +extern uint64_t stat_shotsfired[NUMWEAPONS]; extern uint64_t stat_shotsfired_incinerator; extern uint64_t stat_shotsfired_calamityblade; -extern uint64_t stat_shotssuccessful_fists; -extern uint64_t stat_shotssuccessful_chainsaw; -extern uint64_t stat_shotssuccessful_pistol; -extern uint64_t stat_shotssuccessful_shotgun; -extern uint64_t stat_shotssuccessful_supershotgun; -extern uint64_t stat_shotssuccessful_chaingun; -extern uint64_t stat_shotssuccessful_rocketlauncher; -extern uint64_t stat_shotssuccessful_plasmarifle; -extern uint64_t stat_shotssuccessful_bfg9000; +extern uint64_t stat_shotssuccessful[NUMWEAPONS]; extern uint64_t stat_shotssuccessful_incinerator; extern uint64_t stat_shotssuccessful_calamityblade; extern uint64_t stat_skilllevel_imtooyoungtodie; diff --git a/src/p_inter.c b/src/p_inter.c index 707c8b518..4c60044f0 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -89,22 +89,22 @@ void P_UpdateAmmoStat(const ammotype_t ammotype, const int num) { case am_clip: viewplayer->itemspickedup_ammo_bullets += num; - stat_itemspickedup_ammo_bullets = SafeAdd(stat_itemspickedup_ammo_bullets, num); + stat_itemspickedup_ammo[am_clip] = SafeAdd(stat_itemspickedup_ammo[am_clip], num); break; case am_shell: viewplayer->itemspickedup_ammo_shells += num; - stat_itemspickedup_ammo_shells = SafeAdd(stat_itemspickedup_ammo_shells, num); + stat_itemspickedup_ammo[am_shell] = SafeAdd(stat_itemspickedup_ammo[am_shell], num); break; case am_cell: viewplayer->itemspickedup_ammo_cells += num; - stat_itemspickedup_ammo_cells = SafeAdd(stat_itemspickedup_ammo_cells, num); + stat_itemspickedup_ammo[am_cell] = SafeAdd(stat_itemspickedup_ammo[am_cell], num); break; case am_misl: viewplayer->itemspickedup_ammo_rockets += num; - stat_itemspickedup_ammo_rockets = SafeAdd(stat_itemspickedup_ammo_rockets, num); + stat_itemspickedup_ammo[am_misl] = SafeAdd(stat_itemspickedup_ammo[am_misl], num); break; default: diff --git a/src/p_map.c b/src/p_map.c index c3453e0a3..1c0eb64bf 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -609,14 +609,14 @@ static bool PIT_CheckThing(mobj_t *thing) if (tmtype == MT_PLASMA) { viewplayer->shotssuccessful[wp_plasma]++; - stat_shotssuccessful_plasmarifle = SafeAdd(stat_shotssuccessful_plasmarifle, 1); + stat_shotssuccessful[wp_plasma] = SafeAdd(stat_shotssuccessful[wp_plasma], 1); } else if (tmtype == MT_ROCKET) { if (tmthing->nudge == 1) { viewplayer->shotssuccessful[wp_missile]++; - stat_shotssuccessful_rocketlauncher = SafeAdd(stat_shotssuccessful_rocketlauncher, 1); + stat_shotssuccessful[wp_missile] = SafeAdd(stat_shotssuccessful[wp_missile], 1); } tmthing->nudge++; @@ -2069,7 +2069,7 @@ bool PIT_RadiusAttack(mobj_t *thing) if (bombspot->nudge == 1) { viewplayer->shotssuccessful[wp_missile]++; - stat_shotssuccessful_rocketlauncher = SafeAdd(stat_shotssuccessful_rocketlauncher, 1); + stat_shotssuccessful[wp_missile] = SafeAdd(stat_shotssuccessful[wp_missile], 1); } bombspot->nudge++; diff --git a/src/p_pspr.c b/src/p_pspr.c index 579829140..b6abb0ff8 100644 --- a/src/p_pspr.c +++ b/src/p_pspr.c @@ -419,7 +419,7 @@ void A_Punch(mobj_t *actor, player_t *player, pspdef_t *psp) P_LineAttack(actor, angle, range, slope, damage); player->shotsfired[readyweapon]++; - stat_shotsfired_fists = SafeAdd(stat_shotsfired_fists, 1); + stat_shotsfired[wp_fist] = SafeAdd(stat_shotsfired[wp_fist], 1); if (linetarget || hitwall) { @@ -440,7 +440,7 @@ void A_Punch(mobj_t *actor, player_t *player, pspdef_t *psp) actor->angle = R_PointToAngle2(actor->x, actor->y, linetarget->x, linetarget->y); player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_fists = SafeAdd(stat_shotssuccessful_fists, 1); + stat_shotssuccessful[wp_fist] = SafeAdd(stat_shotssuccessful[wp_fist], 1); } else if (isberserk && r_shake_berserk) { @@ -473,7 +473,7 @@ void A_Saw(mobj_t *actor, player_t *player, pspdef_t *psp) P_NoiseAlert(actor); player->shotsfired[readyweapon]++; - stat_shotsfired_chainsaw = SafeAdd(stat_shotsfired_chainsaw, 1); + stat_shotsfired[wp_chainsaw] = SafeAdd(stat_shotsfired[wp_chainsaw], 1); idlechainsawrumblestrength = 0; if (!linetarget) @@ -483,7 +483,7 @@ void A_Saw(mobj_t *actor, player_t *player, pspdef_t *psp) } player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_chainsaw = SafeAdd(stat_shotssuccessful_chainsaw, 1); + stat_shotssuccessful[wp_chainsaw] = SafeAdd(stat_shotssuccessful[wp_chainsaw], 1); S_StartSound(actor, sfx_sawhit); @@ -517,7 +517,7 @@ void A_FireMissile(mobj_t *actor, player_t *player, pspdef_t *psp) P_RumbleWeapon(readyweapon); player->shotsfired[readyweapon]++; - stat_shotsfired_rocketlauncher = SafeAdd(stat_shotsfired_rocketlauncher, 1); + stat_shotsfired[wp_missile] = SafeAdd(stat_shotsfired[wp_missile], 1); } // @@ -619,7 +619,7 @@ void A_FirePlasma(mobj_t *actor, player_t *player, pspdef_t *psp) P_SpawnPlayerMissile(actor, MT_PLASMA); player->shotsfired[readyweapon]++; - stat_shotsfired_plasmarifle = SafeAdd(stat_shotsfired_plasmarifle, 1); + stat_shotsfired[wp_plasma] = SafeAdd(stat_shotsfired[wp_plasma], 1); P_RumbleWeapon(readyweapon); } @@ -699,12 +699,12 @@ void A_FirePistol(mobj_t *actor, player_t *player, pspdef_t *psp) P_RumbleWeapon(readyweapon); player->shotsfired[readyweapon]++; - stat_shotsfired_pistol = SafeAdd(stat_shotsfired_pistol, 1); + stat_shotsfired[wp_pistol] = SafeAdd(stat_shotsfired[wp_pistol], 1); if (successfulshot) { player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_pistol = SafeAdd(stat_shotssuccessful_pistol, 1); + stat_shotssuccessful[wp_pistol] = SafeAdd(stat_shotssuccessful[wp_pistol], 1); } } @@ -734,12 +734,12 @@ void A_FireShotgun(mobj_t *actor, player_t *player, pspdef_t *psp) P_RumbleWeapon(readyweapon); player->shotsfired[readyweapon]++; - stat_shotsfired_shotgun = SafeAdd(stat_shotsfired_shotgun, 1); + stat_shotsfired[wp_shotgun] = SafeAdd(stat_shotsfired[wp_shotgun], 1); if (successfulshot) { player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_shotgun = SafeAdd(stat_shotssuccessful_shotgun, 1); + stat_shotssuccessful[wp_shotgun] = SafeAdd(stat_shotssuccessful[wp_shotgun], 1); } player->preferredshotgun = readyweapon; @@ -772,12 +772,12 @@ void A_FireShotgun2(mobj_t *actor, player_t *player, pspdef_t *psp) P_RumbleWeapon(readyweapon); player->shotsfired[readyweapon]++; - stat_shotsfired_supershotgun = SafeAdd(stat_shotsfired_supershotgun, 1); + stat_shotsfired[wp_supershotgun] = SafeAdd(stat_shotsfired[wp_supershotgun], 1); if (successfulshot) { player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_supershotgun = SafeAdd(stat_shotssuccessful_supershotgun, 1); + stat_shotssuccessful[wp_supershotgun] = SafeAdd(stat_shotssuccessful[wp_supershotgun], 1); } player->preferredshotgun = readyweapon; @@ -828,12 +828,12 @@ void A_FireCGun(mobj_t *actor, player_t *player, pspdef_t *psp) P_RumbleWeapon(readyweapon); player->shotsfired[readyweapon]++; - stat_shotsfired_chaingun = SafeAdd(stat_shotsfired_chaingun, 1); + stat_shotsfired[wp_chaingun] = SafeAdd(stat_shotsfired[wp_chaingun], 1); if (successfulshot) { player->shotssuccessful[readyweapon]++; - stat_shotssuccessful_chaingun = SafeAdd(stat_shotssuccessful_chaingun, 1); + stat_shotssuccessful[wp_chaingun] = SafeAdd(stat_shotssuccessful[wp_chaingun], 1); } } @@ -892,12 +892,12 @@ void A_BFGSpray(mobj_t *actor, player_t *player, pspdef_t *psp) } viewplayer->shotsfired[wp_bfg]++; - stat_shotsfired_bfg9000 = SafeAdd(stat_shotsfired_bfg9000, 1); + stat_shotsfired[wp_bfg] = SafeAdd(stat_shotsfired[wp_bfg], 1); if (successfulshot) { viewplayer->shotssuccessful[wp_bfg]++; - stat_shotssuccessful_bfg9000 = SafeAdd(stat_shotssuccessful_bfg9000, 1); + stat_shotssuccessful[wp_bfg] = SafeAdd(stat_shotssuccessful[wp_bfg], 1); } successfulshot = false;