~widelands-dev/widelands/flag_unfreezer

Committer: Wideland's Bunnybot
Date: 2018-10-26 07:09:29 UTC
mfrom: (8895.1.3 bug-1798812-replay-savegame-type)
Revision ID: bunnybot@widelands.org-20181026070929-gucz16jqo9iah6yh

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.

files modified:
data/i18n/locales.lua

data/txts/translators_data.lua

src/logic/game.cc

src/logic/game.h

src/logic/replay.cc

src/wui/game_main_menu_save_game.cc

src/wui/load_or_save_game.cc

src/wui/load_or_save_game.h

Show diffs side-by-side

added added

removed removed

src/logic/replay.cc

#include "base/md5.h"

#include "base/wexception.h"

#include "game_io/game_loader.h"

#include "game_io/game_preload_packet.h"

#include "io/filesystem/layered_filesystem.h"

#include "io/streamread.h"

#include "io/streamwrite.h"

{

GameLoader gl(filename + kSavegameExtension, game);

Widelands::GamePreloadPacket gpdp;

gl.preload_game(gpdp);

game.set_win_condition_displayname(gpdp.get_win_condition());

gl.load_game();

}

Older »