diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-26 17:20:31 +0300 |
| commit | 3dee880c2941417c9e5ec42297da65f27ab9c5ca (patch) | |
| tree | 93f0daf6f0fdc04fb2898a202157d3d9ec078ffb /src/control/Phones.cpp | |
| parent | 542e746f66593ac63eb1a269ba9708593a627b24 (diff) | |
| parent | 35bd3f514d2a673cf17db78103b17c169d2027e1 (diff) | |
merge
Diffstat (limited to 'src/control/Phones.cpp')
| -rw-r--r-- | src/control/Phones.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index f8005899..ef978868 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -15,6 +15,8 @@ CPhone *&CPhoneInfo::pickedUpPhone = *(CPhone**)0x6283B0; bool &CPhoneInfo::isPhoneBeingPickedUp = *(bool*)0x6283B4; CPed *&CPhoneInfo::pedWhoPickingUpPhone = *(CPed**)0x6283B8; +WRAPPER void CPhoneInfo::Update(void) { EAXJMP(0x42F7A0); } + int CPhoneInfo::FindNearestFreePhone(CVector *pos) { @@ -151,8 +153,8 @@ CPhoneInfo::Initialise(void) pickedUpPhone = nil; m_nMax = 0; m_nNum = 0; - for (int v5 = pool->GetSize() - 1; v5 >= 0; v5--) { - CBuilding *building = pool->GetSlot(v5); + for (int i = pool->GetSize() - 1; i >= 0; i--) { + CBuilding *building = pool->GetSlot(i); if (building) { if (building->m_modelIndex == MI_PHONEBOOTH1) { CPhone *maxPhone = &m_aPhones[m_nMax]; |