mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compile game.c and game.h as C++

This commit is contained in:
Michael Steenbeek 2017-11-30 18:17:06 +01:00
parent 94a3d88691
commit 60d8865efb
107 changed files with 122 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -123,6 +123,7 @@
4CE4624B1FD1613D0001CD98 /* Platform.macOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */; };
4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */; };
4CE4624D1FD1613D0001CD98 /* Platform.Win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */; };
4CE462411FD0710E0001CD98 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4623F1FD0710E0001CD98 /* Game.cpp */; };
4CF788C01F1B787700C611BF /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CF788BE1F1B787700C611BF /* Painter.cpp */; };
4CFBCD5E1F27CD8000D74FB6 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */; };
4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */; };
@ -303,7 +304,6 @@
F76C86041EC4E88300FA49E2 /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B01EC4E7CC00FA49E2 /* string.c */; };
F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */; };
F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */; };
F76C86091EC4E88300FA49E2 /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B51EC4E7CC00FA49E2 /* game.c */; };
F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */; };
F76C860D1EC4E88300FA49E2 /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B91EC4E7CC00FA49E2 /* input.c */; };
F76C860F1EC4E88300FA49E2 /* chat.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83BC1EC4E7CC00FA49E2 /* chat.c */; };
@ -716,6 +716,8 @@
4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.macOS.cpp; sourceTree = "<group>"; };
4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Posix.cpp; sourceTree = "<group>"; };
4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Win32.cpp; sourceTree = "<group>"; };
4CE4623F1FD0710E0001CD98 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = "<group>"; };
4CE462401FD0710E0001CD98 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = "<group>"; };
4CF788BE1F1B787700C611BF /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = "<group>"; };
4CF788BF1F1B787700C611BF /* Painter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Painter.h; sourceTree = "<group>"; };
4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = "<group>"; };
@ -1113,8 +1115,6 @@
F76C83B21EC4E7CC00FA49E2 /* Editor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileClassifier.cpp; sourceTree = "<group>"; };
F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileClassifier.h; sourceTree = "<group>"; };
F76C83B51EC4E7CC00FA49E2 /* game.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = "<group>"; };
F76C83B61EC4E7CC00FA49E2 /* game.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Imaging.cpp; sourceTree = "<group>"; };
F76C83B81EC4E7CC00FA49E2 /* Imaging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Imaging.h; sourceTree = "<group>"; };
F76C83B91EC4E7CC00FA49E2 /* input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = input.c; sourceTree = "<group>"; };
@ -1831,8 +1831,8 @@
F76C83B21EC4E7CC00FA49E2 /* Editor.h */,
F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */,
F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */,
F76C83B51EC4E7CC00FA49E2 /* game.c */,
F76C83B61EC4E7CC00FA49E2 /* game.h */,
4CE4623F1FD0710E0001CD98 /* Game.cpp */,
4CE462401FD0710E0001CD98 /* Game.h */,
F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */,
F76C83B81EC4E7CC00FA49E2 /* Imaging.h */,
F76C83B91EC4E7CC00FA49E2 /* input.c */,
@ -3163,6 +3163,7 @@
C654DF401F69C18C0040F43D /* Intent.cpp in Sources */,
C666ED761F33DBB20061AA04 /* ShortcutKeyChange.cpp in Sources */,
F76C887F1EC5324E00FA49E2 /* ApplyPaletteShader.cpp in Sources */,
4CE462411FD0710E0001CD98 /* Game.cpp in Sources */,
C685E51C1F8907850090598F /* Map.cpp in Sources */,
F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */,
4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */,
@ -3323,7 +3324,6 @@
F76C86041EC4E88300FA49E2 /* string.c in Sources */,
F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */,
F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */,
F76C86091EC4E88300FA49E2 /* game.c in Sources */,
F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */,
F76C860D1EC4E88300FA49E2 /* input.c in Sources */,
F76C860F1EC4E88300FA49E2 /* chat.c in Sources */,

2
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@ -25,7 +25,7 @@
#include "DrawingEngines.h"
#include <openrct2/drawing/lightfx.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/paint/paint.h>
using namespace OpenRCT2;

2
src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
View File

