User-configurable security monitor refresh delay (r_camrefreshdelay)

git-svn-id: https://svn.eduke32.com/eduke32@4445 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-04-17 20:00:24 +00:00
parent 345300ddbb
commit dd8cd8277e
4 changed files with 14 additions and 4 deletions

View file

@ -227,6 +227,15 @@ void CONFIG_SetDefaults(void)
ud.autovote = 0; ud.autovote = 0;
ud.brightness = 8; ud.brightness = 8;
ud.camerasprite = -1; ud.camerasprite = -1;
#ifdef __ANDROID__
ud.camera_time = 3;
#elif defined GEKKO || defined __OPENDINGUX__
ud.camera_time = 11;
#else
ud.camera_time = 0;
#endif
ud.color = 0; ud.color = 0;
ud.crosshair = 1; ud.crosshair = 1;
ud.crosshairscale = 50; ud.crosshairscale = 50;

View file

@ -956,7 +956,7 @@ nextdemo_nomenu:
if (ud.last_camsprite != ud.camerasprite) if (ud.last_camsprite != ud.camerasprite)
{ {
ud.last_camsprite = ud.camerasprite; ud.last_camsprite = ud.camerasprite;
ud.camera_time = totalclock+(TICRATE*2); // ud.camera_time = totalclock+(TICRATE*2);
} }
if (VOLUMEONE) if (VOLUMEONE)

View file

@ -1547,6 +1547,7 @@ int32_t registerosdcommands(void)
{ "osdhightile", "enable/disable hires art replacements for console text", (void *)&osdhightile, CVAR_BOOL, 0, 1 }, { "osdhightile", "enable/disable hires art replacements for console text", (void *)&osdhightile, CVAR_BOOL, 0, 1 },
{ "osdscale", "adjust console text size", (void *)&osdscale, CVAR_DOUBLE|CVAR_FUNCPTR, 1.f, 4.f }, { "osdscale", "adjust console text size", (void *)&osdscale, CVAR_DOUBLE|CVAR_FUNCPTR, 1.f, 4.f },
{ "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_drawweapon", "enable/disable weapon drawing", (void *)&ud.drawweapon, CVAR_INT, 0, 2 },
{ "r_showfps", "show the frame rate counter", (void *)&ud.tickrate, CVAR_BOOL, 0, 1 }, { "r_showfps", "show the frame rate counter", (void *)&ud.tickrate, CVAR_BOOL, 0, 1 },
{ "r_shadows", "enable/disable sprite and model shadows", (void *)&ud.shadows, CVAR_BOOL, 0, 1 }, { "r_shadows", "enable/disable sprite and model shadows", (void *)&ud.shadows, CVAR_BOOL, 0, 1 },

View file

@ -357,10 +357,9 @@ void G_AnimateCamSprite(void)
if (g_curViewscreen < 0) if (g_curViewscreen < 0)
return; return;
if (T1 >= 4) if (totalclock >= T1 + ud.camera_time)
{ {
const DukePlayer_t *ps = g_player[screenpeek].ps; const DukePlayer_t *ps = g_player[screenpeek].ps;
T1 = 0;
if (ps->newowner >= 0) if (ps->newowner >= 0)
OW = ps->newowner; OW = ps->newowner;
@ -378,8 +377,9 @@ void G_AnimateCamSprite(void)
polymer_invalidatesprite(i); polymer_invalidatesprite(i);
#endif #endif
} }
T1 = totalclock;
} }
else T1++;
} }
void G_AnimateWalls(void) void G_AnimateWalls(void)