X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=fab80e9e5ac4c29b7c07fc9422e0e27236ae2d80;hb=3de67c0db8c3c74f5fb487579936a07770d253a1;hp=e738a420552cbc58067ce48f98f1a32bda426ba4;hpb=3455f3a84eef6a73f39a4267da445c7998c3515e;p=lugaru.git diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index e738a42..fab80e9 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -692,8 +692,8 @@ void Game::Loadlevel(const std::string& name) damagedealt = 0; damagetaken = 0; - if (accountactive) - difficulty = accountactive->getDifficulty(); + if (Account::active) + difficulty = Account::active->getDifficulty(); Hotspot::hotspots.clear(); Hotspot::current = -1; @@ -6217,11 +6217,11 @@ void Game::TickOnceAfter() if (changedelay > 0 && !Person::players[0]->dead && !won) { //high scores, awards, win if (campaign) { - accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime); + Account::active->winCampaignLevel(whichchoice, bonustotal, leveltime); scoreadded = 1; } else { wonleveltime = leveltime; - accountactive->winLevel(whichlevel, bonustotal - startbonustotal, leveltime); + Account::active->winLevel(whichlevel, bonustotal - startbonustotal, leveltime); } won = 1; } @@ -6264,7 +6264,7 @@ void Game::TickOnceAfter() fireSound(firestartsound); - Loadlevel(campaignlevels[accountactive->getCampaignChoicesMade()].mapname.c_str()); + Loadlevel(campaignlevels[Account::active->getCampaignChoicesMade()].mapname.c_str()); fireSound();