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

Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes

Browse Source
This commit is contained in:
eray orçunus
2020-09-29 22:53:12 +03:00
parent 1fa852f118
commit f71953077d
35 changed files with 1428 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/control/GameLogic.cpp
View File

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

4
src/control/PathFind.cpp
View File

@ -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*

3
src/control/PathFind.h
View File

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

2
src/control/Phones.cpp
View File

@ -17,6 +17,8 @@
#include "Replay.h"
#endif
// --MIAMI: file done
CPhoneInfo gPhoneInfo;
bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up