[Scummvm-git-logs] scummvm master -> 7c483badbc617eb61313cb2a99f8656608427bc2

[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:
7c483badbc GROOVIE: Clean up mini game debug messages and comments


Commit: 7c483badbc617eb61313cb2a99f8656608427bc2
    https://github.com/scummvm/scummvm/commit/7c483badbc617eb61313cb2a99f8656608427bc2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-23T04:07:15+03:00

Commit Message:
GROOVIE: Clean up mini game debug messages and comments

Changed paths:
    engines/groovie/logic/beehive.cpp
    engines/groovie/logic/beehive.h
    engines/groovie/logic/cake.h
    engines/groovie/logic/gallery.h
    engines/groovie/script.cpp


diff --git a/engines/groovie/logic/beehive.cpp b/engines/groovie/logic/beehive.cpp
index f8c308d551..e65cd73566 100644
--- a/engines/groovie/logic/beehive.cpp
+++ b/engines/groovie/logic/beehive.cpp
@@ -23,16 +23,6 @@
 #include "groovie/groovie.h"
 #include "groovie/logic/beehive.h"
 
-/*
- * Beehive puzzle
- *
- * An infection-style game in which the player must cover more
- * territory than the computer. It's similar to the microscope puzzle
- * in the 7th Guest. The playfield is a honeycomb made of 61
- * hexagons. The hexagons are numbered starting from the top-left
- * corner, with a direction from bottom left to top right.
- */
-
 namespace Groovie {
 
 namespace {
diff --git a/engines/groovie/logic/beehive.h b/engines/groovie/logic/beehive.h
index bc1ec0515c..137776164d 100644
--- a/engines/groovie/logic/beehive.h
+++ b/engines/groovie/logic/beehive.h
@@ -27,6 +27,15 @@
 
 namespace Groovie {
 
+/*
+ * Beehive (Blood and Honey) puzzle (hs.grv)
+ *
+ * An infection-style game in which the player must cover more
+ * territory than the computer. It's similar to the microscope puzzle
+ * in the 7th Guest. The playfield is a honeycomb made of 61
+ * hexagons. The hexagons are numbered starting from the top-left
+ * corner, with a direction from bottom left to top right.
+ */
 class BeehiveGame {
 public:
 	BeehiveGame();
diff --git a/engines/groovie/logic/cake.h b/engines/groovie/logic/cake.h
index 168d51c45f..a60839d519 100644
--- a/engines/groovie/logic/cake.h
+++ b/engines/groovie/logic/cake.h
@@ -29,8 +29,8 @@
 namespace Groovie {
 
 /*
-* Connect Four puzzle, the cake in the dining room
-*/
+ * Cake (Connect Four) puzzle in the dining room (tb.grv)
+ */
 class CakeGame {
 public:
 	CakeGame();
diff --git a/engines/groovie/logic/gallery.h b/engines/groovie/logic/gallery.h
index f86f0b184c..95a0dbf3d5 100644
--- a/engines/groovie/logic/gallery.h
+++ b/engines/groovie/logic/gallery.h
@@ -29,7 +29,7 @@
 namespace Groovie {
 
 /*
- * Puzzle in the Gallery.
+ * Puzzle in the Gallery (bs.grv).
  * The aim is to select the last piece of the image.
  * There are 18 pieces in total.
  * When selecting a piece, all surrounding pieces are also selected
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 91d58476a8..4bf8ad233e 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2059,14 +2059,13 @@ void Script::o2_setvideoskip() {
 // and UHP include the hardcoded puzzle logic of 11H).
 void Script::o_gamelogic() {
 	uint8 param = readScript8bits();
+	debugC(1, kDebugScript, "Groovie::Script: Mini game logic, param %d", param);
 
 	switch (_version) {
 	case kGroovieT7G:
 		if (!_cellGame)
 			_cellGame = new CellGame;
 
-		debugC(1, kDebugScript, "Groovie::Script: CELL MOVE var[0x%02X]", param);
-
 		_cellGame->playStauf(2, param, &_variables[0x19]);
 
 		// Set the movement origin
@@ -2082,38 +2081,29 @@ void Script::o_gamelogic() {
 	case kGroovieCDY:
 	case kGroovieUHP:
 		switch (param) {
-		case 1:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H Connect four in the dining room. (tb.grv)", param);
+		case 1:	// 11H Cake puzzle in the dining room (tb.grv)
 			_cake.run(_variables);
 			break;
-		case 2:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H/UHP Beehive Puzzle in the top room (hs.grv)", param);
+		case 2:	// 11H/UHP Beehive puzzle in the top room (hs.grv)
 			_beehive.run(_variables);
 			break;
-		case 3:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H Make last move on modern art picture in the gallery (bs.grv)", param);
+		case 3:	// 11H Gallery puzzle in the modern art painting (bs.grv)
 			_gallery.run(_variables);
 			break;
-		case 4:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H Triangle in the Chapel (tx.grv)", param);
+		case 4:	// 11H Triangle puzzle in the chapel (tx.grv)
 			// TODO
 			break;
-		case 5:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H/UHP Mouse Trap in the lab (al.grv)", param);
+		case 5: // 11H/UHP Mouse trap puzzle in the lab (al.grv)
 			_mouseTrap.run(_variables);
 			break;
-		case 6:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): T11H Pente - final puzzle (pt.grv)", param);
+		case 6: // 11H Pente puzzle at the end of the game (pt.grv)
 			// TODO
-			// For now, just auto-solve the puzzle, so the player can continue
-			_variables[5] = 4;
+			_variables[5] = 4;	// Auto-solve the puzzle, so the player can continue
 			break;
-		case 7:
-			debugC(1, kDebugScript, "Groovie::Script: Op42 (0x%02X): Clandestiny unknown -> NOP", param);
+		case 7:	// Clan Unknown puzzle
 			// TODO
 			break;
-		case 8:
-			debugC(1, kDebugScript, "Groovie::Script Op42 (0x%02X): Clandestiny/UHP Othello / Reversi", param);
+		case 8:	// Clan/UHP Othello/Reversi puzzle
 			// TODO
 			break;
 		default: