diff options
author | Andrey Nazarov <skuller@skuller.net> | 2013-01-22 17:56:55 +0400 |
---|---|---|
committer | Andrey Nazarov <skuller@skuller.net> | 2013-01-22 18:32:42 +0400 |
commit | a7025dc63a1dd341b475e6a99eaa30130335ebcb (patch) | |
tree | 90c0799bfee380a85a59c9a024ae04b76beab985 | |
parent | 1a1e47c7dd60ec97783abd7ef267c203c65ba39b (diff) |
Allow autosaves to load level files.
There may be a level file already present after player has returned to
the previous level. Allow autosave to load it.
-rw-r--r-- | src/server/save.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/server/save.c b/src/server/save.c index 847aa51..aa10176 100644 --- a/src/server/save.c +++ b/src/server/save.c @@ -327,9 +327,9 @@ static int read_server_file(void) MSG_ReadLong(); MSG_ReadLong(); if (MSG_ReadByte()) - cmd.loadgame = 2; + cmd.loadgame = 2; // autosave else - cmd.loadgame = 1; + cmd.loadgame = 1; // regular savegame MSG_ReadString(NULL, 0); // read the mapcmd @@ -526,12 +526,10 @@ void SV_CheckForSavegame(mapcmd_t *cmd) if (no_save_games()) return; - // autosave starts the map from the beginning - if (cmd->loadgame == 2) - return; - if (read_level_file()) { - if (cmd->loadgame) + // only warn when loading a regular savegame. autosave without level + // file is ok and simply starts the map from the beginning. + if (cmd->loadgame == 1) Com_EPrintf("Couldn't read level file.\n"); return; } |