[Scummvm-git-logs] scummvm master -> 7320140b6665dd7fcf6c056ec31dca45a6cca194

[Die4Ever]

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:
7320140b66 GROOVIE: beehive move overrideMoves into class


Commit: 7320140b6665dd7fcf6c056ec31dca45a6cca194
    https://github.com/scummvm/scummvm/commit/7320140b6665dd7fcf6c056ec31dca45a6cca194
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2021-11-19T18:12:26-06:00

Commit Message:
GROOVIE: beehive move overrideMoves into class

Changed paths:
    engines/groovie/logic/beehive.cpp
    engines/groovie/logic/beehive.h


diff --git a/engines/groovie/logic/beehive.cpp b/engines/groovie/logic/beehive.cpp
index 27af88b520..e74c6869bc 100644
--- a/engines/groovie/logic/beehive.cpp
+++ b/engines/groovie/logic/beehive.cpp
@@ -36,9 +36,6 @@ extern const int8 beehiveLogicTable1[368];
 extern const int8 beehiveLogicTable2[800];
 }
 
-Common::Array<int> overrideMoves;
-uint overrideIndex = 0;
-
 void BeehiveGame::overrideClick(byte *vars) {
 	if (overrideIndex >= overrideMoves.size())
 		return;
@@ -823,6 +820,7 @@ void BeehiveGame::tests() {
 		/**/ 25, 23, /**/ 46, 31, /**/ 31, 30, /**/ 52, 38, /**/ 29, 12, /**/ 31, 39, /**/ 35, 28, /**/ 49, 32,
 		/**/ 31, 40, /**/ 39, 47, /**/ 20, 19, /**/ 29, 37, /**/ 57, 58, /**/ 53, 46, /**/ 53, 52
 	};
+	overrideIndex = 0;
 }
 
 } // End of Groovie namespace
diff --git a/engines/groovie/logic/beehive.h b/engines/groovie/logic/beehive.h
index 9860ed451a..7eadb9a917 100644
--- a/engines/groovie/logic/beehive.h
+++ b/engines/groovie/logic/beehive.h
@@ -78,6 +78,8 @@ private:
 	#define HEXCOUNT 61
 	int8 _beehiveState[HEXCOUNT];
 
+	Common::Array<int> overrideMoves;
+	uint overrideIndex;
 };
 
 } // End of Groovie namespace