← Back to branch summary

~widelands-dev/widelands/bug_1801340_loading_screen

« back to all changes in this revision

Viewing changes to src/wui/load_or_save_game.cc

Merged lp:~widelands-dev/widelands/bug-1798812-replay-savegame-type:
Fix bugs when loading a savegame saved from a replay

- Show replays in single player load screen
- Set win condition display name when loading a replay.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wui/load_or_save_game.cc
341
341
                        gamedata.gametype = gpdp.get_gametype();
342
342
 
343
343
                        if (filetype_ != FileType::kReplay) {
344
 
                                if (filetype_ == FileType::kGame) {
345
 
                                        if (gamedata.gametype == GameController::GameType::kReplay) {
346
 
                                                continue;
347
 
                                        }
348
 
                                } else if (filetype_ == FileType::kGameMultiPlayer) {
 
344
                                if (filetype_ == FileType::kGameMultiPlayer) {
349
345
                                        if (gamedata.gametype == GameController::GameType::kSingleplayer) {
350
346
                                                continue;
351
347
                                        }
352
 
                                } else if (gamedata.gametype > GameController::GameType::kSingleplayer) {
 
348
                                } else if ((gamedata.gametype != GameController::GameType::kSingleplayer) &&
 
349
                                           (gamedata.gametype != GameController::GameType::kReplay)) {
353
350
                                        continue;
354
351
                                }
355
352
                        }