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
Package registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vlad Doc
SRB2
Commits
47626b77
Commit
47626b77
authored
9 years ago
by
Yukita Mayako
Browse files
Options
Downloads
Patches
Plain Diff
Singleplayer spawns your player again now!
... but you can't control it.
parent
0f241a1f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/d_clisrv.c
+12
-3
12 additions, 3 deletions
src/d_clisrv.c
with
12 additions
and
3 deletions
src/d_clisrv.c
+
12
−
3
View file @
47626b77
...
@@ -473,6 +473,11 @@ static inline void CL_DrawConnectionStatus(void)
...
@@ -473,6 +473,11 @@ static inline void CL_DrawConnectionStatus(void)
// used only in arbitratrenetstart()
// used only in arbitratrenetstart()
static
boolean
CL_SendJoin
(
void
)
static
boolean
CL_SendJoin
(
void
)
{
{
if
(
server
)
{
nodewaiting
[
servernode
]
++
;
return
true
;
}
// NET TODO
// NET TODO
return
true
;
return
true
;
}
}
...
@@ -715,6 +720,9 @@ static void CL_ConnectToServer(boolean viams)
...
@@ -715,6 +720,9 @@ static void CL_ConnectToServer(boolean viams)
sprintf
(
tmpsave
,
"%s"
PATHSEP
TMPSAVENAME
,
srb2home
);
sprintf
(
tmpsave
,
"%s"
PATHSEP
TMPSAVENAME
,
srb2home
);
#endif
#endif
if
(
servernode
==
0
)
cl_mode
=
cl_askjoin
;
else
cl_mode
=
cl_searching
;
cl_mode
=
cl_searching
;
#ifdef CLIENT_LOADINGSCREEN
#ifdef CLIENT_LOADINGSCREEN
...
@@ -881,6 +889,7 @@ static void CL_ConnectToServer(boolean viams)
...
@@ -881,6 +889,7 @@ static void CL_ConnectToServer(boolean viams)
cl_mode
=
cl_askjoin
;
// don't break case continue to cljoin request now
cl_mode
=
cl_askjoin
;
// don't break case continue to cljoin request now
case
cl_askjoin
:
case
cl_askjoin
:
if
(
!
server
)
CL_LoadServerFiles
();
CL_LoadServerFiles
();
#ifdef JOININGAME
#ifdef JOININGAME
// prepare structures to save the file
// prepare structures to save the file
...
@@ -889,7 +898,7 @@ static void CL_ConnectToServer(boolean viams)
...
@@ -889,7 +898,7 @@ static void CL_ConnectToServer(boolean viams)
CL_PrepareDownloadSaveGame
(
tmpsave
);
CL_PrepareDownloadSaveGame
(
tmpsave
);
#endif
#endif
if
(
CL_SendJoin
())
if
(
CL_SendJoin
())
cl_mode
=
cl_waitjoinresponse
;
cl_mode
=
server
?
cl_connected
:
cl_waitjoinresponse
;
break
;
break
;
#ifdef JOININGAME
#ifdef JOININGAME
case
cl_downloadsavegame
:
case
cl_downloadsavegame
:
...
...
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