1 files changed, 17 insertions, 11 deletions
diff --git a/src/T2DLL/T2MoverArray.h b/src/T2DLL/T2MoverArray.h
index 794f8ee..4018dba 100644
--- a/src/T2DLL/T2MoverArray.h
+++ b/src/T2DLL/T2MoverArray.h
@@ -1,19 +1,25 @@
 #pragma once
 #include "common.h"
+#include "T2Mover.h"
+#include "T2ObjectArray.h"
 
-class T2MoverArray {
+class AFX_EXT_CLASS T2MoverArray : public T2ObjectArray {
 public:
-	T2MoverArray(unsigned int);
+	enum { kGroupSize = 32 };
+
+	T2MoverArray(unsigned int inStartID = 1);
 	virtual ~T2MoverArray();
+	virtual void DispatchIdle(T2TowerDoc* inDoc, int);
 	T2Mover* FindUnusedMover();
-	void DrawMoverAll(T2TowerDoc*, const RECT&);
-	virtual void DispatchIdle(T2TowerDoc*, int);
-	int CalcMentenanceCost(T2TowerDoc*) const;
-	void Read(T2Archive&, T2TowerDoc*);
-	void Write(T2Archive&);
+	void DrawMoverAll(T2TowerDoc* inDoc, const RECT& inRect);
+	int CalcMentenanceCost(T2TowerDoc* inDoc) const;
+	void Read(T2Archive& inArchive, T2TowerDoc* inDoc);
+	void Write(T2Archive& inArchive);
+
+	T2Mover* GetIndexMover(int i) { return &mMover[i]; }
+
+protected:
+	friend class T2MoverArrayList;
 
-	T2Mover* GetIndexMover(int) {}
-	T2MoverArray(const T2MoverArray&) {}
-	T2MoverArray& operator=(const T2MoverArray&) {}
-	void `default constructor closure'() {}
+	T2Mover mMover[kGroupSize];
 };