The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-27 11:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from erorcun/erorcun

Browse Source 
Ped variables fix
This commit is contained in:
aap 2019-08-11 23:37:39 +02:00 committed by GitHub
commit c3c9b1c40e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/peds/Ped.cpp
View File

@ -53,24 +53,27 @@ WRAPPER void CPed::SetRadioStation(void) { EAXJMP(0x4D7BC0); }
WRAPPER void CPed::MakeTyresMuddySectorList(CPtrList&) { EAXJMP(0x53CFD0); }
WRAPPER void CPed::ProcessObjective(void) { EAXJMP(0x4D94E0); }
CPed *gapTempPedList[50];
uint16 gnNumTempPedList;
bool &CPed::bNastyLimbsCheat = *(bool*)0x95CD44;
bool &CPed::bPedCheat2 = *(bool*)0x95CD5A;
bool &CPed::bPedCheat3 = *(bool*)0x95CD59;
CColPoint &CPed::aTempPedColPts = *(CColPoint*)0x62DB14;
CColPoint &aTempPedColPts = *(CColPoint*)0x62DB14;
// TODO: CommentWaitTime should be hardcoded into exe, and it isn't reversed yet.
CPedAudioData (&CPed::CommentWaitTime)[38] = *(CPedAudioData(*)[38]) * (uintptr*)0x5F94C4;
uint16 &CPed::nPlayerInComboMove = *(uint16*)0x95CC58;
FightMove (&CPed::tFightMoves)[24] = * (FightMove(*)[24]) * (uintptr*)0x5F9844;
uint16 nPlayerInComboMove; // 0x95CC58
FightMove (&tFightMoves)[24] = * (FightMove(*)[24]) * (uintptr*)0x5F9844;
uint16 &CPed::nThreatReactionRangeMultiplier = *(uint16*)0x5F8C98;
CVector &CPed::vecPedCarDoorAnimOffset = *(CVector*)0x62E030;
CVector &CPed::vecPedCarDoorLoAnimOffset = *(CVector*)0x62E03C;
CVector &CPed::vecPedVanRearDoorAnimOffset = *(CVector*)0x62E048;
CVector &CPed::vecPedQuickDraggedOutCarAnimOffset = *(CVector*)0x62E06C;
CVector &vecPedCarDoorAnimOffset = *(CVector*)0x62E030;
CVector &vecPedCarDoorLoAnimOffset = *(CVector*)0x62E03C;
CVector &vecPedVanRearDoorAnimOffset = *(CVector*)0x62E048;
CVector &vecPedQuickDraggedOutCarAnimOffset = *(CVector*)0x62E06C;
CVector2D &CPed::ms_vec2DFleePosition = *(CVector2D*)0x6EDF70;
@ -1994,9 +1997,6 @@ CPed::SortPeds(CPed **list, int min, int max)
void
CPed::BuildPedLists(void)
{
static CPed *gapTempPedList[10]; // unsorted
static int16 gnNumTempPedList;
if ((CTimer::GetFrameCounter() + (m_randomSeed % 256)) % 16) {
for(int i = 0; i < 10; ) {

7
src/peds/Ped.h
View File

@ -676,17 +676,10 @@ public:
// set by 0482:set_threat_reaction_range_multiplier opcode
static uint16 &nThreatReactionRangeMultiplier;
static CVector &vecPedCarDoorAnimOffset;
static CVector &vecPedCarDoorLoAnimOffset;
static CVector &vecPedVanRearDoorAnimOffset;
static CVector &vecPedQuickDraggedOutCarAnimOffset;
static bool &bNastyLimbsCheat;
static bool &bPedCheat2;
static bool &bPedCheat3;
static CVector2D &ms_vec2DFleePosition;
static CColPoint &aTempPedColPts;
static uint16 &nPlayerInComboMove;
static FightMove (&tFightMoves)[24];
static CPedAudioData (&CommentWaitTime)[38];
#ifndef FINAL