@ -24,7 +24,7 @@
#include <openrct2/ui/UiContext.h>
#include "DrawingEngines.h"
#include <openrct2/game.h>
#include <openrct2/Game.h>
using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;

2
src/openrct2-ui/input/KeyboardShortcut.cpp
View File

@ -20,7 +20,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/config/Config.h>
#include <openrct2/core/Util.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/Screenshot.h>
#include <openrct2/interface/chat.h>

2
src/openrct2-ui/windows/Banner.cpp
View File

@ -17,7 +17,7 @@
#include <openrct2/config/Config.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2-ui/windows/Window.h>

2
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -21,7 +21,7 @@
#include <openrct2/Context.h>
#include <openrct2/OpenRCT2.h>
#include <openrct2/audio/audio.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/Editor.h>
#include <openrct2/input.h>
#include <openrct2/sprites.h>

2
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/date.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -20,7 +20,7 @@
#include <openrct2/Context.h>
#include <openrct2/Editor.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/localisation/string_ids.h>

2
src/openrct2-ui/windows/Finances.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/graph.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/date.h>

2
src/openrct2-ui/windows/Footpath.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/cheats.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/config/Config.h>
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/Guest.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2/config/Config.h>
#include <openrct2/Context.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/GuestList.cpp
View File

@ -17,7 +17,7 @@
#include <openrct2/config/Config.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/sprites.h>

2
src/openrct2-ui/windows/LandRights.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/land_tool.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -26,7 +26,7 @@
#include <time.h>
#include <openrct2/core/Guard.hpp>
#include <openrct2/Editor.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/platform/platform.h>

2
src/openrct2-ui/windows/Map.cpp
View File

@ -21,7 +21,7 @@
#include <openrct2/Context.h>
#include <openrct2/audio/audio.h>
#include <openrct2/cheats.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/land_tool.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/Context.h>
#include <openrct2/drawing/drawing.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/interface/widget.h>
#include <openrct2/ride/ride.h>

2
src/openrct2-ui/windows/NewRide.cpp
View File

@ -25,7 +25,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2/Context.h>
#include <openrct2/audio/audio.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/management/NewsItem.h>

2
src/openrct2-ui/windows/Park.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/date.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/input.h>

2
src/openrct2-ui/windows/Player.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2/network/network.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/sprites.h>

2
src/openrct2-ui/windows/Research.cpp
View File

@ -16,7 +16,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/interface/widget.h>
#include <openrct2/management/NewsItem.h>

2
src/openrct2-ui/windows/Ride.cpp
View File

@ -24,7 +24,7 @@
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Util.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -22,7 +22,7 @@
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Util.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/RideList.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/config/Config.h>
#include <openrct2/Context.h>
#include <openrct2/core/Util.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -22,7 +22,7 @@
#include <openrct2/Context.h>
#include <openrct2/audio/audio.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/Sign.cpp
View File

@ -17,7 +17,7 @@
#include <openrct2/config/Config.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/localisation/string_ids.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2-ui/windows/Staff.cpp
View File

@ -20,7 +20,7 @@
#include <openrct2/windows/Intent.h>
#include <openrct2/Context.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -15,7 +15,7 @@
#pragma endregion
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/StaffList.cpp
View File

@ -21,7 +21,7 @@
#include <openrct2/Context.h>
#include <openrct2/drawing/drawing.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/Themes.cpp
View File

@ -18,7 +18,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -20,7 +20,7 @@
#include <openrct2/core/Guard.hpp>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Util.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -19,7 +19,7 @@
#include <openrct2/core/Memory.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -27,7 +27,7 @@
#include <openrct2/windows/Intent.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/TitleMenu.cpp
View File

@ -20,7 +20,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Editor.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>

2
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -21,7 +21,7 @@
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Memory.hpp>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/input.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/widget.h>

2
src/openrct2-ui/windows/Viewport.cpp
View File

@ -17,7 +17,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/audio/audio.h>
#include <openrct2/game.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/viewport.h>

2
src/openrct2/Context.cpp
View File

@ -51,7 +51,7 @@
#include "config/Config.h"
#include "drawing/lightfx.h"
#include "Editor.h"
#include "game.h"
#include "Game.h"
#include "input.h"
#include "interface/chat.h"
#include "interface/console.h"

2
src/openrct2/Editor.cpp
View File

@ -19,7 +19,7 @@
#include "core/Math.hpp"
#include "Editor.h"
#include "FileClassifier.h"
#include "game.h"
#include "Game.h"
#include "interface/viewport.h"
#include "localisation/localisation.h"
#include "management/NewsItem.h"

20
src/openrct2/game.c → src/openrct2/Game.cpp
View File

@ -18,9 +18,11 @@
#include "cheats.h"
#include "config/Config.h"
#include "Context.h"
#include "core/Math.hpp"
#include "core/Util.hpp"
#include "Editor.h"
#include "FileClassifier.h"
#include "game.h"
#include "Game.h"
#include "input.h"
#include "interface/Screenshot.h"
#include "interface/viewport.h"
@ -104,7 +106,7 @@ rct_string_id gErrorStringId;
sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback)
{
for (sint32 i = 0; i < countof(game_command_callback_table); i++ ) {
for (sint32 i = 0; i < Util::CountOf(game_command_callback_table); i++ ) {
if (game_command_callback_table[i] == callback) {
return i;
}
@ -114,7 +116,7 @@ sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback)
GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index)
{
if (index < countof(game_command_callback_table)) {
if (index < Util::CountOf(game_command_callback_table)) {
return game_command_callback_table[index];
}
return 0;
@ -122,7 +124,7 @@ GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index)
void game_increase_game_speed()
{
gGameSpeed = min(gConfigGeneral.debugging_tools ? 5 : 4, gGameSpeed + 1);
gGameSpeed = Math::Min(gConfigGeneral.debugging_tools ? 5 : 4, gGameSpeed + 1);
if (gGameSpeed == 5)
gGameSpeed = 8;
window_invalidate_by_class(WC_TOP_TOOLBAR);
@ -130,7 +132,7 @@ void game_increase_game_speed()
void game_reduce_game_speed()
{
gGameSpeed = max(1, gGameSpeed - 1);
gGameSpeed = Math::Max(1, gGameSpeed - 1);
if (gGameSpeed == 7)
gGameSpeed = 4;
window_invalidate_by_class(WC_TOP_TOOLBAR);
@ -310,7 +312,7 @@ void game_update()
{
gInUpdateCode = true;
sint32 numUpdates;
uint32 numUpdates;
// 0x006E3AEC // screen_game_process_mouse_input();
screenshot_check();
@ -326,7 +328,7 @@ void game_update()
numUpdates = 1 << (gGameSpeed - 1);
} else {
numUpdates = gTicksSinceLastUpdate / GAME_UPDATE_TIME_MS;
numUpdates = clamp(1, numUpdates, GAME_MAX_UPDATES);
numUpdates = Math::Clamp(1u, numUpdates, (uint32)GAME_MAX_UPDATES);
}
if (network_get_mode() == NETWORK_MODE_CLIENT && network_get_status() == NETWORK_STATUS_CONNECTED && network_get_authstatus() == NETWORK_AUTH_OK) {
@ -542,7 +544,7 @@ sint32 game_do_command_p(sint32 command, sint32 *eax, sint32 *ebx, sint32 *ecx,
original_edi = *edi;
original_ebp = *ebp;
if (command >= countof(new_game_command_table)) {
if (command >= Util::CountOf(new_game_command_table)) {
return MONEY32_UNDEFINED;
}
@ -862,7 +864,7 @@ void game_log_multiplayer_command(int command, int *eax, int* ebx, int* ecx, int
if (nameChunkOffset < 0)
nameChunkOffset = 2;
nameChunkOffset *= 12;
nameChunkOffset = min(nameChunkOffset, countof(banner_name) - 12);
nameChunkOffset = Math::Min(nameChunkOffset, (sint32)(Util::CountOf(banner_name) - 12));
memcpy(banner_name + nameChunkOffset + 0, edx, 4);
memcpy(banner_name + nameChunkOffset + 4, ebp, 4);
memcpy(banner_name + nameChunkOffset + 8, edi, 4);

5
src/openrct2/game.h → src/openrct2/Game.h
View File

@ -14,8 +14,7 @@
*****************************************************************************/
#pragma endregion
#ifndef _GAME_H_
#define _GAME_H_
#pragma once
#include "common.h"
#include "scenario/scenario.h"
@ -196,5 +195,3 @@ void game_init_all(sint32 mapSize);
#ifdef __cplusplus
}
#endif
#endif

2
src/openrct2/actions/GameAction.h
View File

@ -23,7 +23,7 @@
#include "../core/DataSerialiser.h"
#include "../core/IStream.hpp"
#include "../game.h"
#include "../Game.h"
#include "../localisation/string_ids.h"
#include "../world/map.h"

2
src/openrct2/cheats.c
View File

@ -17,7 +17,7 @@
#include "cheats.h"
#include "config/Config.h"
#include "Editor.h"
#include "game.h"
#include "Game.h"
#include "interface/window.h"
#include "localisation/localisation.h"
#include "management/Finance.h"

2
src/openrct2/cmdline/ConvertCommand.cpp
View File

@ -25,7 +25,7 @@
#include "../rct2/S6Exporter.h"
#include "CommandLine.hpp"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../OpenRCT2.h"

2
src/openrct2/drawing/X8DrawingEngine.cpp
View File

@ -26,7 +26,7 @@
#include "Rain.h"
#include "X8DrawingEngine.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../intro.h"

2
src/openrct2/drawing/lightfx.c
View File

@ -17,7 +17,7 @@
#ifdef __ENABLE_LIGHTFX__
#include "../common.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../paint/tile_element/tile_element.h"

2
src/openrct2/input.c
View File

@ -17,7 +17,7 @@
#include "audio/audio.h"
#include "config/Config.h"
#include "Context.h"
#include "game.h"
#include "Game.h"
#include "input.h"
#include "interface/chat.h"
#include "interface/console.h"

2
src/openrct2/interface/Screenshot.cpp
View File

@ -24,7 +24,7 @@
#include "Screenshot.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../intro.h"
#include "../localisation/localisation.h"
#include "../platform/platform.h"

2
src/openrct2/interface/console.c
View File

@ -20,7 +20,7 @@
#include "../Context.h"
#include "../drawing/drawing.h"
#include "../Editor.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/themes.h"
#include "../localisation/localisation.h"

2
src/openrct2/interface/viewport.c
View File

@ -17,7 +17,7 @@
#include "../config/Config.h"
#include "../Context.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../localisation/localisation.h"
#include "../OpenRCT2.h"

2
src/openrct2/interface/viewport_interaction.c
View File

@ -16,7 +16,7 @@
#include "../cheats.h"
#include "../Editor.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../localisation/localisation.h"
#include "../OpenRCT2.h"

2
src/openrct2/interface/window.c
View File

@ -20,7 +20,7 @@
#include "../core/Guard.hpp"
#include "../drawing/drawing.h"
#include "../Editor.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/Cursors.h"
#include "../interface/themes.h"

2
src/openrct2/localisation/date.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include <time.h>
#include "../game.h"
#include "../Game.h"
#include "date.h"
#include "string_ids.h"

2
src/openrct2/localisation/localisation.c
View File

@ -31,7 +31,7 @@
#endif // _WIN32
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../util/util.h"
#include "date.h"
#include "localisation.h"

2
src/openrct2/localisation/user.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../game.h"
#include "../Game.h"
#include "../ride/ride.h"
#include "../util/util.h"
#include "localisation.h"

2
src/openrct2/management/Finance.cpp
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/management/Marketing.cpp
View File

@ -16,7 +16,7 @@
#include "../config/Config.h"
#include "../core/Util.hpp"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../ride/ride.h"

2
src/openrct2/management/Research.cpp
View File

@ -17,7 +17,7 @@
#include "../config/Config.h"
#include "../core/Guard.hpp"
#include "../core/Util.hpp"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/network/Network.cpp
View File

@ -55,7 +55,7 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL;
#include "../rct2/S6Exporter.h"
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/chat.h"
#include "../interface/window.h"
#include "../localisation/date.h"

2
src/openrct2/network/NetworkAction.cpp
View File

@ -19,7 +19,7 @@
#include <algorithm>
#include "NetworkAction.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/string_ids.h"
sint32 NetworkActions::FindCommand(sint32 command)

2
src/openrct2/network/Twitch.cpp
View File

@ -33,7 +33,7 @@
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/console.h"
#include "../localisation/localisation.h"
#include "../management/NewsItem.h"

2
src/openrct2/network/network.h
View File

@ -38,7 +38,7 @@ enum {
#define MAX_SERVER_DESCRIPTION_LENGTH 256
#include "../common.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/string_ids.h"
#include "../Version.h"

2
src/openrct2/object_list.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "game.h"
#include "Game.h"
#include "object.h"
#include "object_list.h"
#include "object/ObjectRepository.h"

2
src/openrct2/paint/Painter.cpp
View File

@ -22,7 +22,7 @@
#include "Painter.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/chat.h"
#include "../interface/console.h"
#include "../intro.h"

2
src/openrct2/paint/tile_element/banner.c
View File

@ -16,7 +16,7 @@
#include "../paint.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"
#include "../../paint/tile_element/tile_element.h"

2
src/openrct2/paint/tile_element/entrance.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"
#include "../../ride/ride_data.h"

2
src/openrct2/paint/tile_element/fence.c
View File

@ -17,7 +17,7 @@
#include "../../common.h"
#include "../../config/Config.h"
#include "../../drawing/drawing.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../localisation/localisation.h"
#include "../../interface/colour.h"
#include "../../interface/viewport.h"

2
src/openrct2/paint/tile_element/large_scenery.c
View File

@ -18,7 +18,7 @@
#include "../paint.h"
#include "../supports.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"
#include "../../util/util.h"

2
src/openrct2/paint/tile_element/path.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"
#include "../../object_list.h"

2
src/openrct2/paint/tile_element/scenery.c
View File

@ -16,7 +16,7 @@
#include "tile_element.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../localisation/date.h"
#include "../../paint/paint.h"

2
src/openrct2/paint/tile_element/tile_element.c
View File

@ -29,7 +29,7 @@
#include "../../world/scenery.h"
#include "../../sprites.h"
#include "../../localisation/localisation.h"
#include "../../game.h"
#include "../../Game.h"
#include "../supports.h"
#ifdef __TESTPAINT__

2
src/openrct2/peep/Peep.cpp
View File

@ -24,7 +24,7 @@
#include "../config/Config.h"
#include "../core/Math.hpp"
#include "../core/Util.hpp"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"

2
src/openrct2/peep/Staff.cpp
View File

@ -18,7 +18,7 @@
#include "../core/Util.hpp"
#include "../Context.h"
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"

2
src/openrct2/platform/shared.c
View File

@ -30,7 +30,7 @@
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../drawing/lightfx.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/currency.h"
#include "../localisation/localisation.h"
#include "../util/util.h"

2
src/openrct2/rct1/S4Importer.cpp
View File

@ -38,7 +38,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../Editor.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -28,7 +28,7 @@
#include <functional>
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../localisation/date.h"

2
src/openrct2/rct2/S6Importer.cpp
View File

@ -31,7 +31,7 @@
#include "../ride/Station.h"
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/ride/Station.cpp
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../game.h"
#include "../Game.h"
#include "Station.h"
#include "Track.h"

2
src/openrct2/ride/Track.cpp
View File

@ -17,7 +17,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../config/Config.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../localisation/localisation.h"
#include "../management/Finance.h"

2
src/openrct2/ride/TrackDesign.cpp
View File

@ -25,7 +25,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/localisation.h"
#include "../localisation/string_ids.h"
#include "../management/Finance.h"

2
src/openrct2/ride/Vehicle.cpp
View File

@ -22,7 +22,7 @@
#include "../config/Config.h"
#include "../core/Math.hpp"
#include "../core/Util.hpp"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../localisation/localisation.h"
#include "../management/NewsItem.h"

2
src/openrct2/ride/ride.c
View File

@ -23,7 +23,7 @@
#include "../config/Config.h"
#include "../Context.h"
#include "../Editor.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/window.h"
#include "../localisation/date.h"

2
src/openrct2/ride/track_design_save.c
View File

@ -17,7 +17,7 @@
#include "../audio/audio.h"
#include "../config/Config.h"
#include "../Context.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/localisation.h"
#include "../localisation/string_ids.h"
#include "../interface/viewport.h"

2
src/openrct2/ride/vehicle_paint.c
View File

@ -20,7 +20,7 @@
#include "../ride/ride_data.h"
#include "Track.h"
#include "../interface/viewport.h"
#include "../game.h"
#include "../Game.h"
#include "../drawing/lightfx.h"
#include "vehicle_paint.h"

2
src/openrct2/ride/water/RiverRapids.cpp
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../../config/Config.h"
#include "../../game.h"
#include "../../Game.h"
#include "../../interface/viewport.h"
#include "../../paint/paint.h"
#include "../../paint/supports.h"

2
src/openrct2/scenario/scenario.c
View File

@ -18,7 +18,7 @@
#include "../cheats.h"
#include "../config/Config.h"
#include "../FileClassifier.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/title/TitleScreen.cpp
View File

@ -28,7 +28,7 @@
#include "../audio/audio.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../input.h"
#include "../interface/viewport.h"
#include "../interface/window.h"

2
src/openrct2/title/TitleSequencePlayer.cpp
View File

@ -32,7 +32,7 @@
#include "TitleSequenceManager.h"
#include "TitleSequencePlayer.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../management/NewsItem.h"

2
src/openrct2/windows/EditorObjectSelection.cpp
View File

@ -24,7 +24,7 @@
#include <ctype.h>
#include "../audio/audio.h"
#include "../game.h"
#include "../Game.h"
#include "../Editor.h"
#include "../interface/widget.h"
#include "../localisation/localisation.h"

2
src/openrct2/windows/_legacy.c
View File

@ -21,7 +21,7 @@
#include "../Context.h"
#include "../audio/audio.h"
#include "../input.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/viewport.h"
#include "../ride/Track.h"
#include "../ride/TrackData.h"

2
src/openrct2/world/Banner.cpp
View File

@ -26,7 +26,7 @@
#include "map.h"
#include "park.h"
#include "scenery.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../ride/ride.h"

2
src/openrct2/world/Climate.cpp
View File

@ -23,7 +23,7 @@
#include "../audio/AudioMixer.h"
#include "../cheats.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../localisation/date.h"
#include "../scenario/scenario.h"

2
src/openrct2/world/Duck.cpp
View File

@ -19,7 +19,7 @@
#include "../sprites.h"
#include "../audio/audio.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/date.h"
#include "../scenario/scenario.h"
#include "sprite.h"

2
src/openrct2/world/Entrance.cpp
View File

@ -22,7 +22,7 @@
#include "map.h"
#include "park.h"
#include "../cheats.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/string_ids.h"
#include "../management/Finance.h"
#include "../ride/Track.h"

2
src/openrct2/world/Fountain.cpp
View File

@ -16,7 +16,7 @@
#include "Fountain.h"
#include "../game.h"
#include "../Game.h"
#include "../scenario/scenario.h"
#include "footpath.h"
#include "map.h"

2
src/openrct2/world/MapGen.cpp
View File

@ -23,7 +23,7 @@
#include "../core/Math.hpp"
#include "../core/String.hpp"
#include "../core/Util.hpp"
#include "../game.h"
#include "../Game.h"
#include "../Imaging.h"
#include "../localisation/string_ids.h"
#include "../object.h"

2
src/openrct2/world/TileInspector.cpp
View File

@ -17,7 +17,7 @@
#include "../common.h"
#include "../Context.h"
#include "../core/Guard.hpp"
#include "../game.h"
#include "../Game.h"
#include "../interface/window.h"
#include "../ride/Track.h"
#include "../windows/Intent.h"

2
src/openrct2/world/Wall.cpp
View File

@ -19,7 +19,7 @@
#include "../OpenRCT2.h"
#include "../cheats.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/string_ids.h"
#include "../ride/Track.h"
#include "../ride/TrackData.h"

2
src/openrct2/world/footpath.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../cheats.h"
#include "../game.h"
#include "../Game.h"
#include "../localisation/localisation.h"
#include "../network/network.h"
#include "../object_list.h"

Some files were not shown because too many files have changed in this diff Show More