diff options
Diffstat (limited to '')
| -rw-r--r-- | src/T2DLL/T2People.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/T2DLL/T2People.cpp b/src/T2DLL/T2People.cpp index ce92a22..38fd272 100644 --- a/src/T2DLL/T2People.cpp +++ b/src/T2DLL/T2People.cpp @@ -195,13 +195,13 @@ unsigned int T2People::GetCurTenantID() const { case kStatus11: if (IsStartTime(towerDoc->towerDoc_vf120()->GetRawMinutes())) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); - T2Tenant *tenant = floorInfo->GetTenant(mCurrEquipID); - if (tenant) { + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); + T2Tenant *theCurrTenant = theFloorInfo->GetTenant(mCurrEquipID); + if (theCurrTenant) { if (IsSetDestination()) - tenant->LeaveTenant(towerDoc, this); + theCurrTenant->LeaveTenant(towerDoc, this); else - tenant->PushOutPeople(towerDoc, this); + theCurrTenant->PushOutPeople(towerDoc, this); } } break; @@ -235,8 +235,8 @@ unsigned int T2People::GetCurTenantID() const { case kStatus10: if (!IsWalk()) { if (IsReachDestination(towerDoc->towerDoc_vf12C()->GetGroundLine() - 1)) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); - T2Tenant *theDstTenant = floorInfo->GetTenant(mDstTenant); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); + T2Tenant *theDstTenant = theFloorInfo->GetTenant(mDstTenant); if (theDstTenant) theDstTenant->EnterTenant(towerDoc, this); } @@ -273,8 +273,8 @@ void T2People::IdleWaitMover(T2TowerDoc* towerDoc) { BOOL didChange = IncStress(5); if (mStress >= 300) { - T2Request *request = theFloorInfo->GetRequest(mCurrEquipID); - request->Leave(this); + T2Request *theRequest = theFloorInfo->GetRequest(mCurrEquipID); + theRequest->Leave(this); JumpToDestination(towerDoc); IncEstimate(-50); didChange = false; @@ -359,11 +359,11 @@ BOOL T2People::MoveToParking(T2TowerDoc* towerDoc) { BOOL T2People::MoveToSubway(T2TowerDoc* towerDoc) { BOOL ok = false; - T2TowerEvent *event = towerDoc->mWorldDef->GetTowerEvent(); - T2DateTime *now = towerDoc->towerDoc_vf120(); - T2Transport *metro = event->GetMetroRailway(); + T2TowerEvent *theEvent = towerDoc->mWorldDef->GetTowerEvent(); + T2DateTime *theCurrTime = towerDoc->towerDoc_vf120(); + T2Transport *metro = theEvent->GetMetroRailway(); if (metro) { - T2Transport *available = metro->GetAvailable(now); + T2Transport *available = metro->GetAvailable(theCurrTime); if (available) { available->Enter(this); ok = true; @@ -433,7 +433,7 @@ void T2People::SolveNoRoute(T2TowerDoc* towerDoc) { if (!FindRoute(towerDoc)) { changed = IncStress(30) && IsWalk(); if (mStress >= 300) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); if (IsWalk()) { // "道がないよ～" - there is no way CString theMessage = "\x93\xB9\x82\xAA\x82\xC8\x82\xA2\x82\xE6\x81\x60"; @@ -441,12 +441,12 @@ void T2People::SolveNoRoute(T2TowerDoc* towerDoc) { RECT theRect; CalcWalkingSilhouetteArea(theRect); - floorInfo->SetTenantDrawModeByRect(theRect, DrawMode1); + theFloorInfo->SetTenantDrawModeByRect(theRect, DrawMode1); towerDoc->GetTowerMainView()->tmv_vf128(theRect, false); } - T2Tenant *tenant = floorInfo->GetTenant(mCurrEquipID); - tenant->Leave(this); + T2Tenant *theFloor = theFloorInfo->GetTenant(mCurrEquipID); + theFloor->Leave(this); JumpToDestination(towerDoc); IncEstimate(-150); } @@ -462,12 +462,12 @@ void T2People::SolveNoRoute(T2TowerDoc* towerDoc) { BOOL T2People::FindRoute(T2TowerDoc* towerDoc) { BOOL ok = false; int status = mStatus; - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); - if (floorInfo) { - mCurrDestPos = floorInfo->GetEntrancePt(mDstTenant); + if (theFloorInfo) { + mCurrDestPos = theFloorInfo->GetEntrancePt(mDstTenant); if (mCurPosition.y >= 0) { - if (mCurrEquipID == floorInfo->GetEntranceFloorID(mDstTenant)) { + if (mCurrEquipID == theFloorInfo->GetEntranceFloorID(mDstTenant)) { if (mDstTenant == 1 || mDstTenant == 2) status = kStatus12; else if (!IsSetSpecialFlag(kSpecialFlag40)) @@ -505,18 +505,18 @@ BOOL T2People::FindRoute(T2TowerDoc* towerDoc) { } void T2People::JumpToDestination(T2TowerDoc* towerDoc) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); - POINT entrancePt = floorInfo->GetEntrancePt(mDstTenant); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); + POINT theDestPos = theFloorInfo->GetEntrancePt(mDstTenant); - mCurPosition = entrancePt; - T2Tenant *tenant = floorInfo->GetFloor(mCurPosition.y, mCurPosition.x); - tenant->Enter(this); + mCurPosition = theDestPos; + T2Tenant *theFloor = theFloorInfo->GetFloor(mCurPosition.y, mCurPosition.x); + theFloor->Enter(this); } void T2People::GoOutTower(T2TowerDoc* towerDoc) { - T2Tenant *tenant = towerDoc->towerDoc_vf12C()->GetTenant(mCurrEquipID); - if (tenant) - tenant->Leave(this); + T2Tenant *theFloor = towerDoc->towerDoc_vf12C()->GetTenant(mCurrEquipID); + if (theFloor) + theFloor->Leave(this); T2Pool *pool = towerDoc->towerDoc_vf130(); pool->Enter(this); @@ -543,10 +543,10 @@ void T2People::IdleSearchedPerson(T2TowerDoc* towerDoc) { case kStatus2: { - T2TowerMainView *mainView = towerDoc->GetTowerMainView(); + T2TowerMainView *theView = towerDoc->GetTowerMainView(); RECT area; CalcWalkingSilhouetteArea(area); - mainView->tmv_vf128(area, false); + theView->tmv_vf128(area, false); mStatus = kStatus3; break; } @@ -656,24 +656,24 @@ BOOL T2People::WalkSearchedPersonLeft(T2TowerDoc* towerDoc) { BOOL T2People::IsReachDestination(int y) { BOOL ok = false; - int var = 16; + int theWalkWidth = 16; if (mDirection != 1) { - if ((mCurPosition.x + var) >= mCurrDestPos.x) { - var = mCurrDestPos.x - mCurPosition.x; + if ((mCurPosition.x + theWalkWidth) >= mCurrDestPos.x) { + theWalkWidth = mCurrDestPos.x - mCurPosition.x; ok = true; } - mCurPosition.x += var; + mCurPosition.x += theWalkWidth; } else { - if ((mCurPosition.x - var) <= mCurrDestPos.x) { - var = mCurPosition.x - mCurrDestPos.x; + if ((mCurPosition.x - theWalkWidth) <= mCurrDestPos.x) { + theWalkWidth = mCurPosition.x - mCurrDestPos.x; ok = true; } - mCurPosition.x -= var; + mCurPosition.x -= theWalkWidth; } if (mCurPosition.y != y) - IncStress(var / 4); + IncStress(theWalkWidth / 4); return ok; } @@ -1088,16 +1088,16 @@ void T2People::DrawAt(T2TowerDoc* towerDoc, T2Equip* equip, POINT pt) { } } -void T2People::Duplicate(T2TowerDoc* towerDoc) { +void T2People::Duplicate(T2TowerDoc* inTowerDoc) { #line 1430 - _ASSERT(towerDoc); + _ASSERT(inTowerDoc != NULL); - T2Pool *pool = towerDoc->mPool; + T2Pool *pool = inTowerDoc->mPool; if (pool) pool->DuplicatePeople(mPeopleType); } -void T2People::Remove(T2TowerDoc* towerDoc, unsigned int id) { +void T2People::Remove(T2TowerDoc* inTowerDoc, unsigned int id) { BOOL flag = false; if (mHomeTenant == id) { @@ -1110,7 +1110,7 @@ void T2People::Remove(T2TowerDoc* towerDoc, unsigned int id) { } if (flag && IsGeneral() && GetStatus() == kStatus1) { - T2Pool *pool = towerDoc->towerDoc_vf130(); + T2Pool *pool = inTowerDoc->towerDoc_vf130(); if (pool) pool->RemovePeople(this); } |