Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
f8408f3c
Commit
f8408f3c
authored
5 years ago
by
fickleheart
Browse files
Options
Downloads
Patches
Plain Diff
Fix ExecCfg not working on files added via command line
parent
1f8dbd1b
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!892
Funny shaders master merge
,
!821
ExecCfg fixes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/d_main.c
+6
-4
6 additions, 4 deletions
src/d_main.c
with
6 additions
and
4 deletions
src/d_main.c
+
6
−
4
View file @
f8408f3c
...
@@ -1152,6 +1152,12 @@ void D_SRB2Main(void)
...
@@ -1152,6 +1152,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"
)))
...
@@ -1179,9 +1185,6 @@ void D_SRB2Main(void)
...
@@ -1179,9 +1185,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
();
...
@@ -1253,7 +1256,6 @@ void D_SRB2Main(void)
...
@@ -1253,7 +1256,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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment