i am in hell

1 files changed, 51 insertions, 14 deletions

diff --git a/src/T2DLL/T2MoverDef.h b/src/T2DLL/T2MoverDef.h
index 381d8b3..e8e4057 100644
--- a/src/T2DLL/T2MoverDef.h
+++ b/src/T2DLL/T2MoverDef.h
@@ -2,13 +2,17 @@
 #include "common.h"
 #include "T2EquipDef.h"
 
-class AFX_EXT_CLASS T2MoverDef : public T2EquipDef {
+class AFX_CLASS_EXPORT T2MoverDef : public T2EquipDef {
 public:
 	T2MoverDef(DWORD, T2PluginSpecifier&, CResFile*, T2WorldDef*, T2MoverPlugin*);
 	virtual ~T2MoverDef();
+
+    int GetMinLength() const { return mMinLength; }
+    int GetMaxLength() const { return mMaxLength; }
+    virtual BOOL IsMover() { return true; }
+
 	virtual void GetName(CString&);
     virtual BOOL InitObject(T2Object*) { return false; }
-    virtual BOOL IsMover() { return true; }
     virtual CURSORTYPE QueryCursor(T2TowerDoc*, POINT, CString&, RECT&, POINT&, int, unsigned int, int);
     virtual int CalcMentenanceCostProc(const T2HaveOutViewObject*) const;
 	virtual AREACHECKCODE AreaCheck(T2TowerDoc*, RECT&, unsigned int, int);
@@ -29,21 +33,18 @@ public:
 
     BOOL InitObject(T2Mover*, const POINT&);
 
-	int GetMinLength() const { return mMinLength; }
-	int GetMaxLength() const { return mMaxLength; }
 	int GetSpeed(int i) const {
         return (i >= 0 && i < 3) ? mSpeed[i] : 0;
     }
-	BOOL IsStair() { return IsSetAttribute(kMoverAttrIsStair); }
-	void GetAddSize(RECT& r) const { r = mAddSize; }
-	int GetDefaultWait() const { return mDefaultWait; }
-	int GetMaxModule() const { return mMaxModule; }
-	void GetModuleInset(RECT& r) const { r = mModuleInset; }
-	int GetMaxStop() const { return mMaxStop; }
-	T2BitImage* GetOffBitMap() const { return mOffBitMap; }
-	int GetScore() const { return mScore; }
-
-	static unsigned int GetRequiredRequestSpace() { return 4; }
+	BOOL IsStair();
+	void GetAddSize(RECT& r) const;
+	int GetDefaultWait() const;
+	int GetMaxModule() const;
+	void GetModuleInset(RECT& r) const;
+	int GetMaxStop() const;
+	T2BitImage* GetOffBitMap() const;
+	int GetScore() const;
+	static unsigned int GetRequiredRequestSpace();
 
 protected:
     RECT mAddSize;
@@ -63,3 +64,39 @@ protected:
     int m1B0[3];
     T2BitImage *mOffBitMap;
 };
+
+inline BOOL T2MoverDef::IsStair() {
+    return IsSetAttribute(kMoverAttrIsStair);
+}
+
+inline void T2MoverDef::GetAddSize(RECT& r) const {
+    r = mAddSize;
+}
+
+inline int T2MoverDef::GetDefaultWait() const {
+    return mDefaultWait;
+}
+
+inline int T2MoverDef::GetMaxModule() const {
+    return mMaxModule;
+}
+
+inline void T2MoverDef::GetModuleInset(RECT& r) const {
+    r = mModuleInset;
+}
+
+inline int T2MoverDef::GetMaxStop() const {
+    return mMaxStop;
+}
+
+inline T2BitImage* T2MoverDef::GetOffBitMap() const {
+    return mOffBitMap;
+}
+
+inline int T2MoverDef::GetScore() const {
+    return mScore;
+}
+
+inline /*static*/ unsigned int T2MoverDef::GetRequiredRequestSpace() {
+    return 4;
+}