From 39c6af9b0ae8a714dc5ef1246a26abd561dcc579 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 22 Oct 2019 00:14:39 +0200 Subject: [PATCH] - cl_automsg --- source/duke3d/src/config.cpp | 1 - source/duke3d/src/game.h | 2 +- source/duke3d/src/gamestructures.cpp | 6 +++--- source/duke3d/src/network.cpp | 2 +- source/rr/src/net.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp index fac0a6f34..98168fcc4 100644 --- a/source/duke3d/src/config.cpp +++ b/source/duke3d/src/config.cpp @@ -255,7 +255,6 @@ void CONFIG_SetDefaults(void) ud.althud = 1; ud.angleinterpolation = 0; ud.auto_run = 1; - ud.automsg = 0; ud.autosave = 1; ud.autosavedeletion = 1; ud.autovote = 0; diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h index 4ebd1e138..cab752b4c 100644 --- a/source/duke3d/src/game.h +++ b/source/duke3d/src/game.h @@ -179,7 +179,7 @@ typedef struct { 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 m_noexits,noexits,autovote,idplayers; int32_t team, viewbob, weaponsway, althud, weaponscale, textscale; int32_t statusbarflags, statusbarrange, statusbarcustom; int32_t hudontop; diff --git a/source/duke3d/src/gamestructures.cpp b/source/duke3d/src/gamestructures.cpp index 5ad81cc7a..704067046 100644 --- a/source/duke3d/src/gamestructures.cpp +++ b/source/duke3d/src/gamestructures.cpp @@ -1457,7 +1457,7 @@ int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2) 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_AUTOMSG: labelNum = ud.automsg; break; + case USERDEFS_AUTOMSG: labelNum = cl_automsg; break; case USERDEFS_IDPLAYERS: labelNum = ud.idplayers; break; case USERDEFS_TEAM: labelNum = ud.team; break; case USERDEFS_VIEWBOB: labelNum = ud.viewbob; break; @@ -1620,7 +1620,7 @@ void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t cons } break; case USERDEFS_LOCKOUT: ud.lockout = iSet; break; - case USERDEFS_CROSSHAIR: cl_crosshair = iSet; break; + case USERDEFS_CROSSHAIR: cl_crosshair = iSet; break; //!!! case USERDEFS_PLAYERAI: ud.playerai = iSet; break; case USERDEFS_RESPAWN_MONSTERS: ud.respawn_monsters = iSet; break; case USERDEFS_RESPAWN_ITEMS: ud.respawn_items = iSet; break; @@ -1658,7 +1658,7 @@ void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t cons 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_AUTOMSG: ud.automsg = iSet; break; + case USERDEFS_AUTOMSG: cl_automsg = iSet; break; //!!! case USERDEFS_IDPLAYERS: ud.idplayers = iSet; break; case USERDEFS_TEAM: ud.team = iSet; break; case USERDEFS_VIEWBOB: ud.viewbob = iSet; break; diff --git a/source/duke3d/src/network.cpp b/source/duke3d/src/network.cpp index 802bcc376..a68cf5f92 100644 --- a/source/duke3d/src/network.cpp +++ b/source/duke3d/src/network.cpp @@ -5139,7 +5139,7 @@ void Net_SendMessage(void) g_player[myconnectindex].ps->gm &= ~(MODE_TYPE | MODE_SENDTOWHOM); return; } - if (ud.automsg) + if (cl_automsg) { if (SHIFTS_IS_PRESSED) g_chatPlayer = -1; diff --git a/source/rr/src/net.cpp b/source/rr/src/net.cpp index 8c5b50526..a1d178950 100644 --- a/source/rr/src/net.cpp +++ b/source/rr/src/net.cpp @@ -3707,7 +3707,7 @@ void Net_SendMessage(void) g_player[myconnectindex].ps->gm &= ~(MODE_TYPE|MODE_SENDTOWHOM); return; } - if (ud.automsg) + if (cl_automsg) { if (SHIFTS_IS_PRESSED) g_chatPlayer = -1; else g_chatPlayer = ud.multimode;