diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-10-02 16:39:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 16:39:15 +0200 |
| commit | 72f342245dcb876b974bf41cabeec4ccc6656159 (patch) | |
| tree | 5ed235c96acbbbaa6bb01251be2553a6ca91246b /src/control | |
| parent | Mark audio code which is the same in re3 as done (diff) | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar.gz re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar.bz2 re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar.lz re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar.xz re3-72f342245dcb876b974bf41cabeec4ccc6656159.tar.zst re3-72f342245dcb876b974bf41cabeec4ccc6656159.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/GameLogic.cpp | 2 | ||||
| -rw-r--r-- | src/control/PathFind.cpp | 4 | ||||
| -rw-r--r-- | src/control/PathFind.h | 3 | ||||
| -rw-r--r-- | src/control/Phones.cpp | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp index c5394e7c..573720be 100644 --- a/src/control/GameLogic.cpp +++ b/src/control/GameLogic.cpp @@ -380,7 +380,7 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector CStats::CheckPointReachedUnsuccessfully(); CWorld::Remove(pPlayerPed); CWorld::Add(pPlayerPed); - //CHud::ResetWastedText() // TODO(MIAMI) + CHud::ResetWastedText(); CStreaming::StreamZoneModels(pos); clearWaterDrop = true; } diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp index 81d87b05..e85893e6 100644 --- a/src/control/PathFind.cpp +++ b/src/control/PathFind.cpp @@ -1872,8 +1872,8 @@ CPathFind::TakeWidthIntoAccountForWandering(CPathNode* nextNode, uint16 random) void CPathFind::TakeWidthIntoAccountForCoors(CPathNode* node1, CPathNode* node2, uint16 random, float* x, float* y) { - *x += (Min(node1->width, node2->width) * ((random % 16) - 7)); - *y += (Min(node1->width, node2->width) * (((random / 16) % 16) - 7)); + *x += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * ((random % 16) - 7)); + *y += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * (((random / 16) % 16) - 7)); } CPathNode* diff --git a/src/control/PathFind.h b/src/control/PathFind.h index 013d9d31..820d0b86 100644 --- a/src/control/PathFind.h +++ b/src/control/PathFind.h @@ -6,6 +6,7 @@ class CVehicle; class CPtrList; #define LANE_WIDTH 5.0f +#define WIDTH_TO_PED_NODE_WIDTH (31.f/(500.f * 8.f)) enum { @@ -89,7 +90,7 @@ struct CPathNode float GetZ(void) { return z/8.0f; } bool HasDivider(void) { return width != 0; } float GetDividerWidth(void) { return width/(2*8.0f); } - float GetPedNodeWidth(void) { return width*(31.f/(500.f * 8.f)); } + float GetPedNodeWidth(void) { return width*WIDTH_TO_PED_NODE_WIDTH; } CPathNode *GetPrev(void); CPathNode *GetNext(void); void SetPrev(CPathNode *node); diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index 4f1703f2..7f8677ec 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -17,6 +17,8 @@ #include "Replay.h" #endif +// --MIAMI: file done + CPhoneInfo gPhoneInfo; bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up |