From c2efba6907fab934a04959b9bb644cf7141cc955 Mon Sep 17 00:00:00 2001 From: Ash Wolf Date: Sat, 1 Jul 2023 23:04:04 +0100 Subject: matched T2DLL as well as i can --- src/T2DLL/T2RequestIDArray.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/T2DLL/T2RequestIDArray.cpp') diff --git a/src/T2DLL/T2RequestIDArray.cpp b/src/T2DLL/T2RequestIDArray.cpp index 4228bf6..8758856 100644 --- a/src/T2DLL/T2RequestIDArray.cpp +++ b/src/T2DLL/T2RequestIDArray.cpp @@ -82,10 +82,10 @@ void T2RequestIDArray::RemoveRequest(T2TowerDoc* towerDoc, int index, ERequestUp void T2RequestIDArray::Union(T2RequestIDArray* otherArray) { LArrayIterator iterator(*otherArray); - unsigned int requestID; + unsigned int theReqID; - while (iterator.Next(&requestID)) - InsertItemsAt(1, mItemCount + 1, &requestID); + while (iterator.Next(&theReqID)) + InsertItemsAt(1, mItemCount + 1, &theReqID); } void T2RequestIDArray::MoverIDChanged(T2FloorInfo* floorInfo, unsigned int moverID) { @@ -100,33 +100,33 @@ void T2RequestIDArray::MoverIDChanged(T2FloorInfo* floorInfo, unsigned int mover } void T2RequestIDArray::StopRemoved(T2TowerDoc* towerDoc, int y) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); #line 142 - _ASSERT(floorInfo); + _ASSERT(theFloorInfo != NULL); LArrayIterator iterator(*this); - unsigned int requestID; + unsigned int theReqID; - while (iterator.Next(&requestID)) { - if (requestID) { - T2Request *request = floorInfo->GetRequest(requestID); - if (request) - request->StopRemoved(towerDoc, y); + while (iterator.Next(&theReqID)) { + if (theReqID) { + T2Request *theRequest = theFloorInfo->GetRequest(theReqID); + if (theRequest) + theRequest->StopRemoved(towerDoc, y); } } } void T2RequestIDArray::ModuleRemoved(T2TowerDoc* towerDoc, unsigned int moduleIndex) { - T2FloorInfo *floorInfo = towerDoc->towerDoc_vf12C(); + T2FloorInfo *theFloorInfo = towerDoc->towerDoc_vf12C(); LArrayIterator iterator(*this); - unsigned int requestID; + unsigned int theReqID; - while (iterator.Next(&requestID)) { - if (requestID) { - T2Request *request = floorInfo->GetRequest(requestID); - if (request && request->GetModuleIndex() == moduleIndex) - request->CancelReservingModule(); + while (iterator.Next(&theReqID)) { + if (theReqID) { + T2Request *theRequest = theFloorInfo->GetRequest(theReqID); + if (theRequest && theRequest->GetModuleIndex() == moduleIndex) + theRequest->CancelReservingModule(); } } } -- cgit v1.2.3