diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 15:14:15 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 15:14:15 +0200 |
| commit | 904090cbb6cf7978e2e093da1ea1d7245dcb02c8 (patch) | |
| tree | b48af2798ab8faea3fcfe16d1ed8629dc025b8ab /src/core/World.cpp | |
| parent | cfac29b0ef89fce769a007bad113681170f5794c (diff) | |
| parent | b5c4866964a281ad9ab18dfd7218e1ef168f15f4 (diff) | |
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 14624f97..1364e58f 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -4,7 +4,6 @@ #include "CopPed.h" #include "CutsceneMgr.h" #include "DMAudio.h" -#include "Entity.h" #include "EventList.h" #include "Explosion.h" #include "Fire.h" @@ -12,11 +11,8 @@ #include "Glass.h" #include "Messages.h" #include "ModelIndices.h" -#include "Object.h" #include "ParticleObject.h" -#include "Ped.h" #include "Pickups.h" -#include "PlayerPed.h" #include "Population.h" #include "ProjectileInfo.h" #include "Record.h" @@ -25,7 +21,6 @@ #include "RpAnimBlend.h" #include "Shadows.h" #include "TempColModels.h" -#include "Vehicle.h" #include "WaterLevel.h" #include "World.h" |