From c5cb86bf2b82242b5971550d30a887191207ff2a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 22 Oct 2019 01:00:22 +0200 Subject: [PATCH] - sevral simple CVARs ported --- source/blood/src/config.cpp | 7 +- source/blood/src/osdcmds.h | 2 - source/common/gamecvars.cpp | 127 ++++----------------------- source/common/gamecvars.h | 15 ++-- source/duke3d/src/actors.cpp | 2 +- source/duke3d/src/cheats.cpp | 6 +- source/duke3d/src/cmdline.cpp | 2 +- source/duke3d/src/config.cpp | 6 -- source/duke3d/src/game.cpp | 8 +- source/duke3d/src/game.h | 10 +-- source/duke3d/src/gamestructures.cpp | 28 +++--- source/duke3d/src/osdcmds.cpp | 2 - source/duke3d/src/osdcmds.h | 1 - source/duke3d/src/player.cpp | 6 +- source/duke3d/src/screens.cpp | 13 +-- source/rr/src/actors.cpp | 2 +- source/rr/src/cheats.cpp | 6 +- source/rr/src/cmdline.cpp | 2 +- source/rr/src/config.cpp | 6 -- source/rr/src/game.cpp | 8 +- source/rr/src/game.h | 10 +-- source/rr/src/osdcmds.cpp | 2 - source/rr/src/osdcmds.h | 2 - source/rr/src/player.cpp | 6 +- source/rr/src/screens.cpp | 12 +-- 25 files changed, 70 insertions(+), 221 deletions(-) diff --git a/source/blood/src/config.cpp b/source/blood/src/config.cpp index d1dfd8ee5..8b7c5bfa7 100644 --- a/source/blood/src/config.cpp +++ b/source/blood/src/config.cpp @@ -333,12 +333,10 @@ void CONFIG_SetDefaults(void) //ud.crosshair = 1; //ud.crosshairscale = 50; //ud.default_skill = 1; - //ud.democams = 1; gUpscaleFactor = 0; //ud.display_bonus_screen = 1; //ud.drawweapon = 1; - //ud.hudontop = 0; - //ud.idplayers = 1; + //ud.hudontop = 0; = 1; gLevelStats = 0; gPowerupDuration = 1; gShowMapTitle = 1; @@ -355,7 +353,6 @@ void CONFIG_SetDefaults(void) //ud.mouseaiming = 0; //ud.mouseflip = 1; //ud.msgdisptime = 120; - //ud.obituaries = 1; //ud.pwlockout[0] = '\0'; //ud.screen_size = 4; //ud.screen_tilting = 1; @@ -369,9 +366,7 @@ void CONFIG_SetDefaults(void) //ud.statusbarscale = 100; //ud.team = 0; //ud.textscale = 200; - //ud.viewbob = 1; //ud.weaponscale = 100; - //ud.weaponsway = 1; //ud.weaponswitch = 3; // new+empty gFov = 90; gCenterHoriz = 0; diff --git a/source/blood/src/osdcmds.h b/source/blood/src/osdcmds.h index 14fe971ab..a18dd161f 100644 --- a/source/blood/src/osdcmds.h +++ b/source/blood/src/osdcmds.h @@ -33,6 +33,4 @@ void GAME_clearbackground(int32_t numcols, int32_t numrows); extern const char *const ConsoleButtons[]; -extern uint32_t cl_cheatmask; - END_BLD_NS diff --git a/source/common/gamecvars.cpp b/source/common/gamecvars.cpp index d1138010f..a63b345d5 100644 --- a/source/common/gamecvars.cpp +++ b/source/common/gamecvars.cpp @@ -16,6 +16,13 @@ CVARD(Bool, cl_runmode, true, CVAR_ARCHIVE, "enable/disable modernized run key o CVARD(Bool, cl_autosave, true, CVAR_ARCHIVE, "enable/disable autosaves") // Not implemented for Blood (but looks like the other games never check it either.) CVARD(Bool, cl_autosavedeletion, true, CVAR_ARCHIVE, "enable/disable automatic deletion of autosaves") // Not implemented for Blood CVARD(Int, cl_maxautosaves, 8, CVAR_ARCHIVE, "number of autosaves to keep before deleting the oldest") // Not implemented for Blood +CVARD(Int, cl_cheatmask, ~0, CVAR_ARCHIVE, "configure what cheats show in the cheats menu") +CVARD(Bool, cl_obituaries, true, CVAR_ARCHIVE, "enable/disable multiplayer death messages") // Not implemented for Blood +CVARD(Bool, cl_democams, true, CVAR_ARCHIVE, "enable/disable demo playback cameras") // Not implemented for Blood +CVARD(Bool, cl_idplayers, true, CVAR_ARCHIVE, "enable/disable name display when aiming at opponents") // Not implemented for Blood +CVARD(Bool, cl_showcoords, false, 0, "show your position in the game world") // This is a debug oprion in its current form, not implemented in Blood +CVARD(Bool, cl_viewbob, true, CVAR_ARCHIVE, "enable/disable player head bobbing") // Not implemented for Blood +CVARD(Bool, cl_weaponsway, true, CVAR_ARCHIVE, "enable/disable player weapon swaying") // Not implemented for Blood CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE, "enable/disable weapon autoaim") { @@ -23,6 +30,12 @@ CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE, "enable/disable weapon autoaim") //UpdatePlayerFromMenu(); todo: networking (only operational in EDuke32 frontend anyway.) }; +CUSTOM_CVARD(Int, cl_autovote, 0, CVAR_ARCHIVE, "enable/disable automatic voting") +{ + if (self < 0 || self > 2) self = 0; +} + + bool G_CheckAutorun(bool button) { @@ -37,29 +50,6 @@ bool G_CheckAutorun(bool button) // DN3D static osdcvardata_t cvars_game[] = { - - { "cl_autovote", "enable/disable automatic voting", (void *)&ud.autovote, CVAR_INT, 0, 2 }, - - { "cl_cheatmask", "configure what cheats show in the cheats menu", (void *)&cl_cheatmask, CVAR_UINT, 0, ~0 }, - - { "cl_obituaries", "enable/disable multiplayer death messages", (void *)&ud.obituaries, CVAR_BOOL, 0, 1 }, - { "cl_democams", "enable/disable demo playback cameras", (void *)&ud.democams, CVAR_BOOL, 0, 1 }, - - { "cl_idplayers", "enable/disable name display when aiming at opponents", (void *)&ud.idplayers, CVAR_BOOL, 0, 1 }, - - { "cl_runmode", "enable/disable modernized run key operation", (void *)&ud.runkey_mode, CVAR_BOOL, 0, 1 }, - - { "cl_showcoords", "show your position in the game world", (void *)&ud.coords, CVAR_INT, 0, -#ifdef USE_OPENGL - 2 -#else - 1 -#endif - }, - - { "cl_viewbob", "enable/disable player head bobbing", (void *)&ud.viewbob, CVAR_BOOL, 0, 1 }, - - { "cl_weaponsway", "enable/disable player weapon swaying", (void *)&ud.weaponsway, CVAR_BOOL, 0, 1 }, { "cl_weaponswitch", "enable/disable auto weapon switching", (void *)&ud.weaponswitch, CVAR_INT|CVAR_MULTI, 0, 7 }, { "color", "changes player palette", (void *)&ud.color, CVAR_INT|CVAR_MULTI, 0, MAXPALOOKUPS-1 }, @@ -97,10 +87,6 @@ bool G_CheckAutorun(bool button) { "hud_weaponscale","changes the weapon scale", (void *)&ud.weaponscale, CVAR_INT, 10, 100 }, { "hud_statusbarmode", "change overlay mode of status bar", (void *)&ud.statusbarmode, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, -#ifdef EDUKE32_TOUCH_DEVICES - { "hud_hidestick", "hide the touch input stick", (void *)&droidinput.hideStick, CVAR_BOOL, 0, 1 }, -#endif - { "in_joystick","enables input from the joystick if it is present",(void *)&ud.setup.usejoystick, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, { "in_mouse","enables input from the mouse if it is present",(void *)&ud.setup.usemouse, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, @@ -149,14 +135,6 @@ bool G_CheckAutorun(bool button) { "snd_tryformats", "enables/disables automatic discovery of replacement sounds and music in .flac and .ogg formats", (void *)&g_maybeUpgradeSoundFormats, CVAR_BOOL, 0, 1 }, { "team","change team in multiplayer", (void *)&ud.team, CVAR_INT|CVAR_MULTI, 0, 3 }, -#ifdef EDUKE32_TOUCH_DEVICES - { "touch_sens_move_x","touch input sensitivity for moving forward/back", (void *)&droidinput.forward_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_move_y","touch input sensitivity for strafing", (void *)&droidinput.strafe_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_look_x", "touch input sensitivity for turning left/right", (void *) &droidinput.yaw_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_look_y", "touch input sensitivity for looking up/down", (void *) &droidinput.pitch_sens, CVAR_FLOAT, 1, 9 }, - { "touch_invert", "invert look up/down touch input", (void *) &droidinput.invertLook, CVAR_BOOL, 0, 1 }, -#endif - { "vid_gamma","adjusts gamma component of gamma ramp",(void *)&g_videoGamma, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_contrast","adjusts contrast component of gamma ramp",(void *)&g_videoContrast, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_brightness","adjusts brightness component of gamma ramp",(void *)&g_videoBrightness, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, @@ -183,32 +161,6 @@ bool G_CheckAutorun(bool button) static osdcvardata_t cvars_game[] = { - - { "cl_autosave", "enable/disable autosaves", (void *) &cl_autosave.Value, CVAR_BOOL, 0, 1 }, - { "cl_autosavedeletion", "enable/disable automatic deletion of autosaves", (void *) &cl_autosavedeletion.Value, CVAR_BOOL, 0, 1 }, - { "cl_maxautosaves", "number of autosaves to keep before deleting the oldest", (void *) &cl_maxautosaves.Value, CVAR_INT, 1, 100 }, - - { "cl_autovote", "enable/disable automatic voting", (void *)&ud.autovote, CVAR_INT, 0, 2 }, - - { "cl_cheatmask", "configure what cheats show in the cheats menu", (void *)&cl_cheatmask, CVAR_UINT, 0, ~0 }, - - { "cl_obituaries", "enable/disable multiplayer death messages", (void *)&ud.obituaries, CVAR_BOOL, 0, 1 }, - { "cl_democams", "enable/disable demo playback cameras", (void *)&ud.democams, CVAR_BOOL, 0, 1 }, - - { "cl_idplayers", "enable/disable name display when aiming at opponents", (void *)&ud.idplayers, CVAR_BOOL, 0, 1 }, - - - { "cl_showcoords", "show your position in the game world", (void *)&ud.coords, CVAR_INT, 0, -#ifdef USE_OPENGL - 2 -#else - 1 -#endif - }, - - { "cl_viewbob", "enable/disable player head bobbing", (void *)&ud.viewbob, CVAR_BOOL, 0, 1 }, - - { "cl_weaponsway", "enable/disable player weapon swaying", (void *)&ud.weaponsway, CVAR_BOOL, 0, 1 }, { "cl_weaponswitch", "enable/disable auto weapon switching", (void *)&ud.weaponswitch, CVAR_INT|CVAR_MULTI, 0, 7 }, { "color", "changes player palette", (void *)&ud.color, CVAR_INT|CVAR_MULTI, 0, MAXPALOOKUPS-1 }, @@ -246,10 +198,6 @@ bool G_CheckAutorun(bool button) { "hud_weaponscale","changes the weapon scale", (void *)&ud.weaponscale, CVAR_INT, 10, 100 }, { "hud_statusbarmode", "change overlay mode of status bar", (void *)&ud.statusbarmode, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, -#ifdef EDUKE32_TOUCH_DEVICES - { "hud_hidestick", "hide the touch input stick", (void *)&droidinput.hideStick, CVAR_BOOL, 0, 1 }, -#endif - { "in_joystick","enables input from the joystick if it is present",(void *)&ud.setup.usejoystick, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, { "in_mouse","enables input from the mouse if it is present",(void *)&ud.setup.usemouse, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, @@ -298,14 +246,6 @@ bool G_CheckAutorun(bool button) { "team","change team in multiplayer", (void *)&ud.team, CVAR_INT|CVAR_MULTI, 0, 3 }, -#ifdef EDUKE32_TOUCH_DEVICES - { "touch_sens_move_x","touch input sensitivity for moving forward/back", (void *)&droidinput.forward_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_move_y","touch input sensitivity for strafing", (void *)&droidinput.strafe_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_look_x", "touch input sensitivity for turning left/right", (void *) &droidinput.yaw_sens, CVAR_FLOAT, 1, 9 }, - { "touch_sens_look_y", "touch input sensitivity for looking up/down", (void *) &droidinput.pitch_sens, CVAR_FLOAT, 1, 9 }, - { "touch_invert", "invert look up/down touch input", (void *) &droidinput.invertLook, CVAR_INT, 0, 1 }, -#endif - { "vid_gamma","adjusts gamma component of gamma ramp",(void *)&g_videoGamma, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_contrast","adjusts contrast component of gamma ramp",(void *)&g_videoContrast, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_brightness","adjusts brightness component of gamma ramp",(void *)&g_videoBrightness, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, @@ -335,36 +275,12 @@ int32_t registerosdcommands(void) char buffer[256]; static osdcvardata_t cvars_game[] = { - -// -// { "cl_autovote", "enable/disable automatic voting", (void *)&ud.autovote, CVAR_INT, 0, 2 }, -// -// { "cl_cheatmask", "configure what cheats show in the cheats menu", (void *)&cl_cheatmask, CVAR_UINT, 0, ~0 }, -// -// { "cl_obituaries", "enable/disable multiplayer death messages", (void *)&ud.obituaries, CVAR_BOOL, 0, 1 }, -// { "cl_democams", "enable/disable demo playback cameras", (void *)&ud.democams, CVAR_BOOL, 0, 1 }, -// -// { "cl_idplayers", "enable/disable name display when aiming at opponents", (void *)&ud.idplayers, CVAR_BOOL, 0, 1 }, -// - { "cl_interpolate", "enable/disable view interpolation", (void *)&gViewInterpolate, CVAR_BOOL, 0, 1 }, { "cl_viewhbob", "enable/disable view horizontal bobbing", (void *)&gViewHBobbing, CVAR_BOOL, 0, 1 }, { "cl_viewvbob", "enable/disable view vertical bobbing", (void *)&gViewVBobbing, CVAR_BOOL, 0, 1 }, { "cl_slopetilting", "enable/disable slope tilting", (void *)&gSlopeTilting, CVAR_BOOL, 0, 1 }, { "cl_showweapon", "enable/disable show weapons", (void *)&gShowWeapon, CVAR_BOOL, 0, 1 }, -// -// { "cl_showcoords", "show your position in the game world", (void *)&ud.coords, CVAR_INT, 0, -//#ifdef USE_OPENGL -// 2 -//#else -// 1 -//#endif -// }, -// -// { "cl_viewbob", "enable/disable player head bobbing", (void *)&ud.viewbob, CVAR_BOOL, 0, 1 }, -// -// { "cl_weaponsway", "enable/disable player weapon swaying", (void *)&ud.weaponsway, CVAR_BOOL, 0, 1 }, { "cl_weaponswitch", "enable/disable auto weapon switching", (void *)&gWeaponSwitch, CVAR_INT|CVAR_MULTI, 0, 3 }, // // { "color", "changes player palette", (void *)&ud.color, CVAR_INT|CVAR_MULTI, 0, MAXPALOOKUPS-1 }, @@ -402,11 +318,7 @@ int32_t registerosdcommands(void) // { "hud_textscale", "sets multiplayer chat message size", (void *)&ud.textscale, CVAR_INT, 100, 400 }, // { "hud_weaponscale","changes the weapon scale", (void *)&ud.weaponscale, CVAR_INT, 10, 100 }, // { "hud_statusbarmode", "change overlay mode of status bar", (void *)&ud.statusbarmode, CVAR_BOOL|CVAR_FUNCPTR, 0, 1 }, -// -//#ifdef EDUKE32_TOUCH_DEVICES -// { "hud_hidestick", "hide the touch input stick", (void *)&droidinput.hideStick, CVAR_BOOL, 0, 1 }, -//#endif -// + { "horizcenter", "enable/disable centered horizon line", (void *)&gCenterHoriz, CVAR_BOOL, 0, 1 }, { "deliriumblur", "enable/disable delirium blur effect(polymost)", (void *)&gDeliriumBlur, CVAR_BOOL, 0, 1 }, { "fov", "change the field of view", (void *)&gFov, CVAR_INT|CVAR_FUNCPTR, 75, 120 }, @@ -459,17 +371,8 @@ int32_t registerosdcommands(void) { "snd_reversestereo", "reverses the stereo channels", (void *)&ReverseStereo, CVAR_BOOL, 0, 1 }, { "snd_doppler", "enable/disable 3d sound", (void *)&gDoppler, CVAR_BOOL, 0, 1 }, // { "snd_speech", "enables/disables player speech", (void *)&ud.config.VoiceToggle, CVAR_INT, 0, 5 }, -// // { "team","change team in multiplayer", (void *)&ud.team, CVAR_INT|CVAR_MULTI, 0, 3 }, -// -//#ifdef EDUKE32_TOUCH_DEVICES -// { "touch_sens_move_x","touch input sensitivity for moving forward/back", (void *)&droidinput.forward_sens, CVAR_FLOAT, 1, 9 }, -// { "touch_sens_move_y","touch input sensitivity for strafing", (void *)&droidinput.strafe_sens, CVAR_FLOAT, 1, 9 }, -// { "touch_sens_look_x", "touch input sensitivity for turning left/right", (void *) &droidinput.yaw_sens, CVAR_FLOAT, 1, 9 }, -// { "touch_sens_look_y", "touch input sensitivity for looking up/down", (void *) &droidinput.pitch_sens, CVAR_FLOAT, 1, 9 }, -// { "touch_invert", "invert look up/down touch input", (void *) &droidinput.invertLook, CVAR_INT, 0, 1 }, -//#endif -// + { "vid_gamma","adjusts gamma component of gamma ramp",(void *)&g_videoGamma, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_contrast","adjusts contrast component of gamma ramp",(void *)&g_videoContrast, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, { "vid_brightness","adjusts brightness component of gamma ramp",(void *)&g_videoBrightness, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, diff --git a/source/common/gamecvars.h b/source/common/gamecvars.h index 5f6a1890d..1cbab4f46 100644 --- a/source/common/gamecvars.h +++ b/source/common/gamecvars.h @@ -8,12 +8,13 @@ EXTERN_CVAR(Bool, cl_runmode) EXTERN_CVAR(Bool, cl_autosave) EXTERN_CVAR(Bool, cl_autosavedeletion) EXTERN_CVAR(Int, cl_maxautosaves) - -CUSTOM_CVARD(Int, cl_autoaim, 1, CVAR_ARCHIVE, "enable/disable weapon autoaim") -{ - if (self < 0 || self > (playing_blood? 2 : 3)) self = 1; // Note: The Shadow Warrior backend only has a bool for this. - //UpdatePlayerFromMenu(); todo: networking (only operational in EDuke32 frontend anyway.) -}; - +EXTERN_CVAR(Int, cl_autovote) +EXTERN_CVAR(Int, cl_cheatmask) +EXTERN_CVAR(Bool, cl_obituaries) +EXTERN_CVAR(Bool, cl_democams) +EXTERN_CVAR(Bool, cl_idplayers) +EXTERN_CVAR(Bool, cl_showcoords) +EXTERN_CVAR(Bool, cl_viewbob) +EXTERN_CVAR(Bool, cl_weaponsway) bool G_CheckAutorun(bool button); diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 3a2667ad1..0c5889ecc 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -7561,7 +7561,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3 case SE_27_DEMO_CAM: { - if (pSprite->extra < 1 && (ud.recstat == 0 || !ud.democams)) break; + if (pSprite->extra < 1 && (ud.recstat == 0 || !cl_democams)) break; if (klabs(pSprite->extra) == 2) { diff --git a/source/duke3d/src/cheats.cpp b/source/duke3d/src/cheats.cpp index 48b28922a..cbc912908 100644 --- a/source/duke3d/src/cheats.cpp +++ b/source/duke3d/src/cheats.cpp @@ -589,11 +589,7 @@ void G_DoCheats(void) return; case CHEAT_COORDS: -#ifdef USE_OPENGL - if (++ud.coords >= 3) ud.coords = 0; -#else - if (++ud.coords >= 2) ud.coords = 0; -#endif + cl_showcoords = cl_showcoords + 1; end_cheat(pPlayer); return; diff --git a/source/duke3d/src/cmdline.cpp b/source/duke3d/src/cmdline.cpp index 20a3c0717..d0c2437be 100644 --- a/source/duke3d/src/cmdline.cpp +++ b/source/duke3d/src/cmdline.cpp @@ -746,7 +746,7 @@ void G_CheckCommandLine(int32_t argc, char const * const * argv) ud.m_volume_number = ud.volume_number = ((unsigned) (Batoi(c)-1))%MAXVOLUMES; break; case 'w': - ud.coords = 1; + cl_showcoords = 1; break; case 'x': c++; diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp index cb469863e..3f87b0a15 100644 --- a/source/duke3d/src/config.cpp +++ b/source/duke3d/src/config.cpp @@ -254,7 +254,6 @@ void CONFIG_SetDefaults(void) ud.althud = 1; ud.angleinterpolation = 0; - ud.autovote = 0; ud.brightness = 8; ud.camerasprite = -1; ud.color = 0; @@ -276,13 +275,11 @@ void CONFIG_SetDefaults(void) ud.configversion = 0; ud.crosshairscale = 50; ud.default_skill = 1; - ud.democams = 1; ud.detail = 0; ud.display_bonus_screen = 1; ud.drawweapon = 1; ud.fov = 90; ud.hudontop = 0; - ud.idplayers = 1; ud.levelstats = 0; ud.lockout = 0; ud.m_marker = 1; @@ -296,7 +293,6 @@ void CONFIG_SetDefaults(void) ud.mouseaiming = 0; ud.mouseflip = 1; ud.msgdisptime = 120; - ud.obituaries = 1; ud.pwlockout[0] = '\0'; ud.runkey_mode = 0; ud.screen_size = 4; @@ -311,9 +307,7 @@ void CONFIG_SetDefaults(void) ud.statusbarscale = 100; ud.team = 0; ud.textscale = 200; - ud.viewbob = 1; ud.weaponscale = 100; - ud.weaponsway = 1; ud.weaponswitch = 3; // new+empty Bstrcpy(ud.rtsname, G_DefaultRtsFile()); diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 251ac97a1..776678295 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -963,7 +963,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio) CAMERA(q16horiz) = pPlayer->oq16horiz + pPlayer->oq16horizoff + mulscale16((pPlayer->q16horiz + pPlayer->q16horizoff - pPlayer->oq16horiz - pPlayer->oq16horizoff), smoothRatio); - if (ud.viewbob) + if (cl_viewbob) { int zAdd = (pPlayer->opyoff + mulscale16(pPlayer->pyoff-pPlayer->opyoff, smoothRatio)); @@ -4534,10 +4534,10 @@ void G_HandleLocalKeys(void) if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex) { - if (KB_UnBoundKeyPressed(sc_F1) || KB_UnBoundKeyPressed(sc_F2) || ud.autovote) + if (KB_UnBoundKeyPressed(sc_F1) || KB_UnBoundKeyPressed(sc_F2) || cl_autovote) { G_AddUserQuote("Vote Cast"); - Net_SendMapVote(KB_UnBoundKeyPressed(sc_F1) || ud.autovote ? ud.autovote-1 : 0); + Net_SendMapVote(KB_UnBoundKeyPressed(sc_F1) || cl_autovote ? cl_autovote-1 : 0); KB_ClearKeyDown(sc_F1); KB_ClearKeyDown(sc_F2); } @@ -6968,7 +6968,7 @@ int G_DoMoveThings(void) } // Name display when aiming at opponents - if (ud.idplayers && (g_netServer || ud.multimode > 1) + if (cl_idplayers && (g_netServer || ud.multimode > 1) #ifdef SPLITSCREEN_MOD_HACKS && !g_fakeMultiMode #endif diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h index a9a80a3b6..9ecdbd4da 100644 --- a/source/duke3d/src/game.h +++ b/source/duke3d/src/game.h @@ -178,17 +178,17 @@ typedef struct { int32_t reccnt,crosshairscale; int32_t runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon; // JBF 20031125 - int32_t democams,color,msgdisptime,statusbarmode; - int32_t m_noexits,noexits,autovote,idplayers; - int32_t team, viewbob, weaponsway, althud, weaponscale, textscale; + int32_t color,msgdisptime,statusbarmode; + int32_t m_noexits,noexits; + int32_t team, althud, weaponscale, textscale; int32_t statusbarflags, statusbarrange, statusbarcustom; int32_t hudontop; int32_t menu_slidebarz, menu_slidebarmargin, menu_slidecursorz; int32_t menu_scrollbartilenum, menu_scrollbarz, menu_scrollcursorz; int32_t entered_name,screen_tilting,shadows,fta_on,executions; - int32_t coords,showfps,levelstats,m_coop,coop,screen_size,lockout; - int32_t playerai,angleinterpolation,obituaries; + int32_t showfps,levelstats,m_coop,coop,screen_size,lockout; + int32_t playerai,angleinterpolation; int32_t respawn_monsters,respawn_items,respawn_inventory,recstat,monsters_off,brightness; int32_t m_respawn_items,m_respawn_monsters,m_respawn_inventory,m_recstat,m_monsters_off,detail; diff --git a/source/duke3d/src/gamestructures.cpp b/source/duke3d/src/gamestructures.cpp index 9edd8aa46..ca37233d9 100644 --- a/source/duke3d/src/gamestructures.cpp +++ b/source/duke3d/src/gamestructures.cpp @@ -1412,7 +1412,7 @@ int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2) case USERDEFS_FTA_ON: labelNum = ud.fta_on; break; case USERDEFS_EXECUTIONS: labelNum = ud.executions; break; case USERDEFS_AUTO_RUN: labelNum = cl_autorun; break; - case USERDEFS_COORDS: labelNum = ud.coords; break; + case USERDEFS_COORDS: labelNum = cl_showcoords; break; case USERDEFS_TICKRATE: labelNum = ud.showfps; break; case USERDEFS_M_COOP: labelNum = ud.m_coop; break; case USERDEFS_COOP: labelNum = ud.coop; break; @@ -1450,20 +1450,20 @@ int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2) case USERDEFS_DRAWWEAPON: labelNum = ud.drawweapon; break; case USERDEFS_MOUSEAIMING: labelNum = ud.mouseaiming; break; case USERDEFS_WEAPONSWITCH: labelNum = ud.weaponswitch; break; - case USERDEFS_DEMOCAMS: labelNum = ud.democams; break; + case USERDEFS_DEMOCAMS: labelNum = cl_democams; break; case USERDEFS_COLOR: labelNum = ud.color; break; case USERDEFS_MSGDISPTIME: labelNum = ud.msgdisptime; break; case USERDEFS_STATUSBARMODE: labelNum = ud.statusbarmode; break; case USERDEFS_M_NOEXITS: labelNum = ud.m_noexits; break; case USERDEFS_NOEXITS: labelNum = ud.noexits; break; - case USERDEFS_AUTOVOTE: labelNum = ud.autovote; break; + case USERDEFS_AUTOVOTE: labelNum = cl_autovote; break; case USERDEFS_AUTOMSG: labelNum = cl_automsg; break; - case USERDEFS_IDPLAYERS: labelNum = ud.idplayers; break; + case USERDEFS_IDPLAYERS: labelNum = cl_idplayers; break; case USERDEFS_TEAM: labelNum = ud.team; break; - case USERDEFS_VIEWBOB: labelNum = ud.viewbob; break; - case USERDEFS_WEAPONSWAY: labelNum = ud.weaponsway; break; + case USERDEFS_VIEWBOB: labelNum = cl_viewbob; break; + case USERDEFS_WEAPONSWAY: labelNum = cl_weaponsway; break; case USERDEFS_ANGLEINTERPOLATION: labelNum = ud.angleinterpolation; break; - case USERDEFS_OBITUARIES: labelNum = ud.obituaries; break; + case USERDEFS_OBITUARIES: labelNum = cl_obituaries; break; case USERDEFS_LEVELSTATS: labelNum = ud.levelstats; break; case USERDEFS_CROSSHAIRSCALE: labelNum = ud.crosshairscale; break; case USERDEFS_ALTHUD: labelNum = ud.althud; break; @@ -1608,7 +1608,7 @@ void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t cons case USERDEFS_FTA_ON: ud.fta_on = iSet; break; case USERDEFS_EXECUTIONS: ud.executions = iSet; break; case USERDEFS_AUTO_RUN: cl_autorun = iSet; break; //!!! - case USERDEFS_COORDS: ud.coords = iSet; break; + case USERDEFS_COORDS: cl_showcoords = 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; @@ -1651,20 +1651,20 @@ void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t cons case USERDEFS_DRAWWEAPON: ud.drawweapon = iSet; break; case USERDEFS_MOUSEAIMING: ud.mouseaiming = iSet; break; case USERDEFS_WEAPONSWITCH: ud.weaponswitch = iSet; break; - case USERDEFS_DEMOCAMS: ud.democams = iSet; break; + case USERDEFS_DEMOCAMS: cl_democams = iSet; break; case USERDEFS_COLOR: ud.color = iSet; break; case USERDEFS_MSGDISPTIME: ud.msgdisptime = iSet; break; case USERDEFS_STATUSBARMODE: ud.statusbarmode = iSet; break; case USERDEFS_M_NOEXITS: ud.m_noexits = iSet; break; case USERDEFS_NOEXITS: ud.noexits = iSet; break; - case USERDEFS_AUTOVOTE: ud.autovote = iSet; break; + case USERDEFS_AUTOVOTE: cl_autovote = iSet; break; //!!! case USERDEFS_AUTOMSG: cl_automsg = iSet; break; //!!! - case USERDEFS_IDPLAYERS: ud.idplayers = iSet; break; + case USERDEFS_IDPLAYERS: ud.idplayers = iSet; break; //!!! case USERDEFS_TEAM: ud.team = iSet; break; - case USERDEFS_VIEWBOB: ud.viewbob = iSet; break; - case USERDEFS_WEAPONSWAY: ud.weaponsway = iSet; break; + case USERDEFS_VIEWBOB: cl_viewbob = iSet; break; //!!! + case USERDEFS_WEAPONSWAY: cl_weaponsway = iSet; break; //!!! case USERDEFS_ANGLEINTERPOLATION: ud.angleinterpolation = iSet; break; - case USERDEFS_OBITUARIES: ud.obituaries = iSet; break; + case USERDEFS_OBITUARIES: cl_obituaries = iSet; break; //!!! case USERDEFS_LEVELSTATS: ud.levelstats = iSet; break; case USERDEFS_CROSSHAIRSCALE: ud.crosshairscale = iSet; break; case USERDEFS_ALTHUD: ud.althud = iSet; break; diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp index 487595998..f1848c243 100644 --- a/source/duke3d/src/osdcmds.cpp +++ b/source/duke3d/src/osdcmds.cpp @@ -41,8 +41,6 @@ BEGIN_DUKE_NS struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat; float r_ambientlight = 1.0, r_ambientlightrecip = 1.0; -uint32_t cl_cheatmask; - static inline int osdcmd_quit(osdcmdptr_t UNUSED(parm)) { UNREFERENCED_CONST_PARAMETER(parm); diff --git a/source/duke3d/src/osdcmds.h b/source/duke3d/src/osdcmds.h index 091f49b45..7026d949c 100644 --- a/source/duke3d/src/osdcmds.h +++ b/source/duke3d/src/osdcmds.h @@ -40,7 +40,6 @@ extern float r_ambientlight,r_ambientlightrecip; extern const char *const ConsoleButtons[]; -extern uint32_t cl_cheatmask; END_DUKE_NS diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index 0c3775b38..cd6c77614 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -2165,7 +2165,7 @@ void P_DisplayWeapon(void) P_DisplayKnee(weaponShade); - if (ud.weaponsway) + if (cl_weaponsway) { weaponX -= (sintable[((pPlayer->weapon_sway>>1)+512)&2047]/(1024+512)); weaponYOffset -= (sprite[pPlayer->i].xrepeat < 32) ? klabs(sintable[(pPlayer->weapon_sway << 2) & 2047] >> 9) @@ -3795,7 +3795,7 @@ void P_FragPlayer(int playerNum) P_DoQuote(QUOTE_RESERVED2, g_player[pPlayer->frag_ps].ps); } - if (ud.obituaries) + if (cl_obituaries) { Bsprintf(tempbuf, apStrings[OBITQUOTEINDEX + (krand() % g_numObituaries)], &g_player[pPlayer->frag_ps].user_name[0], &g_player[playerNum].user_name[0]); @@ -3824,7 +3824,7 @@ void P_FragPlayer(int playerNum) else Bsprintf(tempbuf, "^02%s^02 switched to team %d", &g_player[playerNum].user_name[0], pPlayer->team + 1); - if (ud.obituaries) + if (vl_obituaries) G_AddUserQuote(tempbuf); } pPlayer->frag_ps = playerNum; diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp index d6b66e154..6b72a606f 100644 --- a/source/duke3d/src/screens.cpp +++ b/source/duke3d/src/screens.cpp @@ -667,17 +667,6 @@ static void G_PrintCoords(int32_t snum) y += 7; Bsprintf(tempbuf, "VR=%.03f YX=%.03f", (double) dr_viewingrange/65536.0, (double) dr_yxaspect/65536.0); printext256(x, y+72, COLOR_WHITE, -1, tempbuf, 0); - -#ifdef USE_OPENGL - if (ud.coords == 2) - { - y=16; - - printcoordsline("rendmode = %d", videoGetRenderMode()); - printcoordsline("r_ambientlight = %.03f", r_ambientlight); - - } -#endif } @@ -1206,7 +1195,7 @@ void G_DisplayRest(int32_t smoothratio) if (ud.pause_on==1 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0) menutext_center(100, "Game Paused"); - if (ud.coords) + if (cl_showcoords) G_PrintCoords(screenpeek); #ifdef YAX_DEBUG diff --git a/source/rr/src/actors.cpp b/source/rr/src/actors.cpp index b18b5eaff..b372e7551 100644 --- a/source/rr/src/actors.cpp +++ b/source/rr/src/actors.cpp @@ -8787,7 +8787,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3 case SE_27_DEMO_CAM: { - if (ud.recstat == 0 || !ud.democams) break; + if (ud.recstat == 0 || !cl_democams) break; actor[spriteNum].tempang = pSprite->ang; diff --git a/source/rr/src/cheats.cpp b/source/rr/src/cheats.cpp index b7b6bc207..b359fb49b 100644 --- a/source/rr/src/cheats.cpp +++ b/source/rr/src/cheats.cpp @@ -590,11 +590,7 @@ void G_DoCheats(void) return; case CHEAT_COORDS: -#ifdef USE_OPENGL - if (++ud.coords >= 3) ud.coords = 0; -#else - if (++ud.coords >= 2) ud.coords = 0; -#endif + cl_showcoords = cl_showcoords + 1; end_cheat(pPlayer); return; diff --git a/source/rr/src/cmdline.cpp b/source/rr/src/cmdline.cpp index fd5814521..1b97c780a 100644 --- a/source/rr/src/cmdline.cpp +++ b/source/rr/src/cmdline.cpp @@ -723,7 +723,7 @@ void G_CheckCommandLine(int32_t argc, char const * const * argv) ud.m_volume_number = ud.volume_number = ((unsigned) (Batoi(c)-1))%MAXVOLUMES; break; case 'w': - ud.coords = 1; + cl_showcoords = 1; break; case 'x': c++; diff --git a/source/rr/src/config.cpp b/source/rr/src/config.cpp index 0b100c344..135838db3 100644 --- a/source/rr/src/config.cpp +++ b/source/rr/src/config.cpp @@ -239,7 +239,6 @@ void CONFIG_SetDefaults(void) ud.config.SoundToggle = 1; ud.althud = 1; ud.automsg = 0; - ud.autovote = 0; ud.brightness = 8; ud.camerasprite = -1; @@ -253,11 +252,8 @@ void CONFIG_SetDefaults(void) ud.color = 0; ud.crosshairscale = 50; - ud.obituaries = 1; - ud.democams = 1; ud.detail = 0; ud.drawweapon = 1; - ud.idplayers = 1; ud.levelstats = 0; ud.lockout = 0; ud.m_ffire = 1; @@ -277,8 +273,6 @@ void CONFIG_SetDefaults(void) ud.statusbarmode = 1; ud.statusbarscale = 100; ud.team = 0; - ud.viewbob = 1; - ud.weaponsway = 1; ud.weaponswitch = 3; // new+empty ud.angleinterpolation = 0; #ifdef GEKKO diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp index d1392dd85..0b24f486e 100644 --- a/source/rr/src/game.cpp +++ b/source/rr/src/game.cpp @@ -1251,7 +1251,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio) + mulscale16((pPlayer->q16horiz + pPlayer->q16horizoff - pPlayer->oq16horiz - pPlayer->oq16horizoff), smoothRatio); } - if (ud.viewbob) + if (cl_viewbob) { int zAdd = (pPlayer->opyoff + mulscale16(pPlayer->pyoff-pPlayer->opyoff, smoothRatio)); @@ -6044,10 +6044,10 @@ void G_HandleLocalKeys(void) if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex) { - if (KB_UnBoundKeyPressed(sc_F1) || KB_UnBoundKeyPressed(sc_F2) || ud.autovote) + if (KB_UnBoundKeyPressed(sc_F1) || KB_UnBoundKeyPressed(sc_F2) || cl_autovote) { G_AddUserQuote("Vote Cast"); - Net_SendMapVote(KB_UnBoundKeyPressed(sc_F1) || ud.autovote ? ud.autovote-1 : 0); + Net_SendMapVote(KB_UnBoundKeyPressed(sc_F1) || cl_autovote ? cl_autovote-1 : 0); KB_ClearKeyDown(sc_F1); KB_ClearKeyDown(sc_F2); } @@ -8363,7 +8363,7 @@ int G_DoMoveThings(void) } // Name display when aiming at opponents - if (ud.idplayers && (g_netServer || ud.multimode > 1) + if (cl_idplayers && (g_netServer || ud.multimode > 1) #ifdef SPLITSCREEN_MOD_HACKS && !g_fakeMultiMode #endif diff --git a/source/rr/src/game.h b/source/rr/src/game.h index a3a0caf96..37f78c03e 100644 --- a/source/rr/src/game.h +++ b/source/rr/src/game.h @@ -157,17 +157,17 @@ typedef struct { int32_t reccnt,crosshairscale; int32_t runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon; // JBF 20031125 - int32_t democams,color,msgdisptime,statusbarmode; - int32_t m_noexits,noexits,autovote,automsg,idplayers; - int32_t team, viewbob, weaponsway, althud, weaponscale, textscale; + int32_t color,msgdisptime,statusbarmode; + int32_t m_noexits,noexits,automsg; + int32_t team, althud, weaponscale, textscale; int32_t statusbarflags, statusbarrange, statusbarcustom; int32_t hudontop; int32_t menu_slidebarz, menu_slidebarmargin, menu_slidecursorz; int32_t menu_scrollbartilenum, menu_scrollbarz, menu_scrollcursorz; int32_t entered_name,screen_tilting,shadows,fta_on,executions; - int32_t coords,showfps,levelstats,m_coop,coop,screen_size,lockout,crosshair; - int32_t playerai,angleinterpolation,obituaries; + int32_t showfps,levelstats,m_coop,coop,screen_size,lockout,crosshair; + int32_t playerai,angleinterpolation; int32_t respawn_monsters,respawn_items,respawn_inventory,recstat,monsters_off,brightness; int32_t m_respawn_items,m_respawn_monsters,m_respawn_inventory,m_recstat,m_monsters_off,detail; diff --git a/source/rr/src/osdcmds.cpp b/source/rr/src/osdcmds.cpp index 057f0135b..c97c9fb04 100644 --- a/source/rr/src/osdcmds.cpp +++ b/source/rr/src/osdcmds.cpp @@ -36,8 +36,6 @@ BEGIN_RR_NS struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat; float r_ambientlight = 1.0, r_ambientlightrecip = 1.0; -uint32_t cl_cheatmask; - static inline int osdcmd_quit(osdcmdptr_t UNUSED(parm)) { UNREFERENCED_CONST_PARAMETER(parm); diff --git a/source/rr/src/osdcmds.h b/source/rr/src/osdcmds.h index a1a1bd793..32558d361 100644 --- a/source/rr/src/osdcmds.h +++ b/source/rr/src/osdcmds.h @@ -45,8 +45,6 @@ typedef struct { extern const char *const ConsoleButtons[]; -extern uint32_t cl_cheatmask; - END_RR_NS #endif // osdcmds_h_ diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp index 4da9e3b99..3b50a2ae9 100644 --- a/source/rr/src/player.cpp +++ b/source/rr/src/player.cpp @@ -1739,7 +1739,7 @@ void P_DisplayWeapon(void) if (!RR) P_DisplayKnee(weaponShade); - if (ud.weaponsway) + if (cl_weaponsway) { weaponX -= (sintable[((pPlayer->weapon_sway>>1)+512)&2047]/(1024+512)); weaponYOffset -= (sprite[pPlayer->i].xrepeat < (RR ? 8 : 32)) ? klabs(sintable[(pPlayer->weapon_sway << 2) & 2047] >> 9) @@ -4549,7 +4549,7 @@ void P_FragPlayer(int playerNum) P_DoQuote(QUOTE_RESERVED2, g_player[pPlayer->frag_ps].ps); } - if (ud.obituaries) + if (cl_obituaries) { Bsprintf(tempbuf, apStrings[OBITQUOTEINDEX + (krand2() % g_numObituaries)], &g_player[pPlayer->frag_ps].user_name[0], &g_player[playerNum].user_name[0]); @@ -4578,7 +4578,7 @@ void P_FragPlayer(int playerNum) else Bsprintf(tempbuf, "^02%s^02 switched to team %d", &g_player[playerNum].user_name[0], pPlayer->team + 1); - if (ud.obituaries) + if (cl_obituaries) G_AddUserQuote(tempbuf); } pPlayer->frag_ps = playerNum; diff --git a/source/rr/src/screens.cpp b/source/rr/src/screens.cpp index fcaceb328..0c83abf0d 100644 --- a/source/rr/src/screens.cpp +++ b/source/rr/src/screens.cpp @@ -663,16 +663,6 @@ static void G_PrintCoords(int32_t snum) printext256(x, y+81, COLOR_WHITE, -1, tempbuf, 0); Bsprintf(tempbuf, "MOVEWORLD [ms]= %.3e", g_moveWorldTime); printext256(x, y+90, COLOR_WHITE, -1, tempbuf, 0); - -#ifdef USE_OPENGL - if (ud.coords == 2) - { - y=16; - - printcoordsline("rendmode = %d", videoGetRenderMode()); - printcoordsline("r_ambientlight = %.03f", r_ambientlight); - } -#endif } static void G_ShowCacheLocks(void) @@ -1198,7 +1188,7 @@ void G_DisplayRest(int32_t smoothratio) if (ud.pause_on==1 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0) menutext_center(100, "Game Paused"); - if (ud.coords) + if (cl_showcoords) G_PrintCoords(screenpeek); #ifdef YAX_DEBUG