made vars consistent

svn-id: r7204

4 files changed, 15 insertions, 15 deletions

diff --git a/sky/cd_intro.cpp b/sky/cd_intro.cpp
index a5901f469b..7f94afb936 100644
--- a/sky/cd_intro.cpp
+++ b/sky/cd_intro.cpp
@@ -190,11 +190,11 @@
 #define cd_104	60097
 #define cd_105	60098
 
-#define START_VOICE	( delay(200), _sound->playVoice(vocBuffer, loadedVocSize) )
-#define START_BG	( _sound->playBgSound(bgVocBuffer, bgVocSize) )
+#define START_VOICE	( delay(200), _skySound->playVoice(vocBuffer, loadedVocSize) )
+#define START_BG	( _skySound->playBgSound(bgVocBuffer, bgVocSize) )
 #define LOAD_NEW_VOICE(num)	( free (vocBuffer), vocBuffer = _skyDisk->loadFile(num, NULL), loadedVocSize = _skyDisk->_lastLoadedFileSize ) 
 #define LOAD_NEW_BG(num)	( free (bgVocBuffer), bgVocBuffer = _skyDisk->loadFile(num, NULL), bgVocSize = _skyDisk->_lastLoadedFileSize )
-#define WAIT_VOICE	while (_sound->_voiceHandle != 0) { delay(50); }
+#define WAIT_VOICE	while (_skySound->_voiceHandle != 0) { delay(50); }
 #define WAIT_SEQUENCE	while (_tseqFrames != 0) { delay(50); }
 #define WAIT_RELATIVE(x)	( delay(20 * (x)) )
 #define COPY_SCREEN	( memcpy(_workScreen, workScreen2, GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT) )
@@ -822,7 +822,7 @@ void SkyState::doCDIntro() {
 	cd2_seq_data_1 = _skyDisk->loadFile(cd_104, NULL);
 	WAIT_SEQUENCE; //103
 
-	_music->startMusic(2);
+	_skyMusic->startMusic(2);
 	fnFadeDown(0);
 	COPY_SCREEN;
 	showScreen();
diff --git a/sky/intro.cpp b/sky/intro.cpp
index 5e2ef9e24f..b11c0aa5c9 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -206,12 +206,12 @@ void SkyState::intro(void) {
 	_workScreen = _skyDisk->loadFile(60112, NULL); //while virgin screen is up, load rev screen
 	_tempPal = _skyDisk->loadFile(60113, NULL);
 
-	_music->loadSectionMusic(0);
+	_skyMusic->loadSectionMusic(0);
 	
 	delay(3000); //keep virgin screen up for 3 seconds
 
 	if (!isCDVersion(_gameVersion))
-		_music->startMusic(1);
+		_skyMusic->startMusic(1);
 	
 	delay(3000); //and another 3 seconds.
 	fnFadeDown(0); //remove virgin screen
@@ -379,7 +379,7 @@ void SkyState::intro(void) {
 		fnFadeDown(0);
 		showScreen();
 
-		_music->startMusic(2);
+		_skyMusic->startMusic(2);
 		paletteFadeUp(_tempPal);
 
 		startTimerSequence(seq6aData);
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() {
diff --git a/sky/sky.h b/sky/sky.h
index bb31015f05..559476a412 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -82,12 +82,12 @@ protected:
 
 	int _sdl_mouse_x, _sdl_mouse_y;
 
-	SkySound *_sound;
+	SkySound *_skySound;
 	SkyDisk *_skyDisk;
 	SkyText *_skyText;
-	SkyGrid *_grid;
+	SkyGrid *_skyGrid;
 	SkyLogic *_skyLogic;
-	SkyMusic *_music;
+	SkyMusic *_skyMusic;
 	
 	byte *_workScreen;
 	byte *_backScreen;