diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c index 5cec4cef0..178497d78 100644 --- a/polymer/eduke32/source/config.c +++ b/polymer/eduke32/source/config.c @@ -227,6 +227,15 @@ void CONFIG_SetDefaults(void) ud.autovote = 0; ud.brightness = 8; 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.crosshair = 1; ud.crosshairscale = 50; diff --git a/polymer/eduke32/source/demo.c b/polymer/eduke32/source/demo.c index 06dbb9b25..b9db5888c 100644 --- a/polymer/eduke32/source/demo.c +++ b/polymer/eduke32/source/demo.c @@ -956,7 +956,7 @@ nextdemo_nomenu: if (ud.last_camsprite != ud.camerasprite) { ud.last_camsprite = ud.camerasprite; - ud.camera_time = totalclock+(TICRATE*2); +// ud.camera_time = totalclock+(TICRATE*2); } if (VOLUMEONE) diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index 9241ef14e..bf4bc113d 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -1547,6 +1547,7 @@ int32_t registerosdcommands(void) { "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 }, + { "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_BOOL, 0, 1 }, { "r_shadows", "enable/disable sprite and model shadows", (void *)&ud.shadows, CVAR_BOOL, 0, 1 }, diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c index d8be8f250..c18cfc2f8 100644 --- a/polymer/eduke32/source/sector.c +++ b/polymer/eduke32/source/sector.c @@ -357,10 +357,9 @@ void G_AnimateCamSprite(void) if (g_curViewscreen < 0) return; - if (T1 >= 4) + if (totalclock >= T1 + ud.camera_time) { const DukePlayer_t *ps = g_player[screenpeek].ps; - T1 = 0; if (ps->newowner >= 0) OW = ps->newowner; @@ -378,8 +377,9 @@ void G_AnimateCamSprite(void) polymer_invalidatesprite(i); #endif } + + T1 = totalclock; } - else T1++; } void G_AnimateWalls(void)