[Scummvm-git-logs] scummvm master -> 8f3d07b05ea6a979b89e933d464173e0f6bde1a6

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8f3d07b05e GROOVIE: Initial work on UHP. 7/13 mini-tames are currently functional


Commit: 8f3d07b05ea6a979b89e933d464173e0f6bde1a6
    https://github.com/scummvm/scummvm/commit/8f3d07b05ea6a979b89e933d464173e0f6bde1a6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-16T00:07:40+03:00

Commit Message:
GROOVIE: Initial work on UHP. 7/13 mini-tames are currently functional

>From the 12+1 mini-games:
- Crypts (T7G) works
- Cake (T7G) works
- Spiders (T7G) works
- High Lights (T7G) works
- Blood and Honey / beehive (11H) misses game logic
- The Amazing Labyrinth / mousetrap (11H) misses game logic
- Book Checkers (11H) works
- SwitchBoard (11H) works
- Cursed Coins (Clan) misses game logic
- Trade Winds (Clan) crashes with missing resources
- Statue Paths (Clan) crashes with missing resources
- Leap Frogs (Clan) works
- The final puzzle is not accessible yet

Changed paths:
    engines/groovie/groovie.cpp
    engines/groovie/music.cpp
    engines/groovie/script.cpp


diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index d66ff7696c..64b19510d4 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -179,7 +179,6 @@ Common::Error GroovieEngine::run() {
 		}
 		// else, fall through
 	case kGroovieT11H:
-	case kGroovieUHP:
 		// Create the music player
 		switch (getPlatform()) {
 		case Common::kPlatformMacintosh:
@@ -198,6 +197,7 @@ Common::Error GroovieEngine::run() {
 		break;
 
 	case kGroovieCDY:
+	case kGroovieUHP:
 		_musicPlayer = new MusicPlayerClan(this);
 		break;
 
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 8d1f775936..60c9f33f7d 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -834,5 +834,4 @@ Common::String MusicPlayerClan::getFilename(uint32 fileref) {
 #endif
 }
 
-
 } // End of Groovie namespace
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index e1f22f0b09..88613f5174 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2127,6 +2127,24 @@ void Script::o2_gamespecial() {
 			debugC(1, kDebugScript, "Groovie::Script: Op42 (0x%02X): T11H Invalid -> NOP", arg);
 		}
 		break;
+	case kGroovieUHP:
+		switch (arg) {
+		case 2:
+			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): UHP Beehive Puzzle", arg);
+			// TODO: Same as the 11H beehive puzzle (opBeehive)
+			break;
+		case 5:
+			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): UHP Mouse Trap", arg);
+			// TODO: Same as the 11H mousetrap puzzle (opMouseTrap)
+			break;
+		case 8:
+			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): UHP Othello", arg);
+			// TODO: Same as the Clandestiny Othello/Reversi puzzle (opOthello)
+			break;
+		default:
+			debugC(1, kDebugScript, "Groovie::Script: Op42 (0x%02X): UHP Invalid -> NOP", arg);
+		}
+		break;
 #endif
 	default:
 		debugC(1, kDebugScript, "Groovie::Script: GameSpecial (0x%02X)", arg);