CGE: Rename cave into scene

8 files changed, 138 insertions, 158 deletions

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index ef2796b169..11c722d32b 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -38,7 +38,7 @@
 
 namespace CGE {
 
-const int CGEEngine::_maxCaveArr[5] = {1, 8, 16, 23, 24};
+const int CGEEngine::_maxSceneArr[5] = {1, 8, 16, 23, 24};
 
 CGEEngine::CGEEngine(OSystem *syst, const ADGameDescription *gameDescription)
 	: Engine(syst), _gameDescription(gameDescription), _randomSource("cge") {
@@ -55,13 +55,13 @@ CGEEngine::CGEEngine(OSystem *syst, const ADGameDescription *gameDescription)
 
 }
 
-void CGEEngine::initCaveValues() {
-	for (int i = 0; i < kCaveMax; i++) {
+void CGEEngine::initSceneValues() {
+	for (int i = 0; i < kSceneMax; i++) {
 		_heroXY[i].x = 0;
 		_heroXY[i].y = 0;
 	}
 
-	for (int i = 0; i < kCaveMax + 1; i++) {
+	for (int i = 0; i < kSceneMax + 1; i++) {
 		_barriers[i]._horz = 0xFF;
 		_barriers[i]._vert = 0xFF;
 	}
@@ -75,7 +75,7 @@ void CGEEngine::init() {
 	_lastTick = 0;
 	_hero = NULL;
 	_shadow = NULL;
-	_miniCave = NULL;
+	_miniScene = NULL;
 	_miniShp = NULL;
 	_miniShpList = NULL;
 	_sprite = NULL;
@@ -98,7 +98,7 @@ void CGEEngine::init() {
 		_pocket[i] = NULL;
 	_horzLine = new HorizLine(this);
 	_infoLine = new InfoLine(this, kInfoW);
-	_cavLight = new CavLight(this);
+	_sceneLight = new SceneLight(this);
 	_debugLine = new InfoLine(this, kScrWidth);
 	_snail = new Snail(this, false);
 	_snail_ = new Snail(this, true);
@@ -117,9 +117,9 @@ void CGEEngine::init() {
 	_volume[0] = 0;
 	_volume[1] = 0;
 
-	initCaveValues();
+	initSceneValues();
 
-	_maxCave    =  0;
+	_maxScene   =  0;
 	_dark       = false;
 	_game       = false;
 	_finis      = false;
@@ -155,11 +155,11 @@ void CGEEngine::deinit() {
 	delete _vga;
 	delete _sys;
 	delete _sprite;
-	delete _miniCave;
+	delete _miniScene;
 	delete _shadow;
 	delete _horzLine;
 	delete _infoLine;
-	delete _cavLight;
+	delete _sceneLight;
 	delete _debugLine;
 	delete _text;
 	delete _pocLight;
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index f10ce6ecd9..c65c780f6e 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -52,11 +52,11 @@ class Sprite;
 #define kPocketNY   1
 #define kPocketSX   8
 #define kPocketSY   3
-#define kCaveDx     9
-#define kCaveDy     10
-#define kCaveNx     8
-#define kCaveNy     3
-#define kCaveMax    kCaveNx * kCaveNy
+#define kSceneDx    9
+#define kSceneDy    10
+#define kSceneNx    8
+#define kSceneNy    3
+#define kSceneMax   kSceneNx * kSceneNy
 
 
 // our engine debug channels
@@ -71,7 +71,7 @@ enum SnList {
 };
 
 enum CallbackType {
-	kNullCB = 0, kQGame, kMiniStep, kXCave, kSndSetVolume
+	kNullCB = 0, kQGame, kMiniStep, kXScene, kSndSetVolume
 };
 
 struct SavegameHeader {
@@ -108,7 +108,7 @@ public:
 	virtual Common::Error loadGameState(int slot);
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
 
-	static const int _maxCaveArr[5];
+	static const int _maxSceneArr[5];
 
 	const   ADGameDescription *_gameDescription;
 	int    _startupMode;
@@ -118,7 +118,7 @@ public:
 	bool   _music;
 	int    _pocref[kPocketNX];
 	uint8  _volume[2];
-	int    _maxCave;
+	int    _maxScene;
 	bool   _flag[4];
 	bool   _dark;
 	bool   _game;
@@ -135,8 +135,8 @@ public:
 	Sprite *_sprK2;
 	Sprite *_sprK3;
 
-	Common::Point _heroXY[kCaveMax];
-	Bar _barriers[kCaveMax];
+	Common::Point _heroXY[kSceneMax];
+	Bar _barriers[kSceneMax];
 
 	Common::RandomSource _randomSource;
 	MusicPlayer _midiPlayer;
@@ -150,7 +150,7 @@ public:
 	}
 
 	void cge_main();
-	void switchCave(int cav);
+	void switchScene(int newScene);
 	void startCountDown();
 	void quit();
 	void resetQSwitch();
@@ -159,7 +159,7 @@ public:
 	bool loadGame(int slotNumber, SavegameHeader *header = NULL, bool tiny = false);
 	void setMapBrick(int x, int z);
 	void switchMapping();
-	void loadSprite(const char *fname, int ref, int cav, int col, int row, int pos);
+	void loadSprite(const char *fname, int ref, int scene, int col, int row, int pos);
 	void loadScript(const char *fname);
 	void loadUser();
 	void runGame();
@@ -170,9 +170,9 @@ public:
 	void dummy() {}
 	void NONE();
 	void SB();
-	void caveDown();
-	void caveUp();
-	void xCave();
+	void sceneDown();
+	void sceneUp();
+	void xScene();
 	void qGame();
 	void SBM();
 	void GUS();
@@ -208,11 +208,11 @@ public:
 	void miniStep(int stp);
 	void postMiniStep(int stp);
 	void showBak(int ref);
-	void initCaveValues();
+	void initSceneValues();
 
 	void snBackPt(Sprite *spr, int stp);
-	void snHBarrier(const int cave, const int barX);
-	void snVBarrier(const int cave, const int barY);
+	void snHBarrier(const int scene, const int barX);
+	void snVBarrier(const int scene, const int barY);
 	void snCover(Sprite *spr, int xref);
 	void snFlag(int indx, bool v);
 	void snFlash(bool on);
@@ -240,10 +240,10 @@ public:
 	void snSeq(Sprite *spr, int val);
 	void snSetRef(Sprite *spr, int nr);
 	void snSetX(Sprite *spr, int x);
-	void snSetX0(int cav, int x0);
+	void snSetX0(int scene, int x0);
 	void snSetXY(Sprite *spr, uint16 xy);
 	void snSetY(Sprite *spr, int y);
-	void snSetY0(int cav, int y0);
+	void snSetY0(int scene, int y0);
 	void snSetZ(Sprite *spr, int z);
 	void snSlave(Sprite *spr, int ref);
 	void snSound(Sprite *spr, int wav);
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index c0a05c0eba..ee6fb2a951 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -60,11 +60,11 @@ Keyboard *_keyboard;
 Mouse *_mouse;
 Sprite *_pocket[kPocketNX];
 Sprite *_sprite;
-Sprite *_miniCave;
+Sprite *_miniScene;
 Sprite *_shadow;
 HorizLine *_horzLine;
 InfoLine *_infoLine;
-Sprite *_cavLight;
+SceneLight *_sceneLight;
 InfoLine *_debugLine;
 
 Snail *_snail;
@@ -74,14 +74,6 @@ Fx *_fx;
 Sound *_sound;
 ResourceManager *_resman;
 
-// 0.75 - 17II95  - full sound support
-// 0.76 - 18II95  - small MiniEMS in DEMO,
-//		    unhide CavLight in SNLEVEL
-//		    keyclick suppress in startup
-//		    keyclick on key service in: SYSTEM, GET_TEXT
-// 1.01 - 17VII95 - default savegame with sound ON
-//		    coditionals EVA for 2-month evaluation version
-
 const char *savegameStr = "SCUMMVM_CGE";
 
 //--------------------------------------------------------------------------
@@ -164,15 +156,15 @@ void CGEEngine::syncHeader(Common::Serializer &s) {
 		s.syncAsUint16LE(_flag[i]);
 
 	if (s.isLoading()) {
-		// Reset cave values
-		initCaveValues();
+		// Reset scene values
+		initSceneValues();
 	}
 
-	for (i = 0; i < kCaveMax; i++) {
+	for (i = 0; i < kSceneMax; i++) {
 		s.syncAsSint16LE(_heroXY[i].x);
 		s.syncAsUint16LE(_heroXY[i].y);
 	}
-	for (i = 0; i < 1 + kCaveMax; i++) {
+	for (i = 0; i < 1 + kSceneMax; i++) {
 		s.syncAsByte(_barriers[i]._horz);
 		s.syncAsByte(_barriers[i]._vert);
 	}
@@ -276,15 +268,15 @@ Common::String CGEEngine::generateSaveName(int slot) {
 
 Common::Error CGEEngine::loadGameState(int slot) {
 	// Clear current game activity
-	caveDown();
+	sceneDown();
 	resetGame();
 
 	// Load the game
 	loadGame(slot, NULL);
-	_snail->addCom(kSnLevel, -1, _oldLev, &_cavLight);
-	_cavLight->gotoxy(kCaveX + ((_now - 1) % kCaveNx) * kCaveDx + kCaveSX,
-	                  kCaveY + ((_now - 1) / kCaveNx) * kCaveDy + kCaveSY);
-	caveUp();
+	_snail->addCom(kSnLevel, -1, _oldLev, &_sceneLight);
+	_sceneLight->gotoxy(kSceneX + ((_now - 1) % kSceneNx) * kSceneDx + kSceneSX,
+	                  kSceneY + ((_now - 1) / kSceneNx) * kSceneDy + kSceneSY);
+	sceneUp();
 
 	return Common::kNoError;
 }
@@ -294,14 +286,14 @@ void CGEEngine::resetGame() {
 }
 
 Common::Error CGEEngine::saveGameState(int slot, const Common::String &desc) {
-	caveDown();
+	sceneDown();
 	_oldLev = _lev;
 
 	// Write out the user's progress
 	saveGame(slot, desc);
 
 	// Reload the scene
-	caveUp();
+	sceneUp();
 
 	return Common::kNoError;
 }
@@ -476,7 +468,7 @@ void CGEEngine::loadHeroXY() {
 
 	memset(_heroXY, 0, sizeof(_heroXY));
 	if (!cf.err()) {
-		for (int i = 0; i < kCaveMax; ++i) {
+		for (int i = 0; i < kSceneMax; ++i) {
 			cf.read((byte *)&x, 2);
 			cf.read((byte *)&y, 2);
 
@@ -489,7 +481,7 @@ void CGEEngine::loadHeroXY() {
 void CGEEngine::loadMapping() {
 	debugC(1, kCGEDebugEngine, "CGEEngine::loadMapping()");
 
-	if (_now <= kCaveMax) {
+	if (_now <= kSceneMax) {
 		EncryptedStream cf("CGE.TAB");
 		if (!cf.err()) {
 			// Move to the data for the given room
@@ -575,17 +567,17 @@ void CGEEngine::miniStep(int stp) {
 	debugC(1, kCGEDebugEngine, "CGEEngine::miniStep(%d)", stp);
 
 	if (stp < 0) {
-		_miniCave->_flags._hide = true;
+		_miniScene->_flags._hide = true;
 	} else {
 		*_miniShp[0] = *_miniShpList[stp];
-		_miniCave->_flags._hide = false;
+		_miniScene->_flags._hide = false;
 	}
 }
 
 void CGEEngine::postMiniStep(int step) {
 	debugC(6, kCGEDebugEngine, "CGEEngine::postMiniStep(%d)", step);
 
-	if (_miniCave && step != _recentStep)
+	if (_miniScene && step != _recentStep)
 		_snail_->addCom2(kSnExec, -1, _recentStep = step, kMiniStep);
 }
 
@@ -605,8 +597,8 @@ void CGEEngine::showBak(int ref) {
 	spr->contract();
 }
 
-void CGEEngine::caveUp() {
-	debugC(1, kCGEDebugEngine, "CGEEngine::caveUp()");
+void CGEEngine::sceneUp() {
+	debugC(1, kCGEDebugEngine, "CGEEngine::sceneUp()");
 
 	const int BakRef = 1000 * _now;
 	if (_music)
@@ -617,7 +609,7 @@ void CGEEngine::caveUp() {
 	Sprite *spr = _vga->_spareQ->first();
 	while (spr) {
 		Sprite *n = spr->_next;
-		if (spr->_cave == _now || spr->_cave == 0)
+		if (spr->_scene == _now || spr->_scene == 0)
 			if (spr->_ref != BakRef) {
 				if (spr->_flags._back)
 					spr->backShow();
@@ -664,15 +656,15 @@ void CGEEngine::caveUp() {
 		_mouse->on();
 }
 
-void CGEEngine::caveDown() {
-	debugC(1, kCGEDebugEngine, "CGEEngine::caveDown()");
+void CGEEngine::sceneDown() {
+	debugC(1, kCGEDebugEngine, "CGEEngine::sceneDown()");
 
 	if (_horzLine && !_horzLine->_flags._hide)
 		switchMapping();
 
 	for (Sprite *spr = _vga->_showQ->first(); spr;) {
 		Sprite *n = spr->_next;
-		if (spr->_ref >= 1000 /*&& spr->_cave*/) {
+		if (spr->_ref >= 1000 /*&& spr->_scene*/) {
 			if (spr->_ref % 1000 == 999)
 				feedSnail(spr, kTake);
 			_vga->_spareQ->append(_vga->_showQ->remove(spr));
@@ -681,17 +673,17 @@ void CGEEngine::caveDown() {
 	}
 }
 
-void CGEEngine::xCave() {
-	debugC(6, kCGEDebugEngine, "CGEEngine::xCave()");
+void CGEEngine::xScene() {
+	debugC(6, kCGEDebugEngine, "CGEEngine::xScene()");
 
-	caveDown();
-	caveUp();
+	sceneDown();
+	sceneUp();
 }
 
 void CGEEngine::qGame() {
 	debugC(1, kCGEDebugEngine, "CGEEngine::qGame()");
 
-	caveDown();
+	sceneDown();
 	_oldLev = _lev;
 
 	// Write out the user's progress
@@ -701,30 +693,30 @@ void CGEEngine::qGame() {
 	_finis = true;
 }
 
-void CGEEngine::switchCave(int cav) {
-	debugC(1, kCGEDebugEngine, "CGEEngine::switchCave(%d)", cav);
+void CGEEngine::switchScene(int newScene) {
+	debugC(1, kCGEDebugEngine, "CGEEngine::switchScene(%d)", newScene);
 
-	if (cav == _now)
+	if (newScene == _now)
 		return;
 
-	if (cav < 0) {
+	if (newScene < 0) {
 		_snail->addCom(kSnLabel, -1, 0, NULL);  // wait for repaint
-		_snail->addCom2(kSnExec,  -1, 0, kQGame); // switch cave
+		_snail->addCom2(kSnExec,  -1, 0, kQGame); // switch scene
 	} else {
-		_now = cav;
+		_now = newScene;
 		_mouse->off();
 		if (_hero) {
 			_hero->park();
 			_hero->step(0);
 			_vga->_spareQ->_show = 0;
 		}
-		_cavLight->gotoxy(kCaveX + ((_now - 1) % kCaveNx) * kCaveDx + kCaveSX,
-		                  kCaveY + ((_now - 1) / kCaveNx) * kCaveDy + kCaveSY);
+		_sceneLight->gotoxy(kSceneX + ((_now - 1) % kSceneNx) * kSceneDx + kSceneSX,
+		                  kSceneY + ((_now - 1) / kSceneNx) * kSceneDy + kSceneSY);
 		killText();
 		if (!_startupMode)
 			keyClick();
 		_snail->addCom(kSnLabel, -1, 0, NULL);  // wait for repaint
-		_snail->addCom2(kSnExec,   0, 0, kXCave); // switch cave
+		_snail->addCom2(kSnExec,  0, 0, kXScene); // switch scene
 	}
 }
 
@@ -778,17 +770,17 @@ void System::touch(uint16 mask, int x, int y) {
 	} else {
 		if (_vm->_startupMode)
 			return;
-		int cav = 0;
+		int selectedScene = 0;
 		_infoLine->update(NULL);
 		if (y >= kWorldHeight ) {
-			if (x < kButtonX) {                           // select cave?
-				if (y >= kCaveY && y < kCaveY + kCaveNy * kCaveDy &&
-				    x >= kCaveX && x < kCaveX + kCaveNx * kCaveDx && !_vm->_game) {
-					cav = ((y - kCaveY) / kCaveDy) * kCaveNx + (x - kCaveX) / kCaveDx + 1;
-					if (cav > _vm->_maxCave)
-						cav = 0;
+			if (x < kButtonX) {                           // select scene?
+				if (y >= kSceneY && y < kSceneY + kSceneNy * kSceneDy &&
+				    x >= kSceneX && x < kSceneX + kSceneNx * kSceneDx && !_vm->_game) {
+					selectedScene = ((y - kSceneY) / kSceneDy) * kSceneNx + (x - kSceneX) / kSceneDx + 1;
+					if (selectedScene > _vm->_maxScene)
+						selectedScene = 0;
 				} else {
-					cav = 0;
+					selectedScene = 0;
 				}
 			} else if (mask & kMouseLeftUp) {
 				if (y >= kPocketY && y < kPocketY + kPocketNY * kPocketDY &&
@@ -799,11 +791,11 @@ void System::touch(uint16 mask, int x, int y) {
 			}
 		}
 
-		_vm->postMiniStep(cav - 1);
+		_vm->postMiniStep(selectedScene - 1);
 
 		if (mask & kMouseLeftUp) {
-			if (cav && _snail->idle() && _hero->_tracePtr < 0)
-				_vm->switchCave(cav);
+			if (selectedScene && _snail->idle() && _hero->_tracePtr < 0)
+				_vm->switchScene(selectedScene);
 
 			if (_horzLine && !_horzLine->_flags._hide) {
 				if (y >= kMapTop && y < kMapTop + kMapHig) {
@@ -870,8 +862,7 @@ void CGEEngine::switchMusic() {
 void CGEEngine::startCountDown() {
 	debugC(1, kCGEDebugEngine, "CGEEngine::startCountDown()");
 
-	//SNPOST(SNSEQ, 123, 0, NULL);
-	switchCave(-1);
+	switchScene(-1);
 }
 
 void CGEEngine::switchMapping() {
@@ -1002,7 +993,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
 	}
 }
 
-void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int row = 0, int pos = 0) {
+void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, int row = 0, int pos = 0) {
 	static const char *Comd[] = { "Name", "Type", "Phase", "East",
 	                              "Left", "Right", "Top", "Bottom",
 	                              "Seq", "Near", "Take",
@@ -1110,7 +1101,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int
 
 	if (_sprite) {
 		_sprite->_ref = ref;
-		_sprite->_cave = cav;
+		_sprite->_scene = scene;
 		_sprite->_z = pos;
 		_sprite->_flags._east = east;
 		_sprite->_flags._port = port;
@@ -1161,7 +1152,7 @@ void CGEEngine::loadScript(const char *fname) {
 		if ((SpN = strtok(NULL, " ,;/\t\n")) == NULL)
 			break;
 
-		// sprite cave
+		// sprite scene
 		if ((p = strtok(NULL, " ,;/\t\n")) == NULL)
 			break;
 		int SpA = atoi(p);
@@ -1267,9 +1258,9 @@ void CGEEngine::runGame() {
 
 	loadHeroXY();
 
-	_cavLight->_flags._tran = true;
-	_vga->_showQ->append(_cavLight);
-	_cavLight->_flags._hide = true;
+	_sceneLight->_flags._tran = true;
+	_vga->_showQ->append(_sceneLight);
+	_sceneLight->_flags._hide = true;
 
 	const Seq pocSeq[] = {
 		{ 0, 0, 0, 0, 20 },
@@ -1309,12 +1300,12 @@ void CGEEngine::runGame() {
 		_miniShp[0] = _miniShp[1] = NULL;
 
 		loadSprite("MINI", -1, 0, kMiniX, kMiniY);
-		expandSprite(_miniCave = _sprite);  // NULL is ok
-		if (_miniCave) {
-			_miniCave->_flags._kill = false;
-			_miniCave->_flags._hide = true;
-			_miniShp[0] = new Bitmap(*_miniCave->shp());
-			_miniShpList = _miniCave->setShapeList(_miniShp);
+		expandSprite(_miniScene = _sprite);  // NULL is ok
+		if (_miniScene) {
+			_miniScene->_flags._kill = false;
+			_miniScene->_flags._hide = true;
+			_miniShp[0] = new Bitmap(*_miniScene->shp());
+			_miniShpList = _miniScene->setShapeList(_miniShp);
 			postMiniStep(-1);
 		}
 	}
@@ -1355,10 +1346,10 @@ void CGEEngine::runGame() {
 
 	_startupMode = 0;
 
-	_snail->addCom(kSnLevel, -1, _oldLev, &_cavLight);
-	_cavLight->gotoxy(kCaveX + ((_now - 1) % kCaveNx) * kCaveDx + kCaveSX,
-	                  kCaveY + ((_now - 1) / kCaveNx) * kCaveDy + kCaveSY);
-	caveUp();
+	_snail->addCom(kSnLevel, -1, _oldLev, &_sceneLight);
+	_sceneLight->gotoxy(kSceneX + ((_now - 1) % kSceneNx) * kSceneDx + kSceneSX,
+	                  kSceneY + ((_now - 1) / kSceneNx) * kSceneDy + kSceneSY);
+	sceneUp();
 
 	_keyboard->setClient(_sys);
 	// main loop
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 54258c7ab9..2f0e88b9df 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -34,10 +34,10 @@
 
 namespace CGE {
 
-#define kCaveX         4
-#define kCaveY         166
-#define kCaveSX        0
-#define kCaveSY        0
+#define kSceneX        4
+#define kSceneY        166
+#define kSceneSX       0
+#define kSceneSY       0
 #define kInfoX         177
 #define kInfoY         164
 #define kInfoW         140
@@ -121,11 +121,11 @@ extern Mouse *_mouse;
 extern EventManager *_eventManager;
 extern Sprite *_pocket[];
 extern Sprite *_sprite;
-extern Sprite *_miniCave;
+extern Sprite *_miniScene;
 extern Sprite *_shadow;
 extern HorizLine *_horzLine;
 extern InfoLine *_infoLine;
-extern Sprite *_cavLight;
+extern SceneLight *_sceneLight;
 extern InfoLine *_debugLine;
 extern Snail *_snail;
 extern Snail *_snail_;
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index e99fa7ae21..5d7ba502d1 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -549,10 +549,10 @@ void CGEEngine::snSend(Sprite *spr, int val) {
 	if (!spr)
 		return;
 
-	int was = spr->_cave;
+	int was = spr->_scene;
 	bool was1 = (was == 0 || was == _now);
 	bool val1 = (val == 0 || val == _now);
-	spr->_cave = val;
+	spr->_scene = val;
 	if (val1 != was1) {
 		if (was1) {
 			if (spr->_flags._kept) {
@@ -582,12 +582,12 @@ void CGEEngine::snSwap(Sprite *spr, int xref) {
 	if (!spr || !xspr)
 		return;
 
-	int was = spr->_cave;
-	int xwas = xspr->_cave;
+	int was = spr->_scene;
+	int xwas = xspr->_scene;
 	bool was1 = (was == 0 || was == _now);
 	bool xwas1 = (xwas == 0 || xwas == _now);
 
-	SWAP(spr->_cave, xspr->_cave);
+	SWAP(spr->_scene, xspr->_scene);
 	SWAP(spr->_x, xspr->_x);
 	SWAP(spr->_y, xspr->_y);
 	SWAP(spr->_z, xspr->_z);
@@ -621,7 +621,7 @@ void CGEEngine::snCover(Sprite *spr, int xref) {
 
 	spr->_flags._hide = true;
 	xspr->_z = spr->_z;
-	xspr->_cave = spr->_cave;
+	xspr->_scene = spr->_scene;
 	xspr->gotoxy(spr->_x, spr->_y);
 	expandSprite(xspr);
 	if ((xspr->_flags._shad = spr->_flags._shad) == 1) {
@@ -638,7 +638,7 @@ void CGEEngine::snUncover(Sprite *spr, Sprite *xspr) {
 		return;
 
 	spr->_flags._hide = false;
-	spr->_cave = xspr->_cave;
+	spr->_scene = xspr->_scene;
 	spr->gotoxy(xspr->_x, xspr->_y);
 	if ((spr->_flags._shad = xspr->_flags._shad) == 1) {
 		_vga->_showQ->insert(_vga->_showQ->remove(xspr->_prev), spr);
@@ -650,16 +650,16 @@ void CGEEngine::snUncover(Sprite *spr, Sprite *xspr) {
 		spr->_time++;
 }
 
-void CGEEngine::snSetX0(int cav, int x0) {
-	debugC(1, kCGEDebugEngine, "CGEEngine::snSetX0(%d, %d)", cav, x0);
+void CGEEngine::snSetX0(int scene, int x0) {
+	debugC(1, kCGEDebugEngine, "CGEEngine::snSetX0(%d, %d)", scene, x0);
 
-	_heroXY[cav - 1].x = x0;
+	_heroXY[scene - 1].x = x0;
 }
 
-void CGEEngine::snSetY0(int cav, int y0) {
-	debugC(1, kCGEDebugEngine, "CGEEngine::snSetY0(%d, %d)", cav, y0);
+void CGEEngine::snSetY0(int scene, int y0) {
+	debugC(1, kCGEDebugEngine, "CGEEngine::snSetY0(%d, %d)", scene, y0);
 
-	_heroXY[cav - 1].y = y0;
+	_heroXY[scene - 1].y = y0;
 }
 
 void CGEEngine::snSetXY(Sprite *spr, uint16 xy) {
@@ -722,7 +722,7 @@ void CGEEngine::snSlave(Sprite *spr, int ref) {
 	Sprite *slv = locate(ref);
 	if (spr && slv) {
 		if (spr->active()) {
-			snSend(slv, spr->_cave);
+			snSend(slv, spr->_scene);
 			slv->_flags._slav = true;
 			slv->_z = spr->_z;
 			_vga->_showQ->insert(_vga->_showQ->remove(slv), spr->_next);
@@ -762,7 +762,7 @@ void CGEEngine::snKill(Sprite *spr) {
 	if (spr->_flags._kill) {
 		delete spr;
 	} else {
-		spr->_cave = -1;
+		spr->_scene = -1;
 		_vga->_spareQ->append(spr);
 	}
 	if (nx) {
@@ -792,7 +792,7 @@ void CGEEngine::snKeep(Sprite *spr, int stp) {
 		snSound(spr, 3);
 		_sound->setRepeat(oldRepeat);
 		_pocket[_pocPtr] = spr;
-		spr->_cave = 0;
+		spr->_scene = 0;
 		spr->_flags._kept = true;
 		spr->gotoxy(kPocketX + kPocketDX * _pocPtr + kPocketDX / 2 - spr->_w / 2,
 		          kPocketY + kPocketDY / 2 - spr->_h / 2);
@@ -809,7 +809,7 @@ void CGEEngine::snGive(Sprite *spr, int stp) {
 		int p = findPocket(spr);
 		if (p >= 0) {
 			_pocket[p] = NULL;
-			spr->_cave = _now;
+			spr->_scene = _now;
 			spr->_flags._kept = false;
 			if (stp >= 0)
 				spr->step(stp);
@@ -838,11 +838,11 @@ void CGEEngine::snLevel(Sprite *spr, int lev) {
 		if (spr) {
 			if (i <= lev) {
 				spr->backShow(true);
-				spr->_cave = 0;
+				spr->_scene = 0;
 				spr->_flags._hide = false;
 			} else {
 				spr->_flags._hide = true;
-				spr->_cave = -1;
+				spr->_scene = -1;
 			}
 		} else {
 			warning("SPR not found! ref: %d", 100 + i);
@@ -850,7 +850,7 @@ void CGEEngine::snLevel(Sprite *spr, int lev) {
 	}
 
 	_lev = lev;
-	_maxCave = _maxCaveArr[_lev];
+	_maxScene = _maxSceneArr[_lev];
 }
 
 void CGEEngine::snFlag(int indx, bool v) {
@@ -897,16 +897,16 @@ void CGEEngine::snLight(bool in) {
 	_dark = !in;
 }
 
-void CGEEngine::snHBarrier(const int cave, const int barX) {
-	debugC(1, kCGEDebugEngine, "CGEEngine::snHBarrier(%d, %d)", cave, barX);
+void CGEEngine::snHBarrier(const int scene, const int barX) {
+	debugC(1, kCGEDebugEngine, "CGEEngine::snHBarrier(%d, %d)", scene, barX);
 
-	_barriers[(cave > 0) ? cave : _now]._horz = barX;
+	_barriers[(scene > 0) ? scene : _now]._horz = barX;
 }
 
-void CGEEngine::snVBarrier(const int cave, const int barY) {
-	debugC(1, kCGEDebugEngine, "CGEEngine::snVBarrier(%d, %d)", cave, barY);
+void CGEEngine::snVBarrier(const int scene, const int barY) {
+	debugC(1, kCGEDebugEngine, "CGEEngine::snVBarrier(%d, %d)", scene, barY);
 
-	_barriers[(cave > 0) ? cave : _now]._vert = barY;
+	_barriers[(scene > 0) ? scene : _now]._vert = barY;
 }
 
 void CGEEngine::snWalk(Sprite *spr, int x, int y) {
@@ -1012,7 +1012,7 @@ void Snail::runCom() {
 			}
 			break;
 		case kSnCave:
-			_vm->switchCave(snc->_val);
+			_vm->switchScene(snc->_val);
 			break;
 		case kSnKill:
 			_vm->snKill(spr);
@@ -1146,8 +1146,8 @@ void Snail::runCom() {
 			case kMiniStep:
 				_vm->miniStep(snc->_val);
 				break;
-			case kXCave:
-				_vm->xCave();
+			case kXScene:
+				_vm->xScene();
 				break;
 			case kSndSetVolume:
 				sndSetVolume();
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index d01a2b25fd..9df61fa8a3 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -72,7 +72,7 @@ Sprite *locate(int ref) {
 Sprite::Sprite(CGEEngine *vm, BitmapPtr *shpP)
 	: _x(0), _y(0), _z(0), _nearPtr(0), _takePtr(0),
 	  _next(NULL), _prev(NULL), _seqPtr(kNoSeq), _time(0),
-	  _ext(NULL), _ref(-1), _cave(0), _vm(vm) {
+	  _ext(NULL), _ref(-1), _scene(0), _vm(vm) {
 	memset(_file, 0, sizeof(_file));
 	memset(&_flags, 0, sizeof(_flags));
 	_ref = 0;
@@ -496,7 +496,7 @@ void Sprite::sync(Common::Serializer &s) {
 	s.syncAsUint16LE(unused);
 	s.syncAsUint16LE(unused);	// _ext
 	s.syncAsUint16LE(_ref);
-	s.syncAsByte(_cave);
+	s.syncAsByte(_scene);
 
 	// bitfield in-memory storage is unpredictable, so to avoid
 	// any issues, pack/unpack everything manually
@@ -944,17 +944,6 @@ void Bitmap::show(int16 x, int16 y) {
 				srcP++;
 		}
 	}
-/*
-	DEBUG code to display image immediately
-	// Temporary
-	g_system->copyRectToScreen((const byte *)VGA::Page[1]->getBasePtr(0, 0), SCR_WID, 0, 0, SCR_WID, SCR_HIG);
-	byte palData[PAL_SIZ];
-	VGA::DAC2pal(VGA::SysPal, palData);
-	g_system->getPaletteManager()->setPalette(palData, 0, PAL_CNT);
-
-	g_system->updateScreen();
-	g_system->delayMillis(5000);
-*/
 }
 
 
@@ -980,7 +969,7 @@ HorizLine::HorizLine(CGEEngine *vm): Sprite(vm, NULL) {
 	setShapeList(HL);
 }
 
-CavLight::CavLight(CGEEngine *vm): Sprite(vm, NULL) {
+SceneLight::SceneLight(CGEEngine *vm): Sprite(vm, NULL) {
 	// Set the sprite list
 	BitmapPtr *PR = new BitmapPtr[2];
 	PR[0] = new Bitmap("PRESS");
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index 3312065492..d8648248df 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -88,7 +88,7 @@ protected:
 	SprExt *_ext;
 public:
 	int _ref;
-	signed char _cave;
+	signed char _scene;
 	struct Flags {
 		uint16 _hide : 1;       // general visibility switch
 		uint16 _near : 1;       // Near action lock
@@ -220,9 +220,9 @@ public:
 	HorizLine(CGEEngine *vm);
 };
 
-class CavLight: public Sprite {
+class SceneLight: public Sprite {
 public:
-	CavLight(CGEEngine *vm);
+	SceneLight(CGEEngine *vm);
 };
 
 class Spike: public Sprite {
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp
index e2b9a8961f..cda2875ac4 100644
--- a/engines/cge/walk.cpp
+++ b/engines/cge/walk.cpp
@@ -212,7 +212,7 @@ void Walk::noWay() {
 }
 
 bool Cluster::chkBar() const {
-	assert(_vm->_now <= kCaveMax);
+	assert(_vm->_now <= kSceneMax);
 	return (_pt.x == _vm->_barriers[_vm->_now]._horz) || (_pt.y == _vm->_barriers[_vm->_now]._vert);
 }