3 files changed, 43 insertions, 6 deletions
diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 88d40fe4dc..6ffac2ef15 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -94,13 +94,12 @@ static const byte kTurnTbl[] = {
 };
 
 static const int kAfterVideoSceneNum[] = {
-//	 0, 43, 23, 12,  4, 44,  2,
-//	16,  4,  4,  4, 44, 12, 44
 	 0, 43, 23, 12,  4, 44,  2,
 	16,  4,  4,  4, 44, 12, 32
 };
 
 const int kMainMenu = 44;
+const int kCredits	= 45;
 
 bool WalkArea::contains(const Common::Point &pt) const {
 	return Common::Rect(x, y, x + width, y + height).contains(pt);
@@ -147,6 +146,7 @@ Common::Error BbvsEngine::run() {
 	_sound = new SoundMan();
 	
 	allocSnapshot();
+	memset(_easterEggInput, 0, sizeof(_easterEggInput));
 	
 	_gameTicks = 0;
 	_playVideoNumber = 0;
@@ -181,6 +181,12 @@ Common::Error BbvsEngine::run() {
 			updateGame();
 		else if (_currSceneNum == kMainMenu)
 			runMainMenu();
+		else if (_currSceneNum == kCredits &&
+			(_mouseButtons & (kLeftButtonClicked | kRightButtonClicked))) {
+			_mouseButtons &= ~kLeftButtonClicked;
+			_mouseButtons &= ~kRightButtonClicked;
+			_newSceneNum = kMainMenu;
+		}
 		if (_playVideoNumber > 0) {
 			playVideo(_playVideoNumber);
 			_playVideoNumber = 0;
@@ -217,6 +223,7 @@ void BbvsEngine::updateEvents() {
 			_keyCode = event.kbd.keycode;
 			break;
 		case Common::EVENT_KEYUP:
+			checkEasterEgg(event.kbd.ascii);
 			_keyCode = Common::KEYCODE_INVALID;
 			break;
 		case Common::EVENT_MOUSEMOVE:
@@ -702,7 +709,7 @@ void BbvsEngine::initScene(bool sounds) {
 bool BbvsEngine::changeScene() {
 
 	writeContinueSavegame();
-
+	
 	if (_newSceneNum >= 27 && _newSceneNum <= 30) {
 		// Run minigames
 		stopSpeech();
@@ -719,12 +726,12 @@ bool BbvsEngine::changeScene() {
 		_playVideoNumber = _newSceneNum - 30;
 		_currSceneNum = _newSceneNum;
 		_newSceneNum = kAfterVideoSceneNum[_playVideoNumber];
-	} else if (_newSceneNum >= 100 && _currSceneNum == 45) {
+	} else if (_newSceneNum >= 100 && _currSceneNum == kCredits) {
 		// Play secret video
 		stopSounds();
 		_playVideoNumber = _newSceneNum;
 		_currSceneNum = 49;
-		_newSceneNum = 45;
+		_newSceneNum = kCredits;
 	} else {
 		// Normal scene
 		initScene(true);
@@ -2195,4 +2202,31 @@ void BbvsEngine::runMainMenu() {
 	delete mainMenu;
 }
 
+void BbvsEngine::checkEasterEgg(char key) {
+
+	static const char *kEasterEggStrings[] = {
+		"BOIDUTS",
+		"YNNIF",
+		"SKCUS",
+		"NAMTAH"
+	};
+	
+	static const int kEasterEggLengths[] = {
+		7, 5, 5, 6
+	};
+	
+	if (_currSceneNum == kCredits) {
+		memcpy(&_easterEggInput[1], &_easterEggInput[0], 6);
+		_easterEggInput[0] = key;
+		for (int i = 0; i < ARRAYSIZE(kEasterEggStrings); ++i) {
+			if (!scumm_strnicmp(kEasterEggStrings[i], _easterEggInput, kEasterEggLengths[i])) {
+				_easterEggInput[0] = 0;
+				_newSceneNum = 100 + i;
+				break;
+			}
+		}
+	}
+
+}
+
 } // End of namespace Bbvs
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index 8d9ccc0279..a896e9db4a 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -300,6 +300,8 @@ public:
 	byte *_snapshot;
 	Common::SeekableMemoryWriteStream *_snapshotStream;
 	
+	char _easterEggInput[7];
+	
 	void updateEvents();
 	int getRandom(int max);
 
@@ -366,6 +368,7 @@ public:
 	void playVideo(int videoNum);
 	
 	void runMainMenu();
+	void checkEasterEgg(char key);
 
 	// Savegame API
 
diff --git a/engines/bbvs/videoplayer.cpp b/engines/bbvs/videoplayer.cpp
index 71cb7ddaa4..0b6f011513 100644
--- a/engines/bbvs/videoplayer.cpp
+++ b/engines/bbvs/videoplayer.cpp
@@ -32,7 +32,7 @@ void BbvsEngine::playVideo(int videoNum) {
 	Common::String videoFilename;
 
 	if (videoNum >= 100)
-		videoFilename = Common::String::format("snd/snd%05d.avi", videoNum + 1400);
+		videoFilename = Common::String::format("snd/snd%05d.aif", videoNum + 1400);
 	else
 		videoFilename = Common::String::format("vid/video%03d.avi", videoNum - 1);