diff options
author | aap <aap@papnet.eu> | 2019-07-10 15:06:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-10 15:06:08 +0200 |
commit | 80e0409d6a1bfd002b98af8d598ec940b6d6facb (patch) | |
tree | 5e0a6dcdbf8f1566974c0514986ab7b61e5c067a /src/control | |
parent | fixed COMMAND_IS_PLAYER_IN_AREA_3D (diff) | |
parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
download | re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.gz re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.bz2 re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.lz re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.xz re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.zst re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.zip |
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/Phones.cpp | 37 | ||||
-rw-r--r-- | src/control/Phones.h | 28 |
2 files changed, 65 insertions, 0 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index fa4f83e5..1d3a9777 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -2,5 +2,42 @@ #include "patcher.h" #include "Phones.h" +CPhoneInfo &gPhoneInfo = * (CPhoneInfo*) * (uintptr*)0x732A20; + +int +CPhoneInfo::FindNearestFreePhone(CVector *pos) +{ + int nearestPhoneId = -1; + float nearestPhoneDist = 60.0f; + + for (int phoneId = 0; phoneId < m_nMax; phoneId++) { + + if (gPhoneInfo.m_aPhones[phoneId].m_nState == 0) { + float phoneDist = (m_aPhones[phoneId].m_vecPos - *pos).Magnitude2D(); + + if (phoneDist < nearestPhoneDist) { + nearestPhoneDist = phoneDist; + nearestPhoneId = phoneId; + } + } + } + return nearestPhoneId; +} + +bool +CPhoneInfo::PhoneAtThisPosition(CVector pos) +{ + for (int phoneId = 0; phoneId < m_nMax; phoneId++) { + if (pos.x == m_aPhones[phoneId].m_vecPos.x && pos.y == m_aPhones[phoneId].m_vecPos.y) + return true; + } + return false; +} + +STARTPATCHES + InjectHook(0x42F720, &CPhoneInfo::FindNearestFreePhone, PATCH_JUMP); + InjectHook(0x42FD50, &CPhoneInfo::PhoneAtThisPosition, PATCH_JUMP); +ENDPATCHES + WRAPPER void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F570); } WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); } diff --git a/src/control/Phones.h b/src/control/Phones.h index a29043ed..7ac34c3a 100644 --- a/src/control/Phones.h +++ b/src/control/Phones.h @@ -1,6 +1,34 @@ #pragma once +#include "Physical.h" #include "AnimBlendAssociation.h" +struct CPhone +{ + CVector m_vecPos; + uint16 *m_apMessages[6]; + int32 field_24; + CEntity *m_pEntity; + int32 m_nState; + uint8 field_30; +}; + +static_assert(sizeof(CPhone) == 0x34, "CPhone: error"); + +class CPhoneInfo { +public: + int32 m_nMax; + int32 m_nNum; + CPhone m_aPhones[50]; + + CPhoneInfo() { } + ~CPhoneInfo() { } + + int FindNearestFreePhone(CVector*); + bool PhoneAtThisPosition(CVector); +}; + +extern CPhoneInfo &gPhoneInfo; + void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg); void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg);
\ No newline at end of file |