From 9b5392d3a13e00d880e895522c19ef1e453804b0 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 29 Jun 2019 14:38:37 +0300 Subject: ProcessPedUpdate --- src/World.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/World.h') diff --git a/src/World.h b/src/World.h index e3a6a8f2..d88448fb 100644 --- a/src/World.h +++ b/src/World.h @@ -67,6 +67,7 @@ public: static bool &bForceProcessControl; static bool &bProcessCutsceneOnly; + static void Remove(CEntity *entity); static void Add(CEntity *entity); static CSector *GetSector(int x, int y) { return &ms_aSectors[y][x]; } @@ -103,6 +104,8 @@ public: static int GetSectorIndexY(float f) { return (int)GetSectorY(f); } static float GetWorldX(int x) { return x*SECTOR_SIZE_X + WORLD_MIN_X; } static float GetWorldY(int y) { return y*SECTOR_SIZE_Y + WORLD_MIN_Y; } + + static void Remove(void); }; class CPlayerPed; -- cgit v1.2.3 From 01c04f3963bc7d10e1d4d63d5586f3d5e04fdb2c Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 29 Jun 2019 18:05:23 +0300 Subject: Fixed merge --- src/World.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/World.h') diff --git a/src/World.h b/src/World.h index fb9b3b7e..90e732a5 100644 --- a/src/World.h +++ b/src/World.h @@ -69,7 +69,6 @@ public: static void Remove(CEntity *entity); static void Add(CEntity *entity); - static void Remove(CEntity *ent); static CSector *GetSector(int x, int y) { return &ms_aSectors[y][x]; } static CPtrList &GetBigBuildingList(eLevelName i) { return ms_bigBuildingsList[i]; } -- cgit v1.2.3 From e0488a7980c3c857431d266f0fd6205ca772315f Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 29 Jun 2019 18:06:15 +0300 Subject: fix --- src/World.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/World.h') diff --git a/src/World.h b/src/World.h index 90e732a5..3b7090da 100644 --- a/src/World.h +++ b/src/World.h @@ -104,8 +104,6 @@ public: static int GetSectorIndexY(float f) { return (int)GetSectorY(f); } static float GetWorldX(int x) { return x*SECTOR_SIZE_X + WORLD_MIN_X; } static float GetWorldY(int y) { return y*SECTOR_SIZE_Y + WORLD_MIN_Y; } - - static void Remove(void); }; class CPlayerPed; -- cgit v1.2.3