From 5e61c1280c15ab9969b94cd360cafd4a11b2dd30 Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Wed, 5 Jul 2023 19:04:06 +0100
Subject: matched T2.exe

---
 src/T2DLL/T2Request.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/T2DLL/T2Request.cpp')

diff --git a/src/T2DLL/T2Request.cpp b/src/T2DLL/T2Request.cpp
index 3ff951a..83c52f3 100644
--- a/src/T2DLL/T2Request.cpp
+++ b/src/T2DLL/T2Request.cpp
@@ -63,8 +63,8 @@ void T2Request::InitRequest(T2FloorInfo* floorInfo, unsigned int moverID, POINT
 }
 
 void T2Request::RemoveRequest(T2TowerDoc* towerDoc) {
-    T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C();
-    T2TowerMainView *theView = towerDoc->GetTowerMainView();
+    T2FloorInfo *theFloorInfo = towerDoc->GetFloorInfo();
+    T2TowerMainView *theView = towerDoc->GetMainView();
 
     RemoveContents(theFloorInfo);
 
@@ -83,7 +83,7 @@ void T2Request::RemoveRequest(T2TowerDoc* towerDoc) {
     theFloorInfo->SetTenantDrawModeByRect(thePrevArea, DrawMode1);
 
     if (theView)
-        theView->tmv_vf128(theNextArea, false);
+        theView->InvalUnitRect(theNextArea, false);
 }
 
 void T2Request::RemoveContents(T2FloorInfo* floorInfo) {
@@ -113,7 +113,7 @@ void T2Request::RemoveContents(T2FloorInfo* floorInfo) {
 }
 
 void T2Request::StopRemoved(T2TowerDoc* towerDoc, int y) {
-    T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C();
+    T2FloorInfo *theFloorInfo = towerDoc->GetFloorInfo();
     T2Tenant *theFloor = theFloorInfo->GetFloor(mHeadPosition.y, mHeadPosition.x);
 #line 138
     _ASSERT(theFloor != NULL);
@@ -314,7 +314,7 @@ T2People* T2Request::LeaveFirst() {
 
 BOOL T2Request::Regist(T2TowerDoc* towerDoc, T2People* people) {
     BOOL isRegist = false;
-    T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C();
+    T2FloorInfo *theFloorInfo = towerDoc->GetFloorInfo();
     POINT headPt = mHeadPosition;
     POINT curPt = people->GetCurPosition();
 
@@ -417,7 +417,7 @@ T2People* T2Request::RemoveOffPeople() {
 
 /*virtual*/ unsigned int T2Request::Idle(T2TowerDoc* towerDoc) {
     unsigned int result = 0;
-    T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C();
+    T2FloorInfo *theFloorInfo = towerDoc->GetFloorInfo();
 
     if (mNumOfContent > 0 && !IsModuleReserved()) {
         T2Mover *theMover = theFloorInfo->GetMover(mMoverID);
@@ -425,7 +425,7 @@ T2People* T2Request::RemoveOffPeople() {
             theMover->SetCheckRequest(true);
     }
 
-    T2TowerMainView *theView = towerDoc->GetTowerMainView();
+    T2TowerMainView *theView = towerDoc->GetMainView();
 #line 541
     _ASSERT(theView != NULL);
 
@@ -434,20 +434,20 @@ T2People* T2Request::RemoveOffPeople() {
     if (mPeopleRemoved) {
         CalcOnArea(area);
         theFloorInfo->SetTenantDrawModeByRect(area, DrawMode1);
-        theView->tmv_vf128(area, false);
+        theView->InvalUnitRect(area, false);
     } else if (mOnPeople || mOffPeople) {
         CalcOnArea(area);
-        theView->tmv_vf128(area, false);
+        theView->InvalUnitRect(area, false);
     }
 
     if (m44) {
         CalcPrevArea(area);
         theFloorInfo->SetTenantDrawModeByRect(area, DrawMode1);
-        theView->tmv_vf128(area, false);
+        theView->InvalUnitRect(area, false);
     }
 
     if (CalcIncQueueArea(area))
-        theView->tmv_vf128(area, false);
+        theView->InvalUnitRect(area, false);
 
     return result;
 }
@@ -522,7 +522,7 @@ void* T2Request::GetInfoClickDown(T2TowerDoc*, POINT) {
 }
 
 void T2Request::BreakoutEmergency(T2TowerDoc* towerDoc) {
-    RemoveContents(towerDoc->towerDoc_vf12C());
+    RemoveContents(towerDoc->GetFloorInfo());
 }
 
 /*virtual*/ void T2Request::LoadSelf(T2Archive& archive, T2TowerDoc* towerDoc) {
@@ -774,6 +774,6 @@ void T2Request::CalcValidArea(RECT& rect) {
 /*virtual*/ void T2Request::DrawHitMask(T2TowerDoc* towerDoc) {
     RECT area;
     CalcValidArea(area);
-    UT2Coordinate::UnitToQD(area, towerDoc->towerDoc_vf108());
-    towerDoc->towerDoc_vf10C()->FillRect(area, 1);
+    UT2Coordinate::UnitToQD(area, towerDoc->GetZoomLevel());
+    towerDoc->GetImage()->FillRect(area, 1);
 }
-- 
cgit v1.2.3