archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 11:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Phone start, ped spinning and cop car fix, and some love to CPed

Browse Source 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
This commit is contained in:
eray orçunus
2019-07-10 09:06:43 +03:00
parent 69ee4acc97
commit 86681c6f18
7 changed files with 191 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/control/Phones.cpp
View File

@ -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); }

28
src/control/Phones.h
View File

@ -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);