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/Game.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/Game.cpp')
| -rw-r--r-- | src/core/Game.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index b18ab4e1..e0becc43 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -1,6 +1,3 @@ -#pragma warning( push ) -#pragma warning( disable : 4005) -#pragma warning( pop ) #include "common.h" #include "platform.h" @@ -10,7 +7,6 @@ #include "Accident.h" #include "Antennas.h" #include "Bridge.h" -#include "Camera.h" #include "CarCtrl.h" #include "CarGen.h" #include "CdStream.h" @@ -69,7 +65,6 @@ #include "Skidmarks.h" #include "SetPieces.h" #include "SpecialFX.h" -#include "Sprite2d.h" #include "Stats.h" #include "Streaming.h" #include "SurfaceTable.h" |