Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes See merge request STJr/SRB2!821
This commit is contained in:
commit
e457b71e7e
|
@ -80,7 +80,7 @@ static boolean joyaxis2_default = false;
|
||||||
static INT32 joyaxis_count = 0;
|
static INT32 joyaxis_count = 0;
|
||||||
static INT32 joyaxis2_count = 0;
|
static INT32 joyaxis2_count = 0;
|
||||||
|
|
||||||
#define COM_BUF_SIZE 8192 // command buffer size
|
#define COM_BUF_SIZE (32<<10) // command buffer size
|
||||||
#define MAX_ALIAS_RECURSION 100 // max recursion allowed for aliases
|
#define MAX_ALIAS_RECURSION 100 // max recursion allowed for aliases
|
||||||
|
|
||||||
static INT32 com_wait; // one command per frame (for cmd sequences)
|
static INT32 com_wait; // one command per frame (for cmd sequences)
|
||||||
|
|
10
src/d_main.c
10
src/d_main.c
|
@ -1150,6 +1150,12 @@ void D_SRB2Main(void)
|
||||||
if (M_CheckParm("-password") && M_IsNextParm())
|
if (M_CheckParm("-password") && M_IsNextParm())
|
||||||
D_SetPassword(M_GetNextParm());
|
D_SetPassword(M_GetNextParm());
|
||||||
|
|
||||||
|
CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
|
||||||
|
Z_Init();
|
||||||
|
|
||||||
|
// Do this up here so that WADs loaded through the command line can use ExecCfg
|
||||||
|
COM_Init();
|
||||||
|
|
||||||
// add any files specified on the command line with -file wadfile
|
// add any files specified on the command line with -file wadfile
|
||||||
// to the wad list
|
// to the wad list
|
||||||
if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
|
if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
|
||||||
|
@ -1177,9 +1183,6 @@ void D_SRB2Main(void)
|
||||||
if (M_CheckParm("-server") || dedicated)
|
if (M_CheckParm("-server") || dedicated)
|
||||||
netgame = server = true;
|
netgame = server = true;
|
||||||
|
|
||||||
CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
|
|
||||||
Z_Init();
|
|
||||||
|
|
||||||
// adapt tables to SRB2's needs, including extra slots for dehacked file support
|
// adapt tables to SRB2's needs, including extra slots for dehacked file support
|
||||||
P_PatchInfoTables();
|
P_PatchInfoTables();
|
||||||
|
|
||||||
|
@ -1251,7 +1254,6 @@ void D_SRB2Main(void)
|
||||||
CONS_Printf("HU_Init(): Setting up heads up display.\n");
|
CONS_Printf("HU_Init(): Setting up heads up display.\n");
|
||||||
HU_Init();
|
HU_Init();
|
||||||
|
|
||||||
COM_Init();
|
|
||||||
CON_Init();
|
CON_Init();
|
||||||
|
|
||||||
D_RegisterServerCommands();
|
D_RegisterServerCommands();
|
||||||
|
|
|
@ -3890,7 +3890,26 @@ static void readmaincfg(MYFILE *f)
|
||||||
value = atoi(word2); // used for numerical settings
|
value = atoi(word2); // used for numerical settings
|
||||||
|
|
||||||
if (fastcmp(word, "EXECCFG"))
|
if (fastcmp(word, "EXECCFG"))
|
||||||
COM_BufAddText(va("exec %s\n", word2));
|
{
|
||||||
|
if (strchr(word2, '.'))
|
||||||
|
COM_BufAddText(va("exec %s\n", word2));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
lumpnum_t lumpnum;
|
||||||
|
char newname[9];
|
||||||
|
|
||||||
|
strncpy(newname, word2, 8);
|
||||||
|
|
||||||
|
newname[8] = '\0';
|
||||||
|
|
||||||
|
lumpnum = W_CheckNumForName(newname);
|
||||||
|
|
||||||
|
if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0)
|
||||||
|
CONS_Debug(DBG_SETUP, "SOC Error: script lump %s not found/not valid.\n", newname);
|
||||||
|
else
|
||||||
|
COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
else if (fastcmp(word, "SPSTAGE_START"))
|
else if (fastcmp(word, "SPSTAGE_START"))
|
||||||
{
|
{
|
||||||
|
@ -7478,7 +7497,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
|
|
||||||
// Got Flag Sign
|
// Got Flag Sign
|
||||||
"S_GOTFLAG",
|
"S_GOTFLAG",
|
||||||
|
|
||||||
// Finish flag
|
// Finish flag
|
||||||
"S_FINISHFLAG",
|
"S_FINISHFLAG",
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue