diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-06-03 01:24:08 +0300 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-06-03 01:24:08 +0300 |
commit | 509ca11d76373671281f17c7f828a0187ed7b9e4 (patch) | |
tree | c3d072fd7933274fbfc9f85f6be4a09613b2e7be /src/core/main.cpp | |
parent | 2ca3c50463eff025b9783930d112dd0c257c040e (diff) | |
parent | 04a91761df7c90ed16b37407d65d8674033efd3f (diff) |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r-- | src/core/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp index d95e7404..547d3b37 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -73,6 +73,9 @@ float FramesPerSecond = 30.0f; bool gbPrintShite = false; bool gbModelViewer; +#ifdef TIMEBARS +bool gbShowTimebars; +#endif int32 frameCount; @@ -95,7 +98,6 @@ void TheGame(void); void DebugMenuPopulate(void); #endif - void ValidateVersion() { @@ -1095,8 +1097,10 @@ Idle(void *arg) #endif // CCredits::Render(); // They added it to function above and also forgot it here + #ifdef TIMEBARS - tbDisplay(); + if (gbShowTimebars) + tbDisplay(); #endif DoRWStuffEndOfFrame(); |