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
b64dd820
Commit
b64dd820
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Attempt to fix cv_execversion being accessible by console
parent
657e7321
No related branches found
No related tags found
3 merge requests
!488
Merge in next and don't billboard papersprites in GL
,
!408
EXECVERSION adjustments (config updater)
,
!402
Update code versions to 2.1.22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/m_misc.c
+4
-4
4 additions, 4 deletions
src/m_misc.c
with
4 additions
and
4 deletions
src/m_misc.c
+
4
−
4
View file @
b64dd820
...
@@ -443,7 +443,7 @@ void Command_LoadConfig_f(void)
...
@@ -443,7 +443,7 @@ void Command_LoadConfig_f(void)
FIL_ForceExtension
(
configfile
,
".cfg"
);
FIL_ForceExtension
(
configfile
,
".cfg"
);
// temporarily reset execversion to default
// temporarily reset execversion to default
cv_execversion
.
flags
&
=
~
CV_HIDEN
;
cv_execversion
.
flags
=
0
;
COM_BufInsertText
(
va
(
"%s
\"
%s
\"\n
"
,
cv_execversion
.
name
,
cv_execversion
.
defaultvalue
));
COM_BufInsertText
(
va
(
"%s
\"
%s
\"\n
"
,
cv_execversion
.
name
,
cv_execversion
.
defaultvalue
));
CV_InitFilterVar
();
CV_InitFilterVar
();
...
@@ -452,7 +452,7 @@ void Command_LoadConfig_f(void)
...
@@ -452,7 +452,7 @@ void Command_LoadConfig_f(void)
// don't filter anymore vars and don't let this convsvar be changed
// don't filter anymore vars and don't let this convsvar be changed
COM_BufInsertText
(
va
(
"%s
\"
%d
\"\n
"
,
cv_execversion
.
name
,
EXECVERSION
));
COM_BufInsertText
(
va
(
"%s
\"
%d
\"\n
"
,
cv_execversion
.
name
,
EXECVERSION
));
cv_execversion
.
flags
|
=
CV_HIDEN
;
cv_execversion
.
flags
=
CV_HIDEN
;
}
}
/** Saves the current configuration and loads another.
/** Saves the current configuration and loads another.
...
@@ -494,7 +494,7 @@ void M_FirstLoadConfig(void)
...
@@ -494,7 +494,7 @@ void M_FirstLoadConfig(void)
// temporarily reset execversion to default
// temporarily reset execversion to default
// we shouldn't need to do this, but JUST in case...
// we shouldn't need to do this, but JUST in case...
cv_execversion
.
flags
&
=
~
CV_HIDEN
;
cv_execversion
.
flags
=
0
;
COM_BufInsertText
(
va
(
"%s
\"
%s
\"\n
"
,
cv_execversion
.
name
,
cv_execversion
.
defaultvalue
));
COM_BufInsertText
(
va
(
"%s
\"
%s
\"\n
"
,
cv_execversion
.
name
,
cv_execversion
.
defaultvalue
));
CV_InitFilterVar
();
CV_InitFilterVar
();
...
@@ -504,7 +504,7 @@ void M_FirstLoadConfig(void)
...
@@ -504,7 +504,7 @@ void M_FirstLoadConfig(void)
// don't filter anymore vars and don't let this convsvar be changed
// don't filter anymore vars and don't let this convsvar be changed
COM_BufInsertText
(
va
(
"%s
\"
%d
\"\n
"
,
cv_execversion
.
name
,
EXECVERSION
));
COM_BufInsertText
(
va
(
"%s
\"
%d
\"\n
"
,
cv_execversion
.
name
,
EXECVERSION
));
cv_execversion
.
flags
|
=
CV_HIDEN
;
cv_execversion
.
flags
=
CV_HIDEN
;
// make sure I_Quit() will write back the correct config
// make sure I_Quit() will write back the correct config
// (do not write back the config if it crash before)
// (do not write back the config if it crash before)
...
...
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