diff --git a/polymer/eduke32/source/cheats.c b/polymer/eduke32/source/cheats.c index a64d60b60..33e0c0328 100644 --- a/polymer/eduke32/source/cheats.c +++ b/polymer/eduke32/source/cheats.c @@ -593,8 +593,8 @@ void G_DoCheats(void) return; case CHEAT_RATE: - if (ud.tickrate++ > 2) - ud.tickrate = 0; + if (ud.showfps++ > 2) + ud.showfps = 0; end_cheat(pPlayer); return; diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h index 841d737f9..1fd5c9c6a 100644 --- a/polymer/eduke32/source/game.h +++ b/polymer/eduke32/source/game.h @@ -143,7 +143,7 @@ typedef struct { int32_t team, viewbob, weaponsway, althud, weaponscale, textscale; int32_t entered_name,screen_tilting,shadows,fta_on,executions,auto_run; - int32_t coords,tickrate,levelstats,m_coop,coop,screen_size,lockout,crosshair; + int32_t coords,showfps,levelstats,m_coop,coop,screen_size,lockout,crosshair; int32_t playerai,angleinterpolation,obituaries; int32_t respawn_monsters,respawn_items,respawn_inventory,recstat,monsters_off,brightness; diff --git a/polymer/eduke32/source/gamestructures.c b/polymer/eduke32/source/gamestructures.c index aec6a3be2..3b0526494 100644 --- a/polymer/eduke32/source/gamestructures.c +++ b/polymer/eduke32/source/gamestructures.c @@ -87,7 +87,7 @@ int32_t __fastcall VM_GetUserdef(register int32_t labelNum) case USERDEFS_EXECUTIONS: labelNum = ud.executions; break; case USERDEFS_AUTO_RUN: labelNum = ud.auto_run; break; case USERDEFS_COORDS: labelNum = ud.coords; break; - case USERDEFS_TICKRATE: labelNum = ud.tickrate; break; + case USERDEFS_TICKRATE: labelNum = ud.showfps; break; case USERDEFS_M_COOP: labelNum = ud.m_coop; break; case USERDEFS_COOP: labelNum = ud.coop; break; case USERDEFS_SCREEN_SIZE: labelNum = ud.screen_size; break; @@ -217,7 +217,7 @@ void __fastcall VM_SetUserdef(register int32_t const labelNum, register int32_t case USERDEFS_EXECUTIONS: ud.executions = iSet; break; case USERDEFS_AUTO_RUN: ud.auto_run = iSet; break; case USERDEFS_COORDS: ud.coords = iSet; break; - case USERDEFS_TICKRATE: ud.tickrate = iSet; break; + case USERDEFS_TICKRATE: ud.showfps = iSet; break; case USERDEFS_M_COOP: ud.m_coop = iSet; break; case USERDEFS_COOP: ud.coop = iSet; break; case USERDEFS_SCREEN_SIZE: diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index 23f5f3cb2..6c8b16a1f 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -1610,7 +1610,7 @@ int32_t registerosdcommands(void) { "r_camrefreshdelay", "minimum delay between security camera sprite updates, 120 = 1 second", (void *)&ud.camera_time, CVAR_INT, 1, 240 }, { "r_drawweapon", "enable/disable weapon drawing", (void *)&ud.drawweapon, CVAR_INT, 0, 2 }, - { "r_showfps", "show the frame rate counter", (void *)&ud.tickrate, CVAR_INT, 0, 2 }, + { "r_showfps", "show the frame rate counter", (void *)&ud.showfps, CVAR_INT, 0, 2 }, { "r_shadows", "enable/disable sprite and model shadows", (void *)&ud.shadows, CVAR_BOOL, 0, 1 }, { "r_size", "change size of viewable area", (void *)&ud.screen_size, CVAR_INT|CVAR_FUNCPTR, 0, 64 }, { "r_rotatespritenowidescreen", "pass bit 1024 to all CON rotatesprite calls", (void *)&g_rotatespriteNoWidescreen, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, diff --git a/polymer/eduke32/source/screens.c b/polymer/eduke32/source/screens.c index c2954e4f1..dffe45adc 100644 --- a/polymer/eduke32/source/screens.c +++ b/polymer/eduke32/source/screens.c @@ -788,7 +788,7 @@ static void G_PrintFPS(void) int32_t thisSec = ms/1000; int32_t x = (xdim <= 640); - if (ud.tickrate) + if (ud.showfps) { int32_t chars = Bsprintf(tempbuf, "%d ms (%3u fps)", howlong, LastCount); @@ -796,7 +796,7 @@ static void G_PrintFPS(void) printext256(windowxy2.x-(chars<<(3-x)), windowxy1.y+1+FPS_YOFFSET, FPS_COLOR(LastCount < LOW_FPS), -1, tempbuf, x); - if (ud.tickrate > 1) + if (ud.showfps > 1) { chars = Bsprintf(tempbuf, "max fps: %3u", MaxFrames);