matched T2.exe

1 files changed, 11 insertions, 11 deletions

diff --git a/src/T2DLL/T2VisitVIP.cpp b/src/T2DLL/T2VisitVIP.cpp
index c411321..0b190d9 100644
--- a/src/T2DLL/T2VisitVIP.cpp
+++ b/src/T2DLL/T2VisitVIP.cpp
@@ -72,10 +72,10 @@ T2VisitVIP::T2VisitVIP(T2TowerEvent* inTowerEvent, int inSubID, int inLevelBit,
     mPeopleID = 0;
     mTenantID = 0;
 
-    if (mGrade <= theWorldDef->mNumOfGradeDef && inDoc->towerDoc_vf138() == mGrade) {
+    if (mGrade <= theWorldDef->mNumOfGradeDef && inDoc->GetLevel() == mGrade) {
         GradeDef *theGrade = &theWorldDef->mGradeDef[mGrade - 1];
         if ((theGrade->m0 & mVisitFlag) != 0 && (inDoc->mA0 & mVisitFlag) == 0) {
-            T2Pool *thePool = inDoc->towerDoc_vf130();
+            T2Pool *thePool = inDoc->GetPool();
             if (thePool && thePool->GetPopulation() > (theGrade->m4 / 2)) {
                 T2Tenant *theTenant = NULL;
                 CFilePlugin *thePlugin = NULL;
@@ -113,7 +113,7 @@ T2VisitVIP::T2VisitVIP(T2TowerEvent* inTowerEvent, int inSubID, int inLevelBit,
                             RECT rect;
                             theTenant->GetEquipArea(rect);
 
-                            int floorNum = inDoc->towerDoc_vf12C()->UnitToFloor(rect.top);
+                            int floorNum = inDoc->GetFloorInfo()->UnitToFloor(rect.top);
                             if (floorNum < 0) {
                                 text += 'B';
                                 floorNum = 0 - floorNum;
@@ -123,7 +123,7 @@ T2VisitVIP::T2VisitVIP(T2TowerEvent* inTowerEvent, int inSubID, int inLevelBit,
                             // "階" - floor
                             text += "\x8A\x4B";
 
-                            int roomNum = theTenant->GetRoomNumber(inDoc->towerDoc_vf12C());
+                            int roomNum = theTenant->GetRoomNumber(inDoc->GetFloorInfo());
                             if (roomNum < 0) {
                                 text += 'B';
                                 roomNum = 0 - roomNum;
@@ -289,14 +289,14 @@ BOOL T2VisitVIP::DoReception(T2TowerDoc* inDoc) {
                 } else {
                     // "不満な様子です。\n\n「" - I'm dissatisfied.
                     str += "\x95\x73\x96\x9E\x82\xC8\x97\x6C\x8E\x71\x82\xC5\x82\xB7\x81\x42\x0A\x0A\x81\x75";
-                    T2Tenant *theTenant = inDoc->towerDoc_vf12C()->GetTenant(mTenantID);
+                    T2Tenant *theTenant = inDoc->GetFloorInfo()->GetTenant(mTenantID);
                     if (theTenant) {
                         CString tmp;
 
                         RECT rect;
                         theTenant->GetEquipArea(rect);
 
-                        int floorNum = inDoc->towerDoc_vf12C()->UnitToFloor(rect.top);
+                        int floorNum = inDoc->GetFloorInfo()->UnitToFloor(rect.top);
                         if (floorNum < 0) {
                             str += 'B';
                             floorNum = 0 - floorNum;
@@ -327,7 +327,7 @@ BOOL T2VisitVIP::DoReception(T2TowerDoc* inDoc) {
                     delete theName;
                 }
 
-                thePool = inDoc->towerDoc_vf130();
+                thePool = inDoc->GetPool();
                 thePool->DeadVIP(thePeople);
 
                 return true;
@@ -336,7 +336,7 @@ BOOL T2VisitVIP::DoReception(T2TowerDoc* inDoc) {
                 if (mCheckedIn) {
                     T2DateTime *theNow = inDoc->mNow;
                     if (theNow && theNow->GetRawMinutes() == 600) {
-                        T2Tenant *theTenant = inDoc->towerDoc_vf12C()->GetTenant(mTenantID);
+                        T2Tenant *theTenant = inDoc->GetFloorInfo()->GetTenant(mTenantID);
                         if (theTenant && theTenant->IsBelongPeople(thePeople)) {
                             theTenant->SetStatus(kTenantStatus34);
                             mCheckedIn = false;
@@ -362,21 +362,21 @@ BOOL T2VisitVIP::GetDestinationTennant(DWORD inPluginID, T2Tenant*& outTenant, C
 
     while ((theSpecifier = theT2PluginLoader->GetNext(pos))) {
         if (theSpecifier->mID == inPluginID) {
-            outPlugin = theTowerDoc->mTenantPluginsListOther->GetItem(theSpecifier->mID);
+            outPlugin = theTowerDoc->mTenantPlugins->GetItem(theSpecifier->mID);
             outSpecifier = theSpecifier;
             break;
         }
     }
 
     if (outPlugin) {
-        T2FloorInfo *theFloorInfo = theTowerDoc->towerDoc_vf12C();
+        T2FloorInfo *theFloorInfo = theTowerDoc->GetFloorInfo();
         if (theFloorInfo) {
             T2Tenant *theTenant = theFloorInfo->GetTenantByPID(inPluginID);
             if (theTenant) {
                 unsigned int registID = theTenant->GetRegistID();
                 if (registID == kTenantRegistID1) {
                     theTenant = NULL;
-                    T2RegistedTenantDB *theDB = theTowerDoc->towerDoc_vf174();
+                    T2RegistedTenantDB *theDB = theTowerDoc->GetRegistedTenantDB();
                     if (theDB) {
                         T2EquipPtrList *theList = theDB->GetList(kTenantRegistID1);
                         if (theList) {