aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.cpp
diff options
context:
space:
mode:
authorJoost Peters2003-04-29 20:13:00 +0000
committerJoost Peters2003-04-29 20:13:00 +0000
commit849178c46296791cf58bbfe6e4751a1624bd5059 (patch)
treed2eddba39d9a0b92b2f0227a007d91cdc4e94414 /sky/sky.cpp
parent89b808cb18143de3bd3280b93486b1fd6fe12cb8 (diff)
downloadscummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.tar.gz
scummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.tar.bz2
scummvm-rg350-849178c46296791cf58bbfe6e4751a1624bd5059.zip
made vars consistent
svn-id: r7204
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r--sky/sky.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 1f1d0e3924..762a7b5943 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -92,7 +92,7 @@ void SkyState::go() {
if (!isDemo(_gameVersion) || isCDVersion(_gameVersion))
intro();
- _grid->loadGrids();
+ _skyGrid->loadGrids();
while (1) {
delay(100);
_skyLogic->engine();
@@ -104,9 +104,9 @@ void SkyState::initialise(void) {
//initialise_memory();
initTimer();
- _sound = new SkySound(_mixer);
+ _skySound = new SkySound(_mixer);
_skyDisk = new SkyDisk(_gameDataPath);
- _music = new SkyMusic(_mixer, _skyDisk);
+ _skyMusic = new SkyMusic(_mixer, _skyDisk);
_gameVersion = _skyDisk->determineGameVersion();
_skyText = getSkyText();
@@ -116,8 +116,8 @@ void SkyState::initialise(void) {
initItemList();
//initScript();
//initialiseRouter();
- _grid = new SkyGrid(_skyDisk);
- _skyLogic = new SkyLogic(_skyDisk, _grid, _skyText);
+ _skyGrid = new SkyGrid(_skyDisk);
+ _skyLogic = new SkyLogic(_skyDisk, _skyGrid, _skyText);
}
void SkyState::initItemList() {