From d2be5a4db954685e7bbc5dd71c984d69a22049bc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 22 Oct 2019 01:16:02 +0200 Subject: [PATCH] - removed the OSD CVARs They'll be removed anyway when the current OSD is tossed. No need to bother. --- source/common/gamecvars.cpp | 13 +------------ source/duke3d/src/osdfuncs.cpp | 21 --------------------- source/duke3d/src/osdfuncs.h | 1 - source/rr/src/osdfuncs.cpp | 19 ------------------- source/rr/src/osdfuncs.h | 1 - 5 files changed, 1 insertion(+), 54 deletions(-) diff --git a/source/common/gamecvars.cpp b/source/common/gamecvars.cpp index af1ccaf4d..16aa56557 100644 --- a/source/common/gamecvars.cpp +++ b/source/common/gamecvars.cpp @@ -68,7 +68,6 @@ CVARD(Bool, demoplay_showsync, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/dis { "crosshairscale","changes the size of the crosshair", (void *)&ud.crosshairscale, CVAR_INT, 10, 100 }, - { "fov", "change the field of view", (void *)&ud.fov, CVAR_INT, 60, 140 }, { "hud_althud", "enable/disable alternate mini-hud", (void *)&ud.althud, CVAR_BOOL, 0, 1 }, @@ -101,12 +100,8 @@ CVARD(Bool, demoplay_showsync, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/dis { "in_mousemode", "toggles vertical mouse view", (void *)&g_myAimMode, CVAR_BOOL, 0, 1 }, { "in_mousesmoothing", "enable/disable mouse input smoothing", (void *)&ud.config.SmoothInput, CVAR_BOOL, 0, 1 }, - { "mus_enabled", "enables/disables music", (void *)&ud.config.MusicToggle, CVAR_BOOL, 0, 1 }, { "mus_volume", "controls music volume", (void *)&ud.config.MusicVolume, CVAR_INT, 0, 255 }, - { "osdhightile", "enable/disable hires art replacements for console text", (void *)&osdhightile, CVAR_BOOL, 0, 1 }, - { "osdscale", "adjust console text size", (void *)&osdscale, CVAR_FLOAT|CVAR_FUNCPTR, 1, 4 }, - { "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.showfps, CVAR_INT, 0, 3 }, @@ -203,9 +198,6 @@ CVARD(Bool, demoplay_showsync, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "enable/dis { "mus_enabled", "enables/disables music", (void *)&ud.config.MusicToggle, CVAR_BOOL, 0, 1 }, { "mus_volume", "controls music volume", (void *)&ud.config.MusicVolume, CVAR_INT, 0, 255 }, - { "osdhightile", "enable/disable hires art replacements for console text", (void *)&osdhightile, CVAR_BOOL, 0, 1 }, - { "osdscale", "adjust console text size", (void *)&osdscale, CVAR_FLOAT|CVAR_FUNCPTR, 1, 4 }, - { "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.showfps, CVAR_INT, 0, 3 }, @@ -316,10 +308,7 @@ int32_t registerosdcommands(void) { "mus_volume", "controls music volume", (void *)&MusicVolume, CVAR_INT, 0, 255 }, { "mus_device", "music device", (void *)&MusicDevice, CVAR_INT, 0, 1 }, { "mus_redbook", "enables/disables redbook audio", (void *)&CDAudioToggle, 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_FLOAT|CVAR_FUNCPTR, 1, 4 }, -// + // { "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 *)&gShowFps, CVAR_INT, 0, 3 }, diff --git a/source/duke3d/src/osdfuncs.cpp b/source/duke3d/src/osdfuncs.cpp index 5c9cfdff8..0e331ac4a 100644 --- a/source/duke3d/src/osdfuncs.cpp +++ b/source/duke3d/src/osdfuncs.cpp @@ -32,14 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_DUKE_NS -int osdhightile = 1; int osdshown = 0; -#ifdef EDUKE32_TOUCH_DEVICES float osdscale = 2.f, osdrscale = 0.5f; -#else -float osdscale = 1.f, osdrscale = 1.f; -#endif #define OSD_SCALE(x) (osdscale != 1.f ? Blrintf(osdscale*(float)(x)) : (x)) #define OSD_SCALEDIV(x) Blrintf((float)(x) * osdrscale) @@ -61,30 +56,18 @@ static inline int GAME_getchartile(int ch) void GAME_drawosdchar(int x, int y, char ch, int shade, int pal) { int ac; -#ifndef USE_OPENGL - int usehightile = 0; -#endif - int ht = usehightile; - if (GAME_isspace(ch)) return; if ((ac = GAME_getchartile(ch)) == -1) return; - usehightile = (osdhightile && ht); rotatesprite_fs(OSD_SCALE((OSDCHAR_WIDTH*x)<<16), OSD_SCALE((y*OSDCHAR_HEIGHT)<<16), OSD_SCALE(65536.f), 0, ac, shade, pal, 8|16); - usehightile = ht; } void GAME_drawosdstr(int x, int y, const char *ch, int len, int shade, int pal) { int ac; -#ifdef USE_OPENGL - const int ht = usehightile; - usehightile = (osdhightile && ht); -#endif - x *= OSDCHAR_WIDTH; do @@ -101,10 +84,6 @@ void GAME_drawosdstr(int x, int y, const char *ch, int len, int shade, int pal) ch++; } while (--len); - -#ifdef USE_OPENGL - usehightile = ht; -#endif } void GAME_drawosdcursor(int x, int y, int type, int32_t lastkeypress) diff --git a/source/duke3d/src/osdfuncs.h b/source/duke3d/src/osdfuncs.h index e225fb424..1a55e5898 100644 --- a/source/duke3d/src/osdfuncs.h +++ b/source/duke3d/src/osdfuncs.h @@ -30,7 +30,6 @@ int32_t GAME_getrowheight(int32_t h); void GAME_onshowosd(int32_t shown); void GAME_clearbackground(int32_t numcols, int32_t numrows); -extern int osdhightile; extern int osdshown; extern float osdscale, osdrscale; diff --git a/source/rr/src/osdfuncs.cpp b/source/rr/src/osdfuncs.cpp index 1ab5eab75..0489683c2 100644 --- a/source/rr/src/osdfuncs.cpp +++ b/source/rr/src/osdfuncs.cpp @@ -30,14 +30,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_RR_NS -int32_t osdhightile = 1; int32_t osdshown = 0; -#ifdef EDUKE32_TOUCH_DEVICES float osdscale = 2.f, osdrscale = 0.5f; -#else -float osdscale = 1.f, osdrscale = 1.f; -#endif float osdscale2 = 1.f, osdrscale2 = 1.f; template @@ -69,30 +64,19 @@ static inline int32_t GAME_getchartile(int32_t ch) void GAME_drawosdchar(int32_t x, int32_t y, char ch, int32_t shade, int32_t pal) { int16_t ac; -#ifndef USE_OPENGL - int32_t usehightile = 0; -#endif - int32_t ht = usehightile; if (GAME_isspace(ch)) return; if ((ac = GAME_getchartile(ch)) == -1) return; - usehightile = (osdhightile && ht); rotatesprite_fs(OSD_SCALE((OSDCHAR_WIDTH*x)<<16), OSD_SCALE((y*OSDCHAR_HEIGHT)<<16), OSD_SCALE(65536.f), 0, ac, shade, pal, 8|16); - usehightile = ht; } void GAME_drawosdstr(int32_t x, int32_t y, const char *ch, int32_t len, int32_t shade, int32_t pal) { int16_t ac; -#ifdef USE_OPENGL - const int32_t ht = usehightile; - usehightile = (osdhightile && ht); -#endif - x *= OSDCHAR_WIDTH; do @@ -110,9 +94,6 @@ void GAME_drawosdstr(int32_t x, int32_t y, const char *ch, int32_t len, int32_t } while (--len); -#ifdef USE_OPENGL - usehightile = ht; -#endif } void GAME_drawosdcursor(int32_t x, int32_t y, int32_t type, int32_t lastkeypress) diff --git a/source/rr/src/osdfuncs.h b/source/rr/src/osdfuncs.h index 580943eb9..dcca6a040 100644 --- a/source/rr/src/osdfuncs.h +++ b/source/rr/src/osdfuncs.h @@ -30,7 +30,6 @@ int32_t GAME_getrowheight(int32_t h); void GAME_onshowosd(int32_t shown); void GAME_clearbackground(int32_t numcols, int32_t numrows); -extern int32_t osdhightile; extern int32_t osdshown; extern float osdscale, osdrscale; extern float osdscale2, osdrscale2;