1 files changed, 63 insertions, 2 deletions
diff --git a/engines/pegasus/util.h b/engines/pegasus/util.h
index 459c1380cb..6369c49fdb 100755
--- a/engines/pegasus/util.h
+++ b/engines/pegasus/util.h
@@ -23,8 +23,10 @@
  *
  */
 
-#ifndef PEGASUS_MMSHELL_MMIDOBJECT_H
-#define PEGASUS_MMSHELL_MMIDOBJECT_H
+#ifndef PEGASUS_UTIL_H
+#define PEGASUS_UTIL_H
+
+#include "common/stream.h"
 
 #include "pegasus/types.h"
 
@@ -63,6 +65,65 @@ protected:
 	void *_functionArg;
 };
 
+#define NUM_FLAGS (sizeof(Unit) * 8)
+#define BIT_INDEX_SHIFT (sizeof(Unit) + 2 - (sizeof(Unit)) / 3)
+#define BIT_INDEX_MASK (NUM_FLAGS - 1)
+
+template <typename Unit, uint32 kNumFlags>
+class FlagsArray {
+public:
+	FlagsArray() { clearAllFlags(); }
+	void clearAllFlags() { memset(_flags, 0, sizeof(_flags)); }
+	void setAllFlags() { memset(_flags, ~((Unit)0), sizeof(_flags)); }
+	void setFlag(uint32 flag) { _flags[flag >> BIT_INDEX_SHIFT] |= 1 << (flag & BIT_INDEX_MASK); }
+	void clearFlag(uint32 flag) { _flags[flag >> BIT_INDEX_SHIFT] &= ~(1 << (flag & BIT_INDEX_MASK)); }
+	void setFlag(uint32 flag, bool val) { if (val) setFlag(flag); else clearFlag(flag); }
+	bool getFlag(uint32 flag) { return (_flags[flag >> BIT_INDEX_SHIFT] & (1 << (flag & BIT_INDEX_MASK))) != 0; }
+	bool anyFlagSet() {
+		for (uint32 i = 0; i < sizeof(_flags); i++)
+			if (_flags[i] != 0)
+				return true;
+		return false;
+	}
+
+	void readFromStream(Common::ReadStream *stream) {
+		// Shortcut
+		if (sizeof(Unit) == 1) {
+			stream->read(_flags, sizeof(_flags));
+			return;
+		}
+
+		for (uint32 i = 0; i < ARRAYSIZE(_flags); i++) {
+			if (sizeof(Unit) == 2)
+				_flags[i] = stream->readUint16BE();
+			else /* if (sizeof(Unit) == 4) */
+				_flags[i] = stream->readUint32BE();
+		}
+	}
+
+	void writeToStream(Common::WriteStream *stream) {
+		// Shortcut
+		if (sizeof(Unit) == 1) {
+			stream->write(_flags, sizeof(_flags));
+			return;
+		}
+
+		for (uint32 i = 0; i < ARRAYSIZE(_flags); i++) {
+			if (sizeof(Unit) == 2)
+				stream->writeUint16BE(_flags[i]);
+			else /* if (sizeof(Unit) == 4) */
+				stream->writeUint32BE(_flags[i]);
+		}
+	}
+
+private:
+	Unit _flags[(kNumFlags - 1) / NUM_FLAGS + 1];
+};
+
+#undef NUM_FLAGS;
+#undef BIT_INDEX_SHIFT
+#undef BIT_INDEX_MASK
+
 int32 linearInterp(const int32 start1, const int32 stop1, const int32 current1, const int32 start2, const int32 stop2);
 
 void shuffleArray(int32 *arr, int32 count, Common::RandomSource &random);