Skip to content

Commit

Permalink
AVALANCHE: Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
wjp committed Nov 5, 2013
1 parent 1581ed2 commit 660381d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions engines/avalanche/avalanche.cpp
Expand Up @@ -57,7 +57,7 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
_sound = nullptr;

_platform = gd->desc.platform;
initVariables();
initVariables();
}

AvalancheEngine::~AvalancheEngine() {
Expand Down Expand Up @@ -357,7 +357,7 @@ bool AvalancheEngine::saveGame(const int16 slot, const Common::String &desc) {
f->writeSint16LE(t.tm_mday);
f->writeSint16LE(t.tm_mon);
f->writeSint16LE(t.tm_year);

_totalTime += getTimeInSeconds() - _startTime;

Common::Serializer sz(NULL, f);
Expand Down Expand Up @@ -479,11 +479,11 @@ Common::String AvalancheEngine::expandDate(int d, int m, int y) {

return day + ' ' + month + ' ' + intToStr(y + 1900);
}

uint32 AvalancheEngine::getTimeInSeconds() {
TimeDate time;
_system->getTimeAndDate(time);
return time.tm_hour * 3600 + time.tm_min * 60 + time.tm_sec;
TimeDate time;
_system->getTimeAndDate(time);
return time.tm_hour * 3600 + time.tm_min * 60 + time.tm_sec;
}

void AvalancheEngine::updateEvents() {
Expand Down
2 changes: 1 addition & 1 deletion engines/avalanche/avalanche.h
Expand Up @@ -268,7 +268,7 @@ class AvalancheEngine : public Engine {
// or at the begginning of the game, and _ablteToAddTimer must be modified in addTimer().
bool _isLoaded; // Is it a loaded gamestate?
bool _ableToAddTimer;

void callVerb(VerbCode id);
void loadRoom(byte num);
void thinkAbout(byte object, bool type); // Hey!!! Get it and put it!!!
Expand Down
2 changes: 1 addition & 1 deletion engines/avalanche/avalot.cpp
Expand Up @@ -1529,7 +1529,7 @@ void AvalancheEngine::newGame() {
_userMovesAvvy = false;
_doingSpriteRun = false;
_avvyInBed = true;

_ableToAddTimer = true; // Set to false in _vm->loadGame().
_isLoaded = false;

Expand Down
4 changes: 2 additions & 2 deletions engines/avalanche/parser.cpp
Expand Up @@ -605,8 +605,8 @@ Common::String Parser::totalTime() {

uint32 curTime = _vm->getTimeInSeconds() - _vm->_startTime;
if (_vm->_isLoaded)
curTime += _vm->_totalTime;
curTime += _vm->_totalTime;

h = (uint16)(curTime / 3600);
s = (uint16)(curTime % 3600);
m = s / 60;
Expand Down
2 changes: 1 addition & 1 deletion engines/avalanche/timer.cpp
Expand Up @@ -208,7 +208,7 @@ void Timer::updateTimer() {
}
}
}

_vm->_roomCycles++; // Cycles since you've been in this room.
}

Expand Down

0 comments on commit 660381d

Please sign in to comment.