teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- a bit more config cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-27 14:09:56 +01:00
parent 5386366ec4
commit 2e7ba30068
23 changed files with 30 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/blood/src/blood.cpp
View file

@ -96,7 +96,6 @@ INPUT_MODE gInputMode;
unsigned int nMaxAlloc = 0x4000000;
#endif
bool bCustomName = false;
char bAddUserMap = false;
bool bNoDemo = false;
bool bQuickStart = true;
@ -105,7 +104,6 @@ int gMusicPrevLoadedEpisode = -1;
int gMusicPrevLoadedLevel = -1;
char gUserMapFilename[BMAX_PATH];
char gPName[MAXPLAYERNAME];
short BloodVersion = 0x115;
@ -1261,10 +1259,6 @@ void ParseOptions(void)
gPacketMode = PACKETMODE_2;
break;
case 21:
if (OptArgc < 1)
ThrowError("Missing argument");
strcpy(gPName, OptArgv[0]);
bCustomName = 1;
break;
case 2:
if (OptArgc < 1)
@ -1523,8 +1517,6 @@ int app_main(int argc, char const * const * argv)
int const readSetup =
#endif
CONFIG_ReadSetup();
if (bCustomName)
strcpy(szPlayerName, gPName);
if (enginePreInit())
{

40
source/blood/src/config.cpp
View file

@ -57,7 +57,6 @@ BEGIN_BLD_NS
int32_t setupread;
int32_t mus_restartonload;
char szPlayerName[MAXPLAYERNAME];
int32_t gTurnSpeed;
int32_t gDetail;
int32_t cl_weaponswitch;
@ -108,42 +107,7 @@ void CONFIG_SetDefaults(void)
}
#endif
#ifdef USE_OPENGL
ScreenBPP = 32;
#else
ScreenBPP = 8;
#endif
ScreenMode = 1;
//snd_ambience = 1;
//ud.config.AutoAim = 1;
//ud.config.ShowWeapons = 0;
//ud.crosshair = 1;
//ud.default_skill = 1;
gUpscaleFactor = 0;
//ud.display_bonus_screen = 1;
//adult_lockout = 0;
//ud.m_marker = 1;
//ud.maxautosaves = 5;
//ud.menu_scrollbartilenum = -1;
//ud.menu_scrollbarz = 65536;
//ud.menu_scrollcursorz = 65536;
//ud.menu_slidebarmargin = 65536;
//ud.menu_slidebarz = 65536;
//ud.menu_slidecursorz = 65536;
//ud.screen_size = 4;
//ud.screen_tilting = 1;
//ud.screenfade = 1;
//ud.shadow_pal = 4;
//ud.show_level_text = 1;
//ud.slidebar_paldisabled = 1;
//ud.statusbarflags = STATUSBAR_NOSHRINK;
//ud.statusbarmode = 1;
//ud.statusbarscale = 100;
//ud.team = 0;
//cl_weaponswitch = 3; // new+empty
gDeliriumBlur = 1;
gViewSize = 2;
gTurnSpeed = 92;
@ -158,10 +122,6 @@ void CONFIG_SetDefaults(void)
gMessageFont = 0;
gbAdultContent = 0;
gzAdultPassword[0] = 0;
cl_weaponswitch = 1;
Bstrcpy(szPlayerName, "Player");
}

1
source/blood/src/config.h
View file

@ -37,7 +37,6 @@ BEGIN_BLD_NS
#define MAXPLAYERNAME 16
extern int32_t setupread;
extern char szPlayerName[MAXPLAYERNAME];
extern int32_t gTurnSpeed;
extern int32_t gDetail;
extern int32_t gAutoRun;

5
source/blood/src/menu.cpp
View file

@ -609,7 +609,8 @@ CGameMenuItemChain itemOptionsSoundApplyChanges("APPLY CHANGES", 3, 66, 150, 180
void UpdatePlayerName(CGameMenuItemZEdit *pItem, CGameMenuEvent *pEvent);
CGameMenuItemTitle itemOptionsPlayerTitle("PLAYER SETUP", 1, 160, 20, 2038);
CGameMenuItemZEdit itemOptionsPlayerName("PLAYER NAME:", 3, 66, 60, 180, szPlayerName, MAXPLAYERNAME, 0, UpdatePlayerName, 0);
// This won't work without messing around with stuff. So it'll have to wait for the new options menu.
//CGameMenuItemZEdit itemOptionsPlayerName("PLAYER NAME:", 3, 66, 60, 180, *playername, MAXPLAYERNAME, 0, UpdatePlayerName, 0);
CGameMenu menuOptionsControlKeyboard;
CGameMenu menuOptionsControlMouse;
@ -1254,7 +1255,7 @@ void SetupOptionsMenu(void)
menuOptionsSound.Add(&itemBloodQAV, false);
menuOptionsPlayer.Add(&itemOptionsPlayerTitle, false);
menuOptionsPlayer.Add(&itemOptionsPlayerName, true);
//menuOptionsPlayer.Add(&itemOptionsPlayerName, true);
menuOptionsPlayer.Add(&itemBloodQAV, false);
menuOptionsControl.Add(&itemOptionsControlTitle, false);

2
source/blood/src/network.cpp
View file

@ -576,7 +576,7 @@ void netBroadcastMyLogoff(bool bRestart)
void netBroadcastPlayerInfo(int nPlayer)
{
PROFILE *pProfile = &gProfile[nPlayer];
strcpy(pProfile->name, szPlayerName);
strcpy(pProfile->name, playername);
pProfile->skill = gSkill;
pProfile->nAutoAim = cl_autoaim;
pProfile->nWeaponSwitch = cl_weaponswitch;

2
source/blood/src/view.cpp
View file

@ -2167,7 +2167,7 @@ uspritetype *viewAddEffect(int nTSprite, VIEW_EFFECT nViewEffect)
pNSprite->xrepeat = 32;
pNSprite->yrepeat = 32;
const int nVoxel = voxelIndex[nTile];
if (gShowWeapon == 2 && usevoxels && gDetail >= 4 && videoGetRenderMode() != REND_POLYMER && nVoxel != -1)
if (cl_showweapon == 2 && r_voxels && gDetail >= 4 && videoGetRenderMode() != REND_POLYMER && nVoxel != -1)
{
pNSprite->cstat |= 48;
pNSprite->cstat &= ~8;

1
source/common/gamecvars.cpp
View file

@ -450,6 +450,7 @@ CUSTOM_CVAR(String, playername, "Player", CVAR_ARCHIVE | CVAR_USERINFO)
{
self = buffer.Data();
}
//Net_SendClientInfo(); This is in the client code. Todo.
}
CUSTOM_CVAR(String, rtsname, "", CVAR_ARCHIVE | CVAR_USERINFO)

2
source/duke3d/src/cmdline.cpp
View file

@ -367,7 +367,7 @@ void G_CheckCommandLine(int32_t argc, char const * const * argv)
continue;
}
#endif
if (!Bstrcasecmp(c+1, "name"))
if (!Bstrcasecmp(c+1, "name")) // pname in Blood
{
if (argc > i+1)
{

9
source/duke3d/src/game.cpp
View file

@ -6047,14 +6047,7 @@ static void G_Startup(void)
if (CommandName)
{
// Bstrncpy(szPlayerName, CommandName, 9);
// szPlayerName[10] = '\0';
Bstrcpy(tempbuf,CommandName);
while (Bstrlen(OSD_StripColors(tempbuf,tempbuf)) > 10)
tempbuf[Bstrlen(tempbuf)-1] = '\0';
Bstrncpyz(szPlayerName, tempbuf, sizeof(szPlayerName));
playername = CommandName;
}
if (CommandMap)

1
source/duke3d/src/global.h
View file

@ -75,7 +75,6 @@ G_EXTERN char g_skillCnt;
G_EXTERN char pus,pub;
G_EXTERN char ready2send;
#define MAXPLAYERNAME 32
G_EXTERN char szPlayerName[MAXPLAYERNAME];
G_EXTERN char tempbuf[MAXSECTORS<<1],packbuf[PACKBUF_SIZE],buf[1024];
#define TYPEBUFSIZE 141
G_EXTERN char typebuf[TYPEBUFSIZE];

8
source/duke3d/src/menus.cpp
View file

@ -1207,8 +1207,8 @@ static MenuEntry_t *MEL_NETWORK[] = {
&ME_NETWORK_HOSTGAME,
};
static MenuString_t MEO_PLAYER_NAME = MAKE_MENUSTRING( szPlayerName, &MF_Bluefont, MAXPLAYERNAME, 0 );
static MenuEntry_t ME_PLAYER_NAME = MAKE_MENUENTRY( "Name", &MF_Bluefont, &MEF_PlayerNarrow, &MEO_PLAYER_NAME, String );
//static MenuString_t MEO_PLAYER_NAME = MAKE_MENUSTRING( playername, &MF_Bluefont, MAXPLAYERNAME, 0 );
//static MenuEntry_t ME_PLAYER_NAME = MAKE_MENUENTRY( "Name", &MF_Bluefont, &MEF_PlayerNarrow, &MEO_PLAYER_NAME, String );
static char const *MEOSN_PLAYER_COLOR[] = { "Auto", "Blue", "Red", "Green", "Gray", "Dark gray", "Dark green", "Brown", "Dark blue", "Bright red", "Yellow", };
static int32_t MEOSV_PLAYER_COLOR[] = { 0, 9, 10, 11, 12, 13, 14, 15, 16, 21, 23, };
static MenuOptionSet_t MEOS_PLAYER_COLOR = MAKE_MENUOPTIONSET( MEOSN_PLAYER_COLOR, MEOSV_PLAYER_COLOR, 0x2 );
@ -1224,7 +1224,7 @@ static MenuEntry_t ME_PLAYER_MACROS = MAKE_MENUENTRY( "Multiplayer macros", &MF_
#endif
static MenuEntry_t *MEL_PLAYER[] = {
&ME_PLAYER_NAME,
//&ME_PLAYER_NAME,
&ME_Space4_Bluefont,
&ME_PLAYER_COLOR,
&ME_Space4_Bluefont,
@ -3361,7 +3361,7 @@ static void Menu_EntryOptionDidModify(MenuEntry_t *entry)
if (entry == &ME_GAMESETUP_AIM_AUTO ||
entry == &ME_GAMESETUP_WEAPSWITCH_PICKUP ||
entry == &ME_PLAYER_NAME ||
//entry == &ME_PLAYER_NAME ||
entry == &ME_PLAYER_COLOR ||
entry == &ME_PLAYER_TEAM)
G_UpdatePlayerFromMenu();

8
source/duke3d/src/network.cpp
View file

@ -4792,7 +4792,7 @@ void Net_SendClientInfo(void)
{
int32_t i, l;
for (l = 0; (unsigned)l < sizeof(szPlayerName) - 1; l++) g_player[myconnectindex].user_name[l] = szPlayerName[l];
strncpy(g_player[myconnectindex].user_name, playername, 32);
if (numplayers < 2)
return;
@ -4801,10 +4801,8 @@ void Net_SendClientInfo(void)
l = 1;
// null terminated player name to send
for (i = 0; szPlayerName[i]; i++)
{
tempnetbuf[l++] = szPlayerName[i];
}
strncpy(tempbuf + l, playername, 32);
l += 32;
tempnetbuf[l++] = 0;
tempnetbuf[l++] = g_player[myconnectindex].ps->aim_mode = in_aimmode;

27
source/duke3d/src/osdcmds.cpp
View file

@ -1136,31 +1136,6 @@ static int osdcmd_inittimer(osdcmdptr_t parm)
}
#endif
#if !defined NETCODE_DISABLE
static int osdcmd_name(osdcmdptr_t parm)
{
char namebuf[32];
if (parm->numparms != 1)
{
OSD_Printf("\"name\" is \"%s\"\n",szPlayerName);
return OSDCMD_SHOWHELP;
}
Bstrcpy(tempbuf,parm->parms[0]);
while (Bstrlen(OSD_StripColors(namebuf,tempbuf)) > 10)
tempbuf[Bstrlen(tempbuf)-1] = '\0';
Bstrncpy(szPlayerName,tempbuf,sizeof(szPlayerName)-1);
szPlayerName[sizeof(szPlayerName)-1] = '\0';
OSD_Printf("name %s\n",szPlayerName);
Net_SendClientInfo();
return OSDCMD_OK;
}
static int osdcmd_dumpmapstate(osdfuncparm_t const * const)
{
@ -1333,7 +1308,6 @@ static int osdcmd_kickban(osdcmdptr_t parm)
return OSDCMD_OK;
}
#endif
#endif
static int osdcmd_purgesaves(osdcmdptr_t UNUSED(parm))
{
@ -1421,7 +1395,6 @@ int32_t registerosdcommands(void)
OSD_RegisterFunction("kickban","kickban <id>: kicks a multiplayer client and prevents them from reconnecting. See listplayers.", osdcmd_kickban);
#endif
OSD_RegisterFunction("listplayers","listplayers: lists currently connected multiplayer clients", osdcmd_listplayers);
OSD_RegisterFunction("name","name: change your multiplayer nickname", osdcmd_name);
OSD_RegisterFunction("password","password: sets multiplayer game password", osdcmd_password);
OSD_RegisterFunction("playerinfo", "Prints information about the current player", osdcmd_playerinfo);
#endif

15
source/rr/src/game.cpp
View file

@ -7431,17 +7431,10 @@ static void G_Startup(void)
//if (g_noSound) snd_enabled = 0;
//if (g_noMusic) mus_enabled = 0;
if (CommandName)
{
// Bstrncpy(szPlayerName, CommandName, 9);
// szPlayerName[10] = '\0';
Bstrcpy(tempbuf,CommandName);
while (Bstrlen(OSD_StripColors(tempbuf,tempbuf)) > 10)
tempbuf[Bstrlen(tempbuf)-1] = '\0';
Bstrncpyz(szPlayerName, tempbuf, sizeof(szPlayerName));
}
if (CommandName)
{
playername = CommandName;
}
if (CommandMap)
{

1
source/rr/src/global.h
View file

@ -81,7 +81,6 @@ G_EXTERN char g_skillCnt;
G_EXTERN char pus,pub;
G_EXTERN char ready2send;
#define MAXPLAYERNAME 32
G_EXTERN char szPlayerName[MAXPLAYERNAME];
G_EXTERN char tempbuf[MAXSECTORS<<1],buf[1024];
G_EXTERN uint8_t packbuf[PACKBUF_SIZE];
#define TYPEBUFSIZE 141

8
source/rr/src/menus.cpp
View file

@ -1164,8 +1164,8 @@ static MenuEntry_t *MEL_NETWORK[] = {
&ME_NETWORK_HOSTGAME,
};
static MenuString_t MEO_PLAYER_NAME = MAKE_MENUSTRING( szPlayerName, &MF_Bluefont, MAXPLAYERNAME, 0 );
static MenuEntry_t ME_PLAYER_NAME = MAKE_MENUENTRY( "Name", &MF_Bluefont, &MEF_PlayerNarrow, &MEO_PLAYER_NAME, String );
//static MenuString_t MEO_PLAYER_NAME = MAKE_MENUSTRING( playername, &MF_Bluefont, MAXPLAYERNAME, 0 );
//static MenuEntry_t ME_PLAYER_NAME = MAKE_MENUENTRY( "Name", &MF_Bluefont, &MEF_PlayerNarrow, &MEO_PLAYER_NAME, String );
static char const *MEOSN_PLAYER_COLOR[] = { "Auto", "Blue", "Red", "Green", "Gray", "Dark gray", "Dark green", "Brown", "Dark blue", "Bright red", "Yellow", };
static int32_t MEOSV_PLAYER_COLOR[] = { 0, 9, 10, 11, 12, 13, 14, 15, 16, 21, 23, };
static MenuOptionSet_t MEOS_PLAYER_COLOR = MAKE_MENUOPTIONSET( MEOSN_PLAYER_COLOR, MEOSV_PLAYER_COLOR, 0x2 );
@ -1181,7 +1181,7 @@ static MenuEntry_t ME_PLAYER_MACROS = MAKE_MENUENTRY( "Multiplayer macros", &MF_
#endif
static MenuEntry_t *MEL_PLAYER[] = {
&ME_PLAYER_NAME,
//&ME_PLAYER_NAME,
&ME_Space4_Bluefont,
&ME_PLAYER_COLOR,
&ME_Space4_Bluefont,
@ -3757,7 +3757,7 @@ static void Menu_EntryOptionDidModify(MenuEntry_t *entry)
if (entry == &ME_GAMESETUP_AIM_AUTO ||
entry == &ME_GAMESETUP_WEAPSWITCH_PICKUP ||
entry == &ME_PLAYER_NAME ||
//entry == &ME_PLAYER_NAME ||
entry == &ME_PLAYER_COLOR ||
entry == &ME_PLAYER_TEAM)
G_UpdatePlayerFromMenu();

11
source/rr/src/net.cpp
View file

@ -3452,8 +3452,7 @@ void Net_SendClientInfo(void)
{
int32_t i,l;
for (l=0; (unsigned)l<sizeof(szPlayerName)-1; l++)
g_player[myconnectindex].user_name[l] = szPlayerName[l];
strncpy(g_player[myconnectindex].user_name, playername, 32);
if (numplayers < 2) return;
@ -3461,11 +3460,9 @@ void Net_SendClientInfo(void)
l = 1;
//null terminated player name to send
for (i=0; szPlayerName[i]; i++)
{
tempbuf[l++] = szPlayerName[i];
}
tempbuf[l++] = 0;
strncpy(tempbuf + l, playername, 32);
l += 32;
tempbuf[l++] = 0;
tempbuf[l++] = g_player[myconnectindex].ps->aim_mode = in_aimmode;
tempbuf[l++] = g_player[myconnectindex].ps->auto_aim = cl_autoaim;

30
source/rr/src/osdcmds.cpp
View file

@ -712,32 +712,6 @@ void onvideomodechange(int32_t newmode)
g_crosshairSum = -1;
}
#if !defined NETCODE_DISABLE
static int osdcmd_name(osdcmdptr_t parm)
{
char namebuf[32];
if (parm->numparms != 1)
{
OSD_Printf("\"name\" is \"%s\"\n",szPlayerName);
return OSDCMD_SHOWHELP;
}
Bstrcpy(tempbuf,parm->parms[0]);
while (Bstrlen(OSD_StripColors(namebuf,tempbuf)) > 10)
tempbuf[Bstrlen(tempbuf)-1] = '\0';
Bstrncpy(szPlayerName,tempbuf,sizeof(szPlayerName)-1);
szPlayerName[sizeof(szPlayerName)-1] = '\0';
OSD_Printf("name %s\n",szPlayerName);
Net_SendClientInfo();
return OSDCMD_OK;
}
#endif
const char *const ConsoleButtons[] =
{
@ -1234,10 +1208,6 @@ int32_t registerosdcommands(void)
#endif
OSD_RegisterFunction("music","music E<ep>L<lev>: change music", osdcmd_music);
#if !defined NETCODE_DISABLE
OSD_RegisterFunction("name","name: change your multiplayer nickname", osdcmd_name);
#endif
OSD_RegisterFunction("noclip","noclip: toggles clipping mode", osdcmd_noclip);
#if !defined NETCODE_DISABLE

7
source/sw/src/config.cpp
View file

@ -60,7 +60,6 @@ extern void ReadGameSetup(int32_t scripthandle);
// Comm variables
//
char CommPlayerName[32];
int32_t NumberPlayers,CommPort,PortSpeed,IrqNumber,UartAddress;
//
@ -75,8 +74,6 @@ int32_t UseMouse = 1, UseJoystick = 0;
// Screen variables
//
char RTSName[MAXRTSNAMELENGTH];
static int32_t scripthandle = -1;
@ -113,11 +110,7 @@ void CONFIG_SetDefaults(void)
ScreenHeight = 768;
}
ScreenBPP = 32;
memcpy(&gs, &gs_defaults, sizeof(gs));
Bstrcpy(RTSName, DEFAULTRTSFILE);
Bstrcpy(CommPlayerName, DEFAULTPLAYERNAME);
}

1
source/sw/src/config.h
View file

@ -62,7 +62,6 @@ extern char PhoneNumber[PHONENUMBERLENGTH];
extern int32_t NumberPlayers;
extern int32_t ConnectType;
extern char PlayerName[MAXPLAYERNAMELENGTH];
extern char RTSName[MAXRTSNAMELENGTH];
extern char UserLevel[MAXUSERLEVELNAMELENGTH];
extern char RTSPath[MAXRTSPATHLENGTH];
extern char UserPath[MAXUSERLEVELPATHLENGTH];

1
source/sw/src/game.h
View file

@ -2167,7 +2167,6 @@ extern SWBOOL ExitLevel;
extern SWBOOL Warping;
extern uint8_t CommPlayers;
extern SWBOOL CommEnabled;
extern char CommPlayerName[];
extern short Level;
extern short Episode;

13
source/sw/src/network.cpp
View file

@ -70,7 +70,6 @@ SYNC BUG NOTES:
static uint8_t tempbuf[576], packbuf[576];
int PlayClock;
extern SWBOOL PauseKeySet;
extern char CommPlayerName[32];
gNET gNet;
extern short PlayerQuitMenuLevel;
@ -457,12 +456,7 @@ InitNetPlayerOptions(void)
PLAYERp pp = Player + myconnectindex;
PACKET_OPTIONS p;
// if you don't have a name :(
if (!CommPlayerName[0])
sprintf(CommPlayerName, "PLAYER %d", myconnectindex + 1);
Bstrupr(CommPlayerName);
strcpy(pp->PlayerName, CommPlayerName);
strncpy(pp->PlayerName, playername, 32);
// myconnectindex palette
pp->TeamColor = gs.NetColor;
@ -474,7 +468,7 @@ InitNetPlayerOptions(void)
p.PacketType = PACKET_TYPE_PLAYER_OPTIONS;
p.AutoRun = gs.AutoRun;
p.Color = gs.NetColor;
strcpy(p.PlayerName, CommPlayerName);
strncpy(p.PlayerName, playername, 32);
//TRAVERSE_CONNECT(pnum)
{
@ -499,7 +493,7 @@ SendMulitNameChange(char *new_name)
Bstrupr(new_name);
strcpy(pp->PlayerName, new_name);
strcpy(CommPlayerName, new_name);
playername = new_name;
SetRedrawScreen(pp);
//TRAVERSE_CONNECT(pnum)
@ -1585,7 +1579,6 @@ getpackets(void)
MONO_PRINT(ds);
strcpy(pp->PlayerName, p->PlayerName);
//strcpy(CommPlayerName, p->PlayerName);
SetRedrawScreen(Player+myconnectindex);
break;
}

2
source/sw/src/setup.cpp
View file

@ -109,7 +109,6 @@ void InitSetup(void)
CONTROL_PrintAxes();
}*/
//RTS_Init(RTSName);
}
#if 0
@ -255,7 +254,6 @@ void main()
SoundStartup();
MusicStartup();
RTS_Init(RTSName);
// load in some test data