Skip to content
Snippets Groups Projects
Commit 47626b77 authored by Yukita Mayako's avatar Yukita Mayako
Browse files

Singleplayer spawns your player again now!

... but you can't control it.
parent 0f241a1f
Branches
No related tags found
No related merge requests found
...@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment