upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 23:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

only check [snapshot] for [variables] if we're not loading a replay

Browse Source
This commit is contained in:
Gunter Labes 2009-10-20 17:57:47 +00:00
parent f1fec73934
commit 138a3baf27
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gamestatus.cpp
View File

@ -252,11 +252,10 @@ game_state::game_state(const config& cfg, bool show_replay) :
const config &snapshot = cfg.child("snapshot");
const config &replay_start = cfg.child("replay_start");
// We're loading a snapshot if we have it and the user didn't request a replay.
bool load_snapshot = !show_replay && snapshot && !snapshot.empty();
// We have to load era id for MP games so they can load correct era.
if (snapshot && !snapshot.empty() && !show_replay) {
if (load_snapshot) {
this->snapshot = snapshot;
rng_.seed_random(lexical_cast_default<unsigned>(snapshot["random_calls"]));
@ -269,8 +268,12 @@ game_state::game_state(const config& cfg, bool show_replay) :
//priority of populating wml variables:
//snapshot -> replay_start -> root
if (const config &vars = snapshot.child("variables")) {
set_variables(vars);
if (load_snapshot) {
if (const config &vars = snapshot.child("variables")) {
set_variables(vars);
} else if (const config &vars = cfg.child("variables")) {
set_variables(vars);
}
}
else if (const config &vars = replay_start.child("variables")) {
set_variables(vars);