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
68f40d8a
Commit
68f40d8a
authored
8 months ago
by
Lactozilla
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-console-dedicated-windows' into 'next'
Fix command prompt issues on dedicated build on Windows Closes
#1290
See merge request
!2518
parents
fafa522c
60852cab
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2518
Fix command prompt issues on dedicated build on Windows
Pipeline
#5643
passed
8 months ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/dedicated/i_system.c
+2
-19
2 additions, 19 deletions
src/dedicated/i_system.c
with
2 additions
and
19 deletions
src/dedicated/i_system.c
+
2
−
19
View file @
68f40d8a
...
@@ -999,20 +999,8 @@ static void I_GetConsoleEvents(void)
...
@@ -999,20 +999,8 @@ static void I_GetConsoleEvents(void)
static
void
I_StartupConsole
(
void
)
static
void
I_StartupConsole
(
void
)
{
{
HANDLE
ci
,
co
;
HANDLE
ci
,
co
;
const
INT32
ded
=
M_CheckParm
(
"-dedicated"
);
BOOL
gotConsole
=
AllocConsole
();
BOOL
gotConsole
=
FALSE
;
consolevent
=
!
M_CheckParm
(
"-noconsole"
);
if
(
M_CheckParm
(
"-console"
)
||
ded
)
gotConsole
=
AllocConsole
();
#ifdef _DEBUG
else
if
(
M_CheckParm
(
"-noconsole"
)
&&
!
ded
)
#else
else
if
(
!
M_CheckParm
(
"-console"
)
&&
!
ded
)
#endif
{
FreeConsole
();
gotConsole
=
FALSE
;
}
if
(
gotConsole
)
if
(
gotConsole
)
{
{
SetConsoleTitleA
(
"SRB2 Console"
);
SetConsoleTitleA
(
"SRB2 Console"
);
...
@@ -1040,12 +1028,7 @@ static inline void I_ShutdownConsole(void){}
...
@@ -1040,12 +1028,7 @@ static inline void I_ShutdownConsole(void){}
static
void
I_GetConsoleEvents
(
void
){}
static
void
I_GetConsoleEvents
(
void
){}
static
inline
void
I_StartupConsole
(
void
)
static
inline
void
I_StartupConsole
(
void
)
{
{
#ifdef _DEBUG
consolevent
=
!
M_CheckParm
(
"-noconsole"
);
consolevent
=
!
M_CheckParm
(
"-noconsole"
);
#else
consolevent
=
M_CheckParm
(
"-console"
);
#endif
framebuffer
=
M_CheckParm
(
"-framebuffer"
);
framebuffer
=
M_CheckParm
(
"-framebuffer"
);
if
(
framebuffer
)
if
(
framebuffer
)
...
...
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