summaryrefslogtreecommitdiff
path: root/src/T2DLL
diff options
context:
space:
mode:
Diffstat (limited to 'src/T2DLL')
-rw-r--r--src/T2DLL/CLink.h5
-rw-r--r--src/T2DLL/T2DLL.DSP4
-rw-r--r--src/T2DLL/T2EquipDef.h6
-rw-r--r--src/T2DLL/T2Tenant.h43
-rw-r--r--src/T2DLL/T2ToolCallback.h2
-rw-r--r--src/T2DLL/T2WorldDef.h146
6 files changed, 94 insertions, 112 deletions
diff --git a/src/T2DLL/CLink.h b/src/T2DLL/CLink.h
index 1049b40..5e9d025 100644
--- a/src/T2DLL/CLink.h
+++ b/src/T2DLL/CLink.h
@@ -17,13 +17,8 @@ public:
void SetNext(CLink* l) { mNext = l; }
void SetPrev(CLink* l) { mPrev = l; }
-protected:
CLink *mNext;
CLink *mPrev;
-
- friend class CLinkIterator;
- friend class DbgPeopleView;
- friend class T2PeopleLinkIterator;
};
class AFX_CLASS_EXPORT CLinkIterator {
diff --git a/src/T2DLL/T2DLL.DSP b/src/T2DLL/T2DLL.DSP
index 69b46d8..aa54e41 100644
--- a/src/T2DLL/T2DLL.DSP
+++ b/src/T2DLL/T2DLL.DSP
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\inc" /I "Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\inc" /I "Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /D "HACKS" /Yu"stdafx.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ole32.lib winmm.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\lib" /libpath:"Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\lib"
+# ADD LINK32 ole32.lib winmm.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../T2DLL.dll" /pdbtype:sept /libpath:"Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\lib" /libpath:"Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\lib"
!ENDIF
diff --git a/src/T2DLL/T2EquipDef.h b/src/T2DLL/T2EquipDef.h
index 93f2290..cf09e52 100644
--- a/src/T2DLL/T2EquipDef.h
+++ b/src/T2DLL/T2EquipDef.h
@@ -3,6 +3,12 @@
#include "../common.h"
#include "T2ToolDef.h"
+enum {
+ kAreaCheckFlag100 = 0x100,
+ kAreaCheckFlag1000 = 0x1000,
+ kAreaCheckFlag10000 = 0x10000,
+};
+
class AFX_CLASS_EXPORT T2EquipDef : public T2ToolDef {
public:
T2EquipDef(DWORD type, T2PluginSpecifier& specifier, CResFile* resFile, T2WorldDef* worldDef, T2EquipPlugin* plugin);
diff --git a/src/T2DLL/T2Tenant.h b/src/T2DLL/T2Tenant.h
index 1336aa1..c9c881a 100644
--- a/src/T2DLL/T2Tenant.h
+++ b/src/T2DLL/T2Tenant.h
@@ -203,6 +203,26 @@ public:
int GetReserveCount() const;
void CancelReserve();
+ T2People *mFirstPeople;
+ T2People *m64;
+ int mMerchandiseCount;
+ int mMerchandise[4];
+ int mResideDay;
+ int mKindIndex;
+ int mMark;
+ BOOL mIsBind;
+ int mPeopleEstimate;
+ int mEstimate;
+ unsigned int mRelatedTenantID;
+ int mReserveCount;
+ int mBelongCount;
+ int mCustomerCount;
+ int mWorkCount;
+ int mTotalCustomer;
+ T2PeoplePtrList *mBelongList;
+ T2EquipPtrList *mRelatedTenantList;
+ unsigned int mTenantNumber;
+
protected:
virtual void LoadSelf(T2Archive& inArchive, T2TowerDoc* inDoc);
virtual void SaveSelf(T2Archive& inArchive);
@@ -223,29 +243,6 @@ protected:
BOOL CollectEmployeeFromPool(T2TowerDoc* inDoc, T2TenantMemberTableDef* inTable);
unsigned int CheckRouteFromPool(T2TowerDoc* inDoc, unsigned int inScore) const;
int GetConsumptionPower() const { return 0; }
-
- friend class T2EquipDef;
- friend class T2TenantArray;
-
- T2People *mFirstPeople;
- T2People *m64;
- int mMerchandiseCount;
- int mMerchandise[4];
- int mResideDay;
- int mKindIndex;
- int mMark;
- BOOL mIsBind;
- int mPeopleEstimate;
- int mEstimate;
- unsigned int mRelatedTenantID;
- int mReserveCount;
- int mBelongCount;
- int mCustomerCount;
- int mWorkCount;
- int mTotalCustomer;
- T2PeoplePtrList *mBelongList;
- T2EquipPtrList *mRelatedTenantList;
- unsigned int mTenantNumber;
};
inline /*virtual*/ void T2Tenant::ClearDrawMode() {
diff --git a/src/T2DLL/T2ToolCallback.h b/src/T2DLL/T2ToolCallback.h
index 2472215..c60adc9 100644
--- a/src/T2DLL/T2ToolCallback.h
+++ b/src/T2DLL/T2ToolCallback.h
@@ -4,6 +4,6 @@
class AFX_CLASS_EXPORT T2ToolCallback {
public:
- virtual void toolCallback_vf00(int unkParam1, T2ToolIconItem *inItem) = 0;
+ virtual void toolCallback_vf00(T2ToolWindow *inToolWindow, T2ToolIconItem *inItem) = 0;
};
#endif
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 {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:09:48 +0000