Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Population, CarGen done, mouse AUX buttons, Frontend, Hud, fixes
  • Loading branch information
erorcun committed Sep 29, 2020
1 parent 1fa852f commit 24cb57c16532fa506861e43b53ce51ef7a1c8435
@@ -1258,7 +1258,7 @@ cMusicManager::DisplayRadioStationName()
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetFontStyle(FONT_STANDARD); CFont::SetFontStyle(FONT_STANDARD);
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetCentreSize(SCREEN_SCALE_X(640.0f)); CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation); CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);


@@ -380,7 +380,7 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
CStats::CheckPointReachedUnsuccessfully(); CStats::CheckPointReachedUnsuccessfully();
CWorld::Remove(pPlayerPed); CWorld::Remove(pPlayerPed);
CWorld::Add(pPlayerPed); CWorld::Add(pPlayerPed);
//CHud::ResetWastedText() // TODO(MIAMI) CHud::ResetWastedText();
CStreaming::StreamZoneModels(pos); CStreaming::StreamZoneModels(pos);
clearWaterDrop = true; clearWaterDrop = true;
} }
@@ -1872,8 +1872,8 @@ CPathFind::TakeWidthIntoAccountForWandering(CPathNode* nextNode, uint16 random)
void void
CPathFind::TakeWidthIntoAccountForCoors(CPathNode* node1, CPathNode* node2, uint16 random, float* x, float* y) CPathFind::TakeWidthIntoAccountForCoors(CPathNode* node1, CPathNode* node2, uint16 random, float* x, float* y)
{ {
*x += (Min(node1->width, node2->width) * ((random % 16) - 7)); *x += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * ((random % 16) - 7));
*y += (Min(node1->width, node2->width) * (((random / 16) % 16) - 7)); *y += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * (((random / 16) % 16) - 7));
} }


CPathNode* CPathNode*
@@ -6,6 +6,7 @@ class CVehicle;
class CPtrList; class CPtrList;


#define LANE_WIDTH 5.0f #define LANE_WIDTH 5.0f
#define WIDTH_TO_PED_NODE_WIDTH (31.f/(500.f * 8.f))


enum enum
{ {
@@ -89,7 +90,7 @@ struct CPathNode
float GetZ(void) { return z/8.0f; } float GetZ(void) { return z/8.0f; }
bool HasDivider(void) { return width != 0; } bool HasDivider(void) { return width != 0; }
float GetDividerWidth(void) { return width/(2*8.0f); } 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 *GetPrev(void);
CPathNode *GetNext(void); CPathNode *GetNext(void);
void SetPrev(CPathNode *node); void SetPrev(CPathNode *node);
@@ -17,6 +17,8 @@
#include "Replay.h" #include "Replay.h"
#endif #endif


// --MIAMI: file done

CPhoneInfo gPhoneInfo; CPhoneInfo gPhoneInfo;


bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up

0 comments on commit 24cb57c

Please sign in to comment.