[Scummvm-git-logs] scummvm master -> 19b75e27937147ef844b461b5161ba6bf3da14ab

[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:
19b75e2793 GROOVIE: Add game logic stub for the wine rack puzzle in Clandestiny


Commit: 19b75e27937147ef844b461b5161ba6bf3da14ab
    https://github.com/scummvm/scummvm/commit/19b75e27937147ef844b461b5161ba6bf3da14ab
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-28T13:45:27+03:00

Commit Message:
GROOVIE: Add game logic stub for the wine rack puzzle in Clandestiny

Changed paths:
  A engines/groovie/logic/winerack.cpp
  A engines/groovie/logic/winerack.h
    engines/groovie/module.mk
    engines/groovie/script.cpp
    engines/groovie/script.h


diff --git a/engines/groovie/logic/winerack.cpp b/engines/groovie/logic/winerack.cpp
new file mode 100644
index 0000000000..35ceaf0f8e
--- /dev/null
+++ b/engines/groovie/logic/winerack.cpp
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "groovie/groovie.h"
+#include "groovie/logic/winerack.h"
+
+namespace Groovie {
+
+WineRackGame::WineRackGame() : _random("WineRackGame") {
+}
+
+void WineRackGame::run(byte *scriptVariables) {
+	// TODO
+}
+
+} // End of Groovie namespace
diff --git a/engines/groovie/logic/winerack.h b/engines/groovie/logic/winerack.h
new file mode 100644
index 0000000000..a2c6d3d2f5
--- /dev/null
+++ b/engines/groovie/logic/winerack.h
@@ -0,0 +1,47 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GROOVIE_LOGIC_WINERACK_H
+#define GROOVIE_LOGIC_WINERACK_H
+
+#include "common/random.h"
+#include "common/system.h"
+
+namespace Groovie {
+
+/*
+ * Wine rack puzzle in Clandestiny.
+ * The player needs to create a path of bottles from one side to the other
+ * before the ghost of Auld Sot does.
+ */
+class WineRackGame {
+public:
+	WineRackGame();
+	void run(byte *scriptVariables);
+	
+private:
+	Common::RandomSource _random;
+};
+
+} // End of Groovie namespace
+
+#endif // GROOVIE_LOGIC_WINERACK_H
diff --git a/engines/groovie/module.mk b/engines/groovie/module.mk
index 9f81391cb4..bb0de00baf 100644
--- a/engines/groovie/module.mk
+++ b/engines/groovie/module.mk
@@ -26,6 +26,7 @@ MODULE_OBJS += \
 	logic/pente.o \
 	logic/tlcgame.o \
 	logic/triangle.o \
+	logic/winerack.o \
 	video/roq.o
 endif
 
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index a4e8591744..3cfe80a617 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2126,8 +2126,8 @@ void Script::o_gamelogic() {
 		case 6: // 11H Pente puzzle at the end of the game (pt.grv)
 			_pente.run(_variables);
 			break;
-		case 7:	// Clan Unknown puzzle
-			// TODO
+		case 7:	// Clan Wine rack puzzle
+			_wineRack.run(_variables);
 			break;
 		case 8:	// Clan/UHP Othello/Reversi puzzle
 			_othello.run(_variables);
diff --git a/engines/groovie/script.h b/engines/groovie/script.h
index ac42f8c3fa..5a00531fa5 100644
--- a/engines/groovie/script.h
+++ b/engines/groovie/script.h
@@ -32,6 +32,7 @@
 #include "groovie/logic/othello.h"
 #include "groovie/logic/pente.h"
 #include "groovie/logic/triangle.h"
+#include "groovie/logic/winerack.h"
 #endif
 
 #include "common/random.h"
@@ -274,6 +275,7 @@ private:
 	OthelloGame _othello;
 	PenteGame _pente;
 	TriangleGame _triangle;
+	WineRackGame _wineRack;
 #endif
 };