aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/griffon/cutscenes.cpp2
-rw-r--r--engines/griffon/dialogs.cpp46
-rw-r--r--engines/griffon/draw.cpp2
-rw-r--r--engines/griffon/engine.cpp2
-rw-r--r--engines/griffon/griffon.h2
-rw-r--r--engines/griffon/saveload.cpp2
6 files changed, 28 insertions, 28 deletions
diff --git a/engines/griffon/cutscenes.cpp b/engines/griffon/cutscenes.cpp
index 6077e24876..c4612d4993 100644
--- a/engines/griffon/cutscenes.cpp
+++ b/engines/griffon/cutscenes.cpp
@@ -194,7 +194,7 @@ void GriffonEngine::intro() {
setChannelVolume(_musicChannel, 0);
}
- _secsingame = 0;
+ _secsInGame = 0;
_secStart = 0;
bool ldStop = false;
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index c5a4703085..4b0fbc682b 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -475,11 +475,11 @@ void GriffonEngine::saveLoadNew() {
int curRow = 0;
int curCol = 0;
- bool lowerlock = false;
+ bool lowerLock = false;
_ticks = g_system->getMillis();
int ticks1 = _ticks;
- int tickpause = _ticks + 150;
+ int tickPause = _ticks + 150;
_cloudImg->setAlpha(128, true);
@@ -582,7 +582,7 @@ void GriffonEngine::saveLoadNew() {
return;
}
- if (tickpause < _ticks && _event.type == Common::EVENT_KEYDOWN) {
+ if (tickPause < _ticks && _event.type == Common::EVENT_KEYDOWN) {
_itemTicks = _ticks + 220;
if (_event.kbd.keycode == Common::KEYCODE_RETURN) {
@@ -595,14 +595,14 @@ void GriffonEngine::saveLoadNew() {
return;
} else if (curCol == 1) {
// SAVE GAME
- lowerlock = true;
+ lowerLock = true;
curRow = 1 + _saveSlot;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
} else if (curCol == 2) {
// LOAD GAME
- lowerlock = true;
+ lowerLock = true;
curRow = 1;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
} else if (curCol == 3) {
// RETURN
return;
@@ -612,11 +612,11 @@ void GriffonEngine::saveLoadNew() {
return;
}
}
- if (lowerlock && tickpause < _ticks) {
+ if (lowerLock && tickPause < _ticks) {
if ((curCol == 1) && saveState(curRow - 1)) {
- _secStart += _secsingame;
- _secsingame = 0;
- lowerlock = false;
+ _secStart += _secsInGame;
+ _secsInGame = 0;
+ lowerLock = false;
_saveSlot = curRow - 1;
curRow = 0;
} else if ((curCol == 2) && loadState(curRow - 1)) {
@@ -630,12 +630,12 @@ void GriffonEngine::saveLoadNew() {
haltSoundChannel(-1);
- _secsingame = 0;
+ _secsInGame = 0;
_saveSlot = curRow - 1;
loadMap(_curMap);
mainLoop();
}
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
}
}
@@ -643,43 +643,43 @@ void GriffonEngine::saveLoadNew() {
case Common::KEYCODE_ESCAPE:
if (curRow == 0)
return;
- lowerlock = false;
+ lowerLock = false;
curRow = 0;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
break;
case Common::KEYCODE_DOWN:
- if (lowerlock) {
+ if (lowerLock) {
++curRow;
if (curRow == 5)
curRow = 1;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
}
break;
case Common::KEYCODE_UP:
- if (lowerlock) {
+ if (lowerLock) {
--curRow;
if (curRow == 0)
curRow = 4;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
}
break;
case Common::KEYCODE_LEFT:
- if (!lowerlock) {
+ if (!lowerLock) {
--curCol;
if (curCol == -1)
curCol = 3;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
}
break;
case Common::KEYCODE_RIGHT:
- if (!lowerlock) {
+ if (!lowerLock) {
++curCol;
if (curCol == 4)
curCol = 0;
- tickpause = _ticks + 125;
+ tickPause = _ticks + 125;
}
break;
default:
diff --git a/engines/griffon/draw.cpp b/engines/griffon/draw.cpp
index 30e32c331b..0e6b3488dd 100644
--- a/engines/griffon/draw.cpp
+++ b/engines/griffon/draw.cpp
@@ -329,7 +329,7 @@ void GriffonEngine::drawHud() {
ABS(_player.spellStrength - 100) < kEpsilon ? RGB(224, 0, 0) : RGB(128, 0, 224));
// time
- int ase = _secStart + _secsingame;
+ int ase = _secStart + _secsInGame;
int h = ((ase - (ase % 3600)) / 3600);
ase -= h * 3600;
int m = ((ase - (ase % 60)) / 60);
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index 6dfb422b6e..8c0b511490 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -122,7 +122,7 @@ void GriffonEngine::updateEngine() {
_nextTicks = _ticks + 1000;
_fps = _fp;
_fp = 0;
- _secsingame = _secsingame + 1;
+ _secsInGame = _secsInGame + 1;
}
if (_attacking) {
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index ab70030090..f202437581 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -451,7 +451,7 @@ private:
// timer related - move to local later
int _ticks, _ticksPassed, _nextTicks;
float _fp, _fps, _fpsr; // CHECKME: _fp and _fps seems to be integers
- int _secsingame, _secStart;
+ int _secsInGame, _secStart;
Graphics::TransparentSurface *mapImg[4];
diff --git a/engines/griffon/saveload.cpp b/engines/griffon/saveload.cpp
index 42abff0c56..7285e21fb5 100644
--- a/engines/griffon/saveload.cpp
+++ b/engines/griffon/saveload.cpp
@@ -194,7 +194,7 @@ int GriffonEngine::saveState(int slotnum) {
PRINT("%i", _player.level);
if (_player.level > 0) {
- PRINT("%i", (_secStart + _secsingame));
+ PRINT("%i", (_secStart + _secsInGame));
PRINT("%s", "a");
PRINT("%f", _player.px);