add Floor, add DefaultToolPalettemain

1 files changed, 65 insertions, 81 deletions

diff --git a/src/T2DLL/T2WorldDef.h b/src/T2DLL/T2WorldDef.h
index 8352cf3..96fbdad 100644
--- a/src/T2DLL/T2WorldDef.h
+++ b/src/T2DLL/T2WorldDef.h
@@ -101,6 +101,71 @@ public:
 	T2BlackOut* GetBlackOut();
 	BOOL IsBlackOut();
 
+    int mWorldType;
+    int mGroundLine;
+    int mLobbyHeight;
+    int _5C;
+    POINT mInitPos;
+    int mTopFloorLine;
+    int mBottomFloorLine;
+    int m70; // starting level
+    int m74; // starting month
+    int _78;
+    int _7C;
+    int _80;
+    int mNumOfGradeDef;
+    GradeDef mGradeDef[8];
+    int m148[5];
+    char m15C[20];
+    unsigned int mMinimumLevelForDust;
+    unsigned int mMinimumLevelForToilet;
+    unsigned int mToiletDenomi;
+    int m17C;
+    int mBGVUnit;
+    int mBGHUnit;
+    int mSkyVSize;
+    int mSkyHSize;
+    POINT m190; // crane size
+    T2WordDefArray *mWordDefArray;
+    T2BitImage *mSkyOffscreen;
+    T2BitImage *m1A0;
+    T2BitImage *m1A4[2];
+    T2BitImage *m1AC;
+    T2BitImage *m1B0;
+    T2BitImage *m1B4;
+    T2BitImage *m1B8;
+    T2BitImage *m1BC;
+    T2BitImage *m1C0;
+    T2BitImage *m1C4;
+    T2BitImage *m1C8;
+    T2BitImage *m1CC;
+    T2ImageObj *m1D0;
+    T2PoolDef *mPoolDef;
+    int _1D8;
+    int _1DC;
+    int _1E0;
+    int _1E4;
+    int _1E8;
+    int _1EC;
+    int _1F0;
+    T2BitImage *mImage;
+    int mHeight;
+    int mWidth;
+    RECT mBuildArea;
+    int _210;
+    BOOL _214;
+    int mOutViewKind;
+    T2PaletteAnimeDef *mPaletteAnimeDef;
+    T2SeasonParamDef *mSeasonParamDef;
+    T2ColdTableDef *mColdTableDef;
+    int m228;
+    int mCashAmount[8];
+    int mInitialFunds;
+    int mMoneyNumerator;
+    int mMoneyDenominator;
+    CString mMoneyUnit;
+    T2TowerEvent *mTowerEvent;
+
 protected:
 	virtual void DrawClock(T2MWControl* inControl, T2DateTime& inDateTime);
 	virtual void DrawCalendar(T2MWControl* inControl, T2DateTime& inDateTime, T2TowerDoc* inDoc);
@@ -143,87 +208,6 @@ protected:
 	T2PoolDef* MakePoolDef();
 	T2SeasonParamDef* MakeSeasonParamDef();
 	T2ColdTableDef* MakeColdTableDef();
-
-	friend class T2FloorInfo;
-	friend class T2MainWindow;
-	friend class T2Maru_Reggae;
-	friend class T2MetroRailway;
-	friend class T2OutDecoration;
-	friend class T2OuterObjDef;
-    friend class T2People;
-	friend class T2SantaClaus;
-	friend class T2TenantDef;
-	friend class T2Terrorist;
-    friend class T2ToolDef;
-	friend class T2ToolWindow;
-	friend class T2TowerDoc;
-	friend class T2WorldPlugin;
-	friend class T2VisitVIP;
-
-	int mWorldType;
-	int mGroundLine;
-	int mLobbyHeight;
-	int _5C;
-	POINT mInitPos;
-	int mTopFloorLine;
-	int mBottomFloorLine;
-	int m70; // starting level
-	int m74; // starting month
-	int _78;
-	int _7C;
-	int _80;
-	int mNumOfGradeDef;
-	GradeDef mGradeDef[8];
-	int m148[5];
-	char m15C[20];
-	unsigned int mMinimumLevelForDust;
-	unsigned int mMinimumLevelForToilet;
-	unsigned int mToiletDenomi;
-	int m17C;
-	int mBGVUnit;
-	int mBGHUnit;
-	int mSkyVSize;
-	int mSkyHSize;
-	POINT m190; // crane size
-	T2WordDefArray *mWordDefArray;
-	T2BitImage *mSkyOffscreen;
-	T2BitImage *m1A0;
-	T2BitImage *m1A4[2];
-	T2BitImage *m1AC;
-	T2BitImage *m1B0;
-	T2BitImage *m1B4;
-	T2BitImage *m1B8;
-	T2BitImage *m1BC;
-	T2BitImage *m1C0;
-	T2BitImage *m1C4;
-	T2BitImage *m1C8;
-	T2BitImage *m1CC;
-	T2ImageObj *m1D0;
-	T2PoolDef *mPoolDef;
-	int _1D8;
-	int _1DC;
-	int _1E0;
-	int _1E4;
-	int _1E8;
-	int _1EC;
-	int _1F0;
-	T2BitImage *mImage;
-	int mHeight;
-	int mWidth;
-	RECT mBuildArea;
-	int _210;
-	BOOL _214;
-	int mOutViewKind;
-	T2PaletteAnimeDef *mPaletteAnimeDef;
-	T2SeasonParamDef *mSeasonParamDef;
-	T2ColdTableDef *mColdTableDef;
-	int m228;
-	int mCashAmount[8];
-	int mInitialFunds;
-	int mMoneyNumerator;
-	int mMoneyDenominator;
-	CString mMoneyUnit;
-	T2TowerEvent *mTowerEvent;
 };
 
 inline /*virtual*/ int T2WorldDef::ExchangeMoney(int v) const {