reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-04 02:55:50 +03:00
Code Issues Projects Releases Wiki Activity

Fixed Host_Quit_Restart_f.

Browse Source
This commit is contained in:
Lev 2016-12-30 00:31:45 +05:00
parent 9c59407c9a
commit f28c4c4b4e
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rehlds/engine/host_cmd.cpp
View File

@ -498,25 +498,20 @@ void Host_Quit_Restart_f(void)
giActive = DLL_RESTART; giActive = DLL_RESTART;
giStateInfo = 4; giStateInfo = 4;
if (g_psv.active || (g_pcls.state == ca_active && g_pcls.trueaddress[0] && g_pPostRestartCmdLineArgs)) if (g_psv.active)
{
if (g_psvs.maxclients == 1 && g_pcls.state == ca_active && g_pPostRestartCmdLineArgs)
{
Cbuf_AddText("save quick\n");
Cbuf_Execute();
Q_strcat(g_pPostRestartCmdLineArgs, " +load quick");
}
}
else if (g_pcls.state == ca_active && g_pcls.trueaddress[0] && g_pPostRestartCmdLineArgs)
{ {
Q_strcat(g_pPostRestartCmdLineArgs, " +connect "); Q_strcat(g_pPostRestartCmdLineArgs, " +connect ");
Q_strcat(g_pPostRestartCmdLineArgs, g_pcls.servername); Q_strcat(g_pPostRestartCmdLineArgs, g_pcls.servername);
} }
else
{
if (g_psvs.maxclients == 1 && g_pcls.state == ca_active)
{
if (g_pPostRestartCmdLineArgs)
{
Cbuf_AddText("save quick\n");
Cbuf_Execute();
Q_strcat(g_pPostRestartCmdLineArgs, " +load quick");
}
}
}
} }
void Host_Status_Printf(qboolean conprint, qboolean log, char *fmt, ...) void Host_Status_Printf(qboolean conprint, qboolean log, char *fmt, ...)
@ -880,7 +875,7 @@ void Host_Map_f(void)
if (careerState == CAREER_LOADING) if (careerState == CAREER_LOADING)
g_careerState = CAREER_LOADING; g_careerState = CAREER_LOADING;
if (COM_CheckParm("-steam") && PF_IsDedicatedServer()) if (COM_CheckParm("-steam") && PF_IsDedicatedServer())
g_bMajorMapChange = TRUE; g_bMajorMapChange = TRUE;
FS_LogLevelLoadStarted("Map_Common"); FS_LogLevelLoadStarted("Map_Common");
@ -1373,7 +1368,7 @@ void Host_Savegame_f(void)
Con_DPrintf("Relative pathnames are not allowed.\n"); Con_DPrintf("Relative pathnames are not allowed.\n");
return; return;
} }
g_pSaveGameCommentFunc(szTemp, 80); g_pSaveGameCommentFunc(szTemp, 80);
Q_snprintf(szComment, sizeof(szComment) - 1,"%-64.64s %02d:%02d", szTemp, (int)(g_psv.time / 60.0), (int)fmod(g_psv.time, 60.0)); Q_snprintf(szComment, sizeof(szComment) - 1,"%-64.64s %02d:%02d", szTemp, (int)(g_psv.time / 60.0), (int)fmod(g_psv.time, 60.0));
SaveGameSlot(Cmd_Argv(1), szComment); SaveGameSlot(Cmd_Argv(1), szComment);
CL_HudMessage("GAMESAVED"); CL_HudMessage("GAMESAVED");
@ -1809,8 +1804,8 @@ SAVERESTOREDATA *LoadSaveData(const char *level)
pSaveData->vecLandmarkOffset[2] = 0.0f; pSaveData->vecLandmarkOffset[2] = 0.0f;
gGlobalVariables.pSaveData = pSaveData; gGlobalVariables.pSaveData = pSaveData;
FS_Read(pSaveData->pBaseData, size, 1, pFile); FS_Read(pSaveData->pBaseData, size, 1, pFile);
FS_Close(pFile); FS_Close(pFile);
return pSaveData; return pSaveData;
} }