diff options
| author | Alexander Gavrilov | 2012-06-16 14:42:56 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-06-16 14:42:56 +0400 |
| commit | db91850464a98e785ff53cfdc5df46b10229cfdb (patch) | |
| tree | 4fb35eee9d316bc0dea2bcd305925539734add5a /library/modules | |
| parent | dc5bef2cb84cceb30179df750d986eecdef8b474 (diff) | |
| download | dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.gz dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.bz2 dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.xz | |
Sync to the change in gamemode/gametype globals.
Diffstat (limited to 'library/modules')
| -rw-r--r-- | library/modules/World.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/modules/World.cpp b/library/modules/World.cpp index 4b50b44c..393e7cbf 100644 --- a/library/modules/World.cpp +++ b/library/modules/World.cpp @@ -85,7 +85,7 @@ World::World() if(df::global::current_weather) d->StartedWeather = true; - if (df::global::game_mode && df::global::control_mode) + if (df::global::gamemode && df::global::gametype) d->StartedMode = true; d->Inited = true; @@ -132,8 +132,8 @@ bool World::ReadGameMode(t_gamemodes& rd) { if(d->Inited && d->StartedMode) { - rd.g_mode = (DFHack::GameMode)*df::global::control_mode; - rd.g_type = (DFHack::GameType)*df::global::game_mode; + rd.g_mode = (DFHack::GameMode)*df::global::gamemode; + rd.g_type = (DFHack::GameType)*df::global::gametype; return true; } return false; @@ -142,8 +142,8 @@ bool World::WriteGameMode(const t_gamemodes & wr) { if(d->Inited && d->StartedMode) { - *df::global::control_mode = wr.g_mode; - *df::global::game_mode = wr.g_type; + *df::global::gamemode = wr.g_mode; + *df::global::gametype = wr.g_type; return true; } return false; |
