From c2efba6907fab934a04959b9bb644cf7141cc955 Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Sat, 1 Jul 2023 23:04:04 +0100
Subject: matched T2DLL as well as i can

---
 src/T2DLL/T2MoverModule.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/src/T2DLL/T2MoverModule.cpp b/src/T2DLL/T2MoverModule.cpp
index d4a267b..ae7de97 100644
--- a/src/T2DLL/T2MoverModule.cpp
+++ b/src/T2DLL/T2MoverModule.cpp
@@ -27,23 +27,23 @@ T2MoverModule::T2MoverModule() {
 
 /*virtual*/ void T2MoverModule::SetUsed(BOOL used) {
     if (!used) {
-        T2TowerDoc *towerDoc = GetCurrentT2TowerDoc();
+        T2TowerDoc *theTowerDoc = GetCurrentT2TowerDoc();
 #line 35
-        ASSERT(towerDoc);
+        ASSERT(theTowerDoc != NULL);
 
-        T2NameList *nameList = towerDoc->mNameDB;
+        T2NameList *theNameDB = theTowerDoc->mNameDB;
 #line 38
-        ASSERT(nameList);
+        ASSERT(theNameDB != NULL);
 
-        T2Name *name = nameList->Search(this, true);
+        T2Name *name = theNameDB->Search(this, true);
         if (name) {
-            nameList->RemoveName(name);
+            theNameDB->RemoveName(name);
             delete name;
         }
 
-        name = nameList->Search(this, false);
+        name = theNameDB->Search(this, false);
         if (name) {
-            nameList->RemoveName(name);
+            theNameDB->RemoveName(name);
             delete name;
         }
     }
@@ -52,17 +52,17 @@ T2MoverModule::T2MoverModule() {
 }
 
 /*virtual*/ void T2MoverModule::RemoveContents(T2TowerDoc* towerDoc) {
-    T2FloorInfo *floorInfo = towerDoc->mFloorInfo;
+    T2FloorInfo *theFloorInfo = towerDoc->mFloorInfo;
 
     while (mLink1) {
-        T2People *people = (T2People *) mLink1;
-        Leave(people);
-
-        POINT destPos = people->GetCurrDestPos();
-        T2Tenant *floor = floorInfo->GetFloor(destPos.y, destPos.x);
-        if (floor) {
-            floor->Enter(people);
-            people->IncEstimate(-100);
+        T2People *thePeople = (T2People *) mLink1;
+        Leave(thePeople);
+
+        POINT destPos = thePeople->GetCurrDestPos();
+        T2Tenant *theFloor = theFloorInfo->GetFloor(destPos.y, destPos.x);
+        if (theFloor) {
+            theFloor->Enter(thePeople);
+            thePeople->IncEstimate(-100);
         }
     }
 }
-- 
cgit v1.2.3