a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 04:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Restore original logic of CPed::WanderRange

Browse source
This commit is contained in:
Sergeanur 2020-06-04 04:31:04 +03:00
parent 04de93796b
commit 12717917cc
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/Range2D.cpp
View file

@ -18,5 +18,11 @@ CRange2D::DebugShowRange(float, int)
CVector2D CVector2D
CRange2D::GetRandomPointInRange() CRange2D::GetRandomPointInRange()
{ {
return CVector2D(CGeneral::GetRandomNumberInRange(min.x, max.x), CGeneral::GetRandomNumberInRange(min.y, max.y)); int distX = Abs(max.x - min.x);
int distY = Abs(max.y - min.y);
float outX = CGeneral::GetRandomNumber() % distX + min.x;
float outY = CGeneral::GetRandomNumber() % distY + min.y;
return CVector2D(outX, outY);
} }

11
src/core/Range3D.cpp
View file

@ -18,6 +18,13 @@ CRange3D::DebugShowRange(float, int)
CVector CVector
CRange3D::GetRandomPointInRange() CRange3D::GetRandomPointInRange()
{ {
return CVector(CGeneral::GetRandomNumberInRange(min.x, max.x), CGeneral::GetRandomNumberInRange(min.y, max.y), int distX = Abs(max.x - min.x);
CGeneral::GetRandomNumberInRange(min.z, max.z)); int distY = Abs(max.y - min.y);
int distZ = Abs(max.z - min.z);
float outX = CGeneral::GetRandomNumber() % distX + min.x;
float outY = CGeneral::GetRandomNumber() % distY + min.y;
float outZ = CGeneral::GetRandomNumber() % distZ + min.z;
return CVector(outX, outY, outZ);
} }

15
src/peds/Ped.cpp
View file

@ -57,6 +57,7 @@
#include "Timecycle.h" #include "Timecycle.h"
#include "ParticleObject.h" #include "ParticleObject.h"
#include "Floater.h" #include "Floater.h"
#include "Range2D.h"
#define CAN_SEE_ENTITY_ANGLE_THRESHOLD DEGTORAD(60.0f) #define CAN_SEE_ENTITY_ANGLE_THRESHOLD DEGTORAD(60.0f)
@ -14927,17 +14928,9 @@ CPed::WanderRange(void)
bool arrived = Seek(); bool arrived = Seek();
if (arrived) { if (arrived) {
Idle(); Idle();
if (((m_randomSeed % 256) + 3 * CTimer::GetFrameCounter()) % 1000 > 997) { if ((m_randomSeed + 3 * CTimer::GetFrameCounter()) % 1000 > 997) {
CVector2D newCoords2D = m_wanderRangeBounds->GetRandomPointInRange();
int xDiff = Abs(m_wanderRangeBounds[1].x - m_wanderRangeBounds[0].x); SetSeek(CVector(newCoords2D.x, newCoords2D.y, GetPosition().z), 2.5f);
int yDiff = Abs(m_wanderRangeBounds[1].y - m_wanderRangeBounds[0].y);
CVector newCoords(
(CGeneral::GetRandomNumber() % xDiff) + m_wanderRangeBounds[0].x,
(CGeneral::GetRandomNumber() % yDiff) + m_wanderRangeBounds[0].y,
GetPosition().z);
SetSeek(newCoords, 2.5f);
} }
} }
} }

2
src/peds/Ped.h
View file

@ -468,7 +468,7 @@ public:
CEntity *m_pCollidingEntity; CEntity *m_pCollidingEntity;
uint8 m_stateUnused; uint8 m_stateUnused;
uint32 m_timerUnused; uint32 m_timerUnused;
CVector2D *m_wanderRangeBounds; // array with 2 CVector2D (actually unused CRange2D class) - unused class CRange2D *m_wanderRangeBounds;
CWeapon m_weapons[WEAPONTYPE_TOTAL_INVENTORY_WEAPONS]; CWeapon m_weapons[WEAPONTYPE_TOTAL_INVENTORY_WEAPONS];
eWeaponType m_storedWeapon; eWeaponType m_storedWeapon;
uint8 m_currentWeapon; // eWeaponType uint8 m_currentWeapon; // eWeaponType