[Scummvm-git-logs] scummvm master -> 14e773ba072cfb8ea3fda84438e65f853ad4fc31

[bluegr]

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

Summary:
4827c87348 GROOVIE: Remove leftover include
14e773ba07 GROOVIE: Add missing ifdefs for groovie2 game logic


Commit: 4827c87348488077f0ea1ce98cc284ddeb20fad2
    https://github.com/scummvm/scummvm/commit/4827c87348488077f0ea1ce98cc284ddeb20fad2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-23T02:46:46+03:00

Commit Message:
GROOVIE: Remove leftover include

Changed paths:
    engines/groovie/script.cpp


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index a1d76161b5..91d58476a8 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -32,7 +32,6 @@
 #include "groovie/resource.h"
 #include "groovie/saveload.h"
 #include "groovie/logic/cell.h"
-#include "groovie/logic/logic.h"
 #include "groovie/logic/tlcgame.h"
 
 #include "gui/saveload.h"


Commit: 14e773ba072cfb8ea3fda84438e65f853ad4fc31
    https://github.com/scummvm/scummvm/commit/14e773ba072cfb8ea3fda84438e65f853ad4fc31
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-23T02:46:47+03:00

Commit Message:
GROOVIE: Add missing ifdefs for groovie2 game logic

Changed paths:
    engines/groovie/script.h


diff --git a/engines/groovie/script.h b/engines/groovie/script.h
index 1e02da5013..305a4b0d26 100644
--- a/engines/groovie/script.h
+++ b/engines/groovie/script.h
@@ -24,10 +24,12 @@
 #define GROOVIE_SCRIPT_H
 
 #include "groovie/groovie.h"
+#ifdef ENABLE_GROOVIE2
 #include "groovie/logic/beehive.h"
 #include "groovie/logic/cake.h"
 #include "groovie/logic/gallery.h"
 #include "groovie/logic/mousetrap.h"
+#endif
 
 #include "common/random.h"
 #include "common/rect.h"
@@ -260,10 +262,12 @@ private:
 	void o2_check_sounds_overlays();
 	void o2_preview_loadgame();
 
-	CakeGame _cake;
+#ifdef ENABLE_GROOVIE2
 	BeehiveGame _beehive;
+	CakeGame _cake;
 	GalleryGame _gallery;
 	MouseTrapGame _mouseTrap;
+#endif
 };
 
 } // End of Groovie namespace