GNAP: renaming and grouping of scenes in group Arcade and Group 5

1 files changed, 0 insertions, 497 deletions

diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 7bb296147f..90cb91f393 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -2926,501 +2926,4 @@ void Scene46::updateAnimations() {
 	}
 }
 
-/*****************************************************************************/
-
-static const ObstacleDef kObstacleDefs[] = {
-	{0xB4, 15}, {0xCB, 14}, {0xCD, 13}, {0xCF, 15}, {0xBA, 14},
-	{0xCD, 13}, {0xCF, 12}, {0xCB, 15}, {0xBD, 13}, {0xCF, 12},
-	{0xCD, 11}, {0xCB, 15}, {0xB7, 12}, {0xCD, 11}, {0xCB, 10},
-	{0xCF, 15}, {0xCF, 14}, {0xBD, 13}, {0xCF, 12}, {0xCD, 11},
-	{0xCB, 15}, {0xCB, 13}, {0xB4, 12}, {0xCB, 11}, {0xCD, 10},
-	{0xCF, 15}, {0xCD, 12}, {0xBA, 12}, {0xCD, 12}, {0xCF, 12},
-	{0xCB, 15}, {0xCB,  9}, {0xCD,  9}, {0xCF,  9}, {0xCD,  9},
-	{0xCB,  9}, {0xCD,  9}, {0xCF,  5}, {0xBD, 13}, {0xCF,  8},
-	{0xCB,  8}, {0xCD, 15}, {0xB4,  1}, {0xBD,  7}, {0xCF,  7},
-	{0xCD,  7}, {0xCB,  7}, {0xCD,  7}, {0xCF, 15}, {0xCF, 15}
-};
-
-Scene49::Scene49(GnapEngine *vm) : Scene(vm) {
-	_scoreBarFlash = false;
-	_scoreBarPos = -1;
-	_scoreLevel = -1;
-	_obstacleIndex = -1;
-	_truckSequenceId = -1;
-	_truckId = -1;
-	_truckLaneNum = -1;
-
-	for (int i = 0; i < 5; i++) {
-		_obstacles[i]._currSequenceId = -1;
-		_obstacles[i]._closerSequenceId = -1;
-		_obstacles[i]._passedSequenceId = -1;
-		_obstacles[i]._splashSequenceId = -1;
-		_obstacles[i]._collisionSequenceId = -1;
-		_obstacles[i]._prevId = -1;
-		_obstacles[i]._currId = -1;
-		_obstacles[i]._laneNum = -1;
-	}
-}
-
-int Scene49::init() {
-	GameSys gameSys = *_vm->_gameSys;
-
-	gameSys.setAnimation(0, 0, 0);
-	gameSys.setAnimation(0, 0, 1);
-	for (int i = 0; i < 5; ++i)
-		gameSys.setAnimation(0, 0, i + 2);
-	_vm->_timers[2] = 0;
-	_vm->_timers[0] = 0;
-	_vm->_timers[1] = 0;
-	_vm->clearKeyStatus1(28);
-	_vm->clearKeyStatus1(54);
-	_vm->clearKeyStatus1(52);
-	return 0xD5;
-}
-
-void Scene49::updateHotspots() {
-	_vm->_hotspotsCount = 0;
-}
-
-void Scene49::checkObstacles() {
-	if (_vm->_timers[2] == 0) {
-		if (_vm->_timers[3] == 0) {
-			for (int i = 0; i < 5; ++i)
-				clearObstacle(i);
-		}
-
-		for (int j = 0; j < 5; ++j) {
-			if (_obstacles[j]._currSequenceId == 0) {
-				_vm->_timers[3] = 35;
-				_obstacles[j]._currSequenceId = kObstacleDefs[_obstacleIndex]._sequenceId;
-				switch (_obstacles[j]._currSequenceId) {
-				case 0xB4:
-					_obstacles[j]._laneNum = 1;
-					_obstacles[j]._closerSequenceId = 180;
-					_obstacles[j]._passedSequenceId = 181;
-					_obstacles[j]._splashSequenceId = 182;
-					_obstacles[j]._collisionSequenceId = 192;
-					break;
-				case 0xB7:
-					_obstacles[j]._laneNum = 2;
-					_obstacles[j]._closerSequenceId = 183;
-					_obstacles[j]._passedSequenceId = 184;
-					_obstacles[j]._splashSequenceId = 185;
-					_obstacles[j]._collisionSequenceId = 193;
-					break;
-				case 0xBD:
-					_obstacles[j]._laneNum = 3;
-					_obstacles[j]._closerSequenceId = 189;
-					_obstacles[j]._passedSequenceId = 190;
-					_obstacles[j]._splashSequenceId = 191;
-					_obstacles[j]._collisionSequenceId = 195;
-					break;
-				case 0xBA:
-					_obstacles[j]._laneNum = 2;
-					_obstacles[j]._closerSequenceId = 186;
-					_obstacles[j]._passedSequenceId = 187;
-					_obstacles[j]._splashSequenceId = 188;
-					_obstacles[j]._collisionSequenceId = 194;
-					break;
-				case 0xCB:
-					_obstacles[j]._laneNum = 1;
-					_obstacles[j]._closerSequenceId = 203;
-					_obstacles[j]._passedSequenceId = 204;
-					_obstacles[j]._splashSequenceId = 0;
-					_obstacles[j]._collisionSequenceId = 209;
-					break;
-				case 0xCD:
-					_obstacles[j]._laneNum = 2;
-					_obstacles[j]._closerSequenceId = 205;
-					_obstacles[j]._passedSequenceId = 206;
-					_obstacles[j]._splashSequenceId = 0;
-					_obstacles[j]._collisionSequenceId = 210;
-					break;
-				case 0xCF:
-					_obstacles[j]._laneNum = 3;
-					_obstacles[j]._closerSequenceId = 207;
-					_obstacles[j]._passedSequenceId = 208;
-					_obstacles[j]._splashSequenceId = 0;
-					_obstacles[j]._collisionSequenceId = 211;
-					break;
-				}
-				_obstacles[j]._prevId = _truckId;
-				_obstacles[j]._currId = _obstacles[j]._prevId;
-				_vm->_gameSys->setAnimation(_obstacles[j]._currSequenceId, _obstacles[j]._currId, j + 2);
-				_vm->_gameSys->insertSequence(_obstacles[j]._currSequenceId, _obstacles[j]._currId, 0, 0, kSeqNone, 0, 0, -50);
-				_vm->_timers[2] = kObstacleDefs[_obstacleIndex]._ticks;
-				++_obstacleIndex;
-				if (_obstacleIndex == 50)
-					_obstacleIndex = 0;
-				break;
-			}
-		}
-	}
-}
-
-void Scene49::updateObstacle(int id) {
-	GameSys gameSys = *_vm->_gameSys;
-	Scene49Obstacle &obstacle = _obstacles[id];
-
-	obstacle._currId = obstacle._prevId;
-
-	switch (obstacle._laneNum) {
-	case 1:
-		obstacle._prevId = _truckId + 1;
-		break;
-	case 2:
-		if (_truckLaneNum != 2 && _truckLaneNum != 3)
-			obstacle._prevId = _truckId - 1;
-		else
-			obstacle._prevId = _truckId + 1;
-		break;
-	case 3:
-		if (_truckLaneNum != 1 && _truckLaneNum != 2)
-			obstacle._prevId = _truckId;
-		else
-			obstacle._prevId = _truckId - 1;
-		break;
-	}
-
-	if (obstacle._currSequenceId == obstacle._closerSequenceId) {
-		if (_truckLaneNum == obstacle._laneNum) {
-			if (obstacle._splashSequenceId) {
-				gameSys.setAnimation(obstacle._collisionSequenceId, obstacle._prevId, id + 2);
-				gameSys.insertSequence(obstacle._collisionSequenceId, obstacle._prevId,
-					obstacle._currSequenceId, obstacle._currId,
-					kSeqSyncWait, 0, 0, -50);
-				obstacle._currSequenceId = obstacle._collisionSequenceId;
-				_vm->playSound(224, false);
-				increaseScore(30);
-			} else if ((obstacle._laneNum == 1 && _truckSequenceId == 0xB0) ||
-				(obstacle._laneNum == 2 && (_truckSequenceId == 0xB1 || _truckSequenceId == 0xB2)) ||
-				(obstacle._laneNum == 3 && _truckSequenceId == 0xB3)) {
-				gameSys.setAnimation(obstacle._passedSequenceId, obstacle._prevId, id + 2);
-				gameSys.insertSequence(obstacle._passedSequenceId, obstacle._prevId,
-					obstacle._currSequenceId, obstacle._currId,
-					kSeqSyncWait, 0, 0, -50);
-				obstacle._currSequenceId = obstacle._passedSequenceId;
-			} else {
-				gameSys.setAnimation(obstacle._collisionSequenceId, 256, 0);
-				gameSys.setAnimation(obstacle._passedSequenceId, obstacle._prevId, id + 2);
-				gameSys.insertSequence(obstacle._passedSequenceId, obstacle._prevId,
-					obstacle._currSequenceId, obstacle._currId,
-					kSeqSyncWait, 0, 0, -50);
-				gameSys.insertSequence(obstacle._collisionSequenceId, 256,
-					_truckSequenceId, _truckId,
-					kSeqSyncExists, 0, 0, -50);
-				_truckSequenceId = obstacle._collisionSequenceId;
-				_truckId = 256;
-				obstacle._currSequenceId = obstacle._passedSequenceId;
-				_vm->playSound(225, false);
-				decreaseScore(30);
-			}
-		} else {
-			gameSys.setAnimation(obstacle._passedSequenceId, obstacle._prevId, id + 2);
-			gameSys.insertSequence(obstacle._passedSequenceId, obstacle._prevId,
-				obstacle._currSequenceId, obstacle._currId,
-				kSeqSyncWait, 0, 0, -50);
-			obstacle._currSequenceId = obstacle._passedSequenceId;
-		}
-	} else if (obstacle._currSequenceId == obstacle._passedSequenceId) {
-		if (_truckLaneNum == obstacle._laneNum) {
-			if (obstacle._splashSequenceId) {
-				gameSys.setAnimation(obstacle._collisionSequenceId, obstacle._prevId, id + 2);
-				gameSys.insertSequence(obstacle._collisionSequenceId, obstacle._prevId,
-					obstacle._currSequenceId, obstacle._currId,
-					kSeqSyncWait, 0, 0, -50);
-				obstacle._currSequenceId = obstacle._collisionSequenceId;
-				_vm->playSound(224, false);
-				increaseScore(30);
-			}
-		} else if (obstacle._splashSequenceId) {
-			gameSys.setAnimation(obstacle._splashSequenceId, obstacle._prevId, id + 2);
-			gameSys.insertSequence(obstacle._splashSequenceId, obstacle._prevId,
-				obstacle._currSequenceId, obstacle._currId,
-				kSeqSyncWait, 0, 0, -50);
-			obstacle._currSequenceId = obstacle._splashSequenceId;
-		}
-	} else {
-		gameSys.setAnimation(0, 0, id + 2);
-		clearObstacle(id);
-	}
-}
-
-void Scene49::increaseScore(int amount) {
-	if (_scoreBarPos + amount <= 556) {
-		_scoreBarPos += amount;
-		_vm->_gameSys->fillSurface(0, _scoreBarPos, 508, amount, 22, 255, 0, 0);
-	}
-	_scoreLevel = _scoreBarPos + amount >= 556;
-}
-
-void Scene49::decreaseScore(int amount) {
-	if (_scoreBarPos >= 226 && _scoreLevel == 0) {
-		if (_scoreBarFlash)
-			refreshScoreBar();
-		_vm->_gameSys->fillSurface(0, _scoreBarPos, 508, amount, 22, 89, 0, 5);
-		_scoreBarPos -= amount;
-		_scoreLevel = 0;
-	}
-}
-
-void Scene49::refreshScoreBar() {
-	if (_scoreBarFlash)
-		_vm->_gameSys->fillSurface(0, 226, 508, 330, 22, 255, 0, 0);
-	else
-		_vm->_gameSys->fillSurface(0, 226, 508, 330, 22, 89, 0, 5);
-	_scoreBarFlash = !_scoreBarFlash;
-}
-
-void Scene49::clearObstacle(int index) {
-	_obstacles[index]._currSequenceId = 0;
-	_obstacles[index]._closerSequenceId = 0;
-	_obstacles[index]._passedSequenceId = 0;
-	_obstacles[index]._splashSequenceId = 0;
-	_obstacles[index]._collisionSequenceId = 0;
-	_obstacles[index]._prevId = 0;
-	_obstacles[index]._currId = 0;
-	_obstacles[index]._laneNum = 0;
-}
-
-void Scene49::run() {
-	GameSys gameSys = *_vm->_gameSys;
-
-	bool animToggle6 = false;
-	bool animToggle5 = false;
-	bool animToggle4 = false;
-	bool animToggle3 = false;
-	bool streetAnimToggle = false;
-	bool bgAnimToggle = false;
-
-	_vm->playSound(0xE2, true);
-	_vm->setSoundVolume(0xE2, 75);
-
-	_vm->hideCursor();
-	_vm->setGrabCursorSprite(-1);
-
-	_scoreBarPos = 196;
-	_scoreLevel = 0;
-	_scoreBarFlash = false;
-
-	switch (_vm->getRandom(3)) {
-	case 0:
-		_truckSequenceId = 0xAD;
-		_truckLaneNum = 1;
-		break;
-	case 1:
-		_truckSequenceId = 0xAE;
-		_truckLaneNum = 2;
-		break;
-	case 2:
-		_truckSequenceId = 0xAF;
-		_truckLaneNum = 3;
-		break;
-	}
-
-	int bgWidth1 = gameSys.getSpriteWidthById(0x5E);
-	int bgX1 = 600;
-
-	int bgWidth2 = gameSys.getSpriteWidthById(0x5F);
-	int bgX2 = 400;
-
-	int bgWidth3 = gameSys.getSpriteWidthById(4);
-	int bgX3 = 700;
-
-	int bgWidth4 = gameSys.getSpriteWidthById(5);
-	int bgX4 = 500;
-
-	int bgWidth5 = gameSys.getSpriteWidthById(6);
-	int bgX5 = 300;
-
-	int bgWidth6 = gameSys.getSpriteWidthById(7);
-	int bgX6 = 100;
-
-	gameSys.setAnimation(0xC8, 251, 1);
-	gameSys.setAnimation(_truckSequenceId, 256, 0);
-	gameSys.insertSequence(0xC9, 256, 0, 0, kSeqNone, 0, 600, 85);
-	gameSys.insertSequence(0xCA, 257, 0, 0, kSeqNone, 0, 400, 100);
-	gameSys.insertSequence(0xC4, 256, 0, 0, kSeqNone, 0, 700, 140);
-	gameSys.insertSequence(0xC5, 257, 0, 0, kSeqNone, 0, 500, 160);
-	gameSys.insertSequence(0xC6, 258, 0, 0, kSeqNone, 0, 300, 140);
-	gameSys.insertSequence(0xC7, 259, 0, 0, kSeqNone, 0, 100, 140);
-	gameSys.insertSequence(0xC8, 251, 0, 0, kSeqNone, 0, 0, -50);
-	gameSys.insertSequence(_truckSequenceId, 256, 0, 0, kSeqNone, 0, 0, -50);
-
-	_vm->_timers[0] = 2;
-
-	for (int i = 0; i < 5; ++i)
-		clearObstacle(i);
-
-	_obstacleIndex = 0;
-
-	_vm->_timers[2] = _vm->getRandom(20) + 10;
-
-	_truckId = 256;
-	_vm->_timers[3] = 35;
-	
-	while (!_vm->_sceneDone) {
-		if (_vm->_timers[0] == 0) {
-			// Update background animations (clouds etc.)
-			--bgX1;
-			bgX2 -= 2;
-			bgX3 -= 5;
-			--bgX4;
-			--bgX5;
-			--bgX6;
-			if (bgX1 <= -bgWidth1)
-				bgX1 = 799;
-			if (bgX2 <= -bgWidth2)
-				bgX2 = 799;
-			if (bgX3 <= -bgWidth3)
-				bgX3 = 799;
-			if (bgX4 <= -bgWidth4)
-				bgX4 = 799;
-			if (bgX5 <= -bgWidth5)
-				bgX5 = 799;
-			if (bgX6 <= -bgWidth6)
-				bgX6 = 799;
-			bgAnimToggle = !bgAnimToggle;
-			gameSys.insertSequence(0xC9, (bgAnimToggle ? 1 : 0) + 256, 0xC9, (bgAnimToggle ? 0 : 1) + 256, kSeqSyncWait, 0, bgX1, 85);
-			gameSys.insertSequence(0xCA, (bgAnimToggle ? 1 : 0) + 257, 0xCA, (bgAnimToggle ? 0 : 1) + 257, kSeqSyncWait, 0, bgX2, 100);
-			gameSys.insertSequence(0xC4, (bgAnimToggle ? 1 : 0) + 256, 0xC4, (bgAnimToggle ? 0 : 1) + 256, kSeqSyncWait, 0, bgX3, 140);
-			gameSys.insertSequence(0xC5, (bgAnimToggle ? 1 : 0) + 257, 0xC5, (bgAnimToggle ? 0 : 1) + 257, kSeqSyncWait, 0, bgX4, 160);
-			gameSys.insertSequence(0xC6, (bgAnimToggle ? 1 : 0) + 258, 0xC6, (bgAnimToggle ? 0 : 1) + 258, kSeqSyncWait, 0, bgX5, 140);
-			gameSys.insertSequence(0xC7, (bgAnimToggle ? 1 : 0) + 259, 0xC7, (bgAnimToggle ? 0 : 1) + 259, kSeqSyncWait, 0, bgX6, 140);
-			_vm->_timers[0] = 2;
-		}
-
-		if (gameSys.getAnimationStatus(1) == 2) {
-			streetAnimToggle = !streetAnimToggle;
-			gameSys.setAnimation(0xC8, (streetAnimToggle ? 1 : 0) + 251, 1);
-			gameSys.insertSequence(0xC8, (streetAnimToggle ? 1 : 0) + 251, 200, (streetAnimToggle ? 0 : 1) + 251, kSeqSyncWait, 0, 0, -50);
-		}
-
-		checkObstacles();
-
-		if (gameSys.getAnimationStatus(0) == 2) {
-			switch (_truckSequenceId) {
-			case 0xB1:
-				_truckLaneNum = 1;
-				break;
-			case 0xB0:
-			case 0xB3:
-				_truckLaneNum = 2;
-				break;
-			case 0xB2:
-				_truckLaneNum = 3;
-				break;
-			}
-			animToggle3 = !animToggle3;
-			if (_truckLaneNum == 1) {
-				gameSys.setAnimation(0xAD, (animToggle3 ? 1 : 0) + 256, 0);
-				gameSys.insertSequence(0xAD, (animToggle3 ? 1 : 0) + 256, _truckSequenceId, _truckId, kSeqSyncWait, 0, 0, -50);
-				_truckSequenceId = 0xAD;
-			} else if (_truckLaneNum == 2) {
-				gameSys.setAnimation(0xAE, (animToggle3 ? 1 : 0) + 256, 0);
-				gameSys.insertSequence(0xAE, (animToggle3 ? 1 : 0) + 256, _truckSequenceId, _truckId, kSeqSyncWait, 0, 0, -50);
-				_truckSequenceId = 0xAE;
-			} else {
-				gameSys.setAnimation(0xAF, (animToggle3 ? 1 : 0) + 256, 0);
-				gameSys.insertSequence(0xAF, (animToggle3 ? 1 : 0) + 256, _truckSequenceId, _truckId, kSeqSyncWait, 0, 0, -50);
-				_truckSequenceId = 0xAF;
-			}
-			_truckId = (animToggle3 ? 1 : 0) + 256;
-			if (_scoreLevel == 1) {
-				if (!gameSys.isSequenceActive(0xD4, 266)) {
-					gameSys.setAnimation(0xD4, 266, 8);
-					gameSys.insertSequence(0xD4, 266, 0, 0, kSeqNone, 0, 0, -50);
-				}
-				++_scoreLevel;
-				_vm->_timers[1] = 2;
-				animToggle4 = false;
-				animToggle5 = false;
-				animToggle6 = false;
-				_scoreBarFlash = false;
-			}
-		}
-
-		if (_scoreLevel != 0 && !_vm->_timers[1]) {
-			refreshScoreBar();
-			_vm->_timers[1] = 8;
-			if (animToggle6) {
-				if (animToggle5) {
-					if (animToggle4 && !gameSys.isSequenceActive(212, 266))
-						gameSys.insertSequence(212, 266, 0, 0, kSeqNone, 0, 0, -50);
-					animToggle4 = !animToggle4;
-				}
-				animToggle5 = !animToggle5;
-			}
-			animToggle6 = !animToggle6;
-		}
-
-		updateAnimations();
-
-		if (clearKeyStatus()) {
-			_vm->_sceneDone = true;
-			_vm->_newSceneNum = 2;
-			_vm->_newCursorValue = 1;
-		}
-
-		if (_vm->isKeyStatus1(Common::KEYCODE_RIGHT)) {
-			// Steer right
-			if (_truckSequenceId == 0xB3)
-				_truckLaneNum = 2;
-			if (_truckSequenceId == 0xB1)
-				_truckLaneNum = 1;
-			if (_truckLaneNum != 3 && _truckLaneNum != 2) {
-				if (_scoreLevel) {
-					_vm->_sceneDone = true;
-					_vm->_newSceneNum = 47;
-				}
-			} else {
-				int steerSequenceId = (_truckLaneNum == 3) ? 0xB3 : 0xB1;
-				if (_truckSequenceId == 0xAE || _truckSequenceId == 0xAF) {
-					gameSys.setAnimation(steerSequenceId, 256, 0);
-					gameSys.insertSequence(steerSequenceId, 256, _truckSequenceId, _truckId, kSeqSyncExists, 0, 0, -50);
-					_truckSequenceId = steerSequenceId;
-					_truckId = 256;
-				}
-			}
-			_vm->clearKeyStatus1(Common::KEYCODE_RIGHT);
-		}
-
-		if (_vm->isKeyStatus1(Common::KEYCODE_LEFT)) {
-			// Steer left
-			if (_truckSequenceId == 0xB0)
-				_truckLaneNum = 2;
-			if (_truckSequenceId == 0xB2)
-				_truckLaneNum = 3;
-			if (_truckLaneNum == 1 || _truckLaneNum == 2) {
-				int steerSequenceId = (_truckLaneNum == 1) ? 0xB0 : 0xB2;
-				if (_truckSequenceId == 0xAD || _truckSequenceId == 0xAE) {
-					gameSys.setAnimation(steerSequenceId, 256, 0);
-					gameSys.insertSequence(steerSequenceId, 256, _truckSequenceId, _truckId, kSeqSyncExists, 0, 0, -50);
-					_truckSequenceId = steerSequenceId;
-					_truckId = 256;
-				}
-			}
-			_vm->clearKeyStatus1(Common::KEYCODE_LEFT);
-		}
-		_vm->gameUpdateTick();
-	}
-	_vm->stopSound(0xE2);  
-}
-
-void Scene49::updateAnimations() {
-	GameSys gameSys = *_vm->_gameSys;
-
-	for (int i = 0; i < 5; ++i) {
-		if (gameSys.getAnimationStatus(i + 2) == 2) {
-			if (_obstacles[i]._currSequenceId)
-				updateObstacle(i);
-		}
-	}
-
-	if (gameSys.getAnimationStatus(8) == 2) {
-		_vm->_sceneDone = true;
-		_vm->_newSceneNum = 47;
-	}
-}
-
 } // End of namespace Gnap