From 36149cf38e813405cc636ebca68317a7a14859ff Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 21 Jun 2018 16:49:05 +0200 Subject: [PATCH] rwlib: rw/defines.hpp -> rw/debug.hpp --- rwengine/src/BinaryStream.cpp | 2 +- rwengine/src/TextureArchive.cpp | 2 +- rwengine/src/ai/AIGraph.cpp | 2 +- rwengine/src/ai/CharacterController.cpp | 2 +- rwengine/src/audio/SoundManager.cpp | 2 +- rwengine/src/core/Profiler.hpp | 2 +- rwengine/src/data/AnimGroup.cpp | 2 +- rwengine/src/data/Chase.cpp | 2 +- rwengine/src/data/ModelData.hpp | 2 +- rwengine/src/engine/Animator.hpp | 2 +- rwengine/src/engine/GameData.cpp | 2 +- rwengine/src/engine/GameData.hpp | 2 +- rwengine/src/engine/Garage.hpp | 8 ++++---- rwengine/src/engine/Payphone.cpp | 2 +- rwengine/src/engine/SaveGame.cpp | 2 +- rwengine/src/engine/ScreenText.cpp | 2 +- rwengine/src/loaders/GenericDATLoader.cpp | 2 +- rwengine/src/loaders/LoaderCutsceneDAT.cpp | 2 +- rwengine/src/objects/CharacterObject.cpp | 2 +- rwengine/src/objects/GameObject.hpp | 2 +- rwengine/src/objects/PickupObject.hpp | 2 +- rwengine/src/render/DebugDraw.cpp | 2 +- rwengine/src/render/OpenGLRenderer.cpp | 2 +- rwengine/src/render/WaterRenderer.cpp | 2 +- rwengine/src/script/ScriptFunctions.hpp | 2 +- rwengine/src/script/ScriptTypes.hpp | 2 +- rwgame/GameBase.cpp | 2 +- rwgame/GameConfig.cpp | 2 +- rwgame/MenuSystem.hpp | 2 +- rwgame/states/MenuState.cpp | 2 +- rwlib/CMakeLists.txt | 2 +- rwlib/source/loaders/LoaderDFF.cpp | 2 +- rwlib/source/loaders/LoaderIMG.cpp | 2 +- rwlib/source/loaders/LoaderSDT.cpp | 2 +- rwlib/source/loaders/LoaderTXD.cpp | 2 +- rwlib/source/loaders/RWBinaryStream.hpp | 2 +- rwlib/source/rw/bit_cast.cpp | 2 +- rwlib/source/rw/{defines.hpp => debug.hpp} | 4 ++-- rwlib/source/rw/types.hpp | 2 +- tests/test_Config.cpp | 2 +- 40 files changed, 44 insertions(+), 44 deletions(-) rename rwlib/source/rw/{defines.hpp => debug.hpp} (96%) diff --git a/rwengine/src/BinaryStream.cpp b/rwengine/src/BinaryStream.cpp index 90b89c36..7ca1f157 100644 --- a/rwengine/src/BinaryStream.cpp +++ b/rwengine/src/BinaryStream.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include namespace RW { diff --git a/rwengine/src/TextureArchive.cpp b/rwengine/src/TextureArchive.cpp index 6e25cd68..cdbffee1 100644 --- a/rwengine/src/TextureArchive.cpp +++ b/rwengine/src/TextureArchive.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "BinaryStream.hpp" diff --git a/rwengine/src/ai/AIGraph.cpp b/rwengine/src/ai/AIGraph.cpp index 9865a76b..29a5b7d0 100644 --- a/rwengine/src/ai/AIGraph.cpp +++ b/rwengine/src/ai/AIGraph.cpp @@ -7,7 +7,7 @@ #include "ai/AIGraphNode.hpp" #include "data/PathData.hpp" -#include +#include #include AIGraph::~AIGraph() { diff --git a/rwengine/src/ai/CharacterController.cpp b/rwengine/src/ai/CharacterController.cpp index e5794699..210e5e26 100644 --- a/rwengine/src/ai/CharacterController.cpp +++ b/rwengine/src/ai/CharacterController.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include "data/WeaponData.hpp" #include "engine/Animator.hpp" diff --git a/rwengine/src/audio/SoundManager.cpp b/rwengine/src/audio/SoundManager.cpp index c8b20ee7..c9a68979 100644 --- a/rwengine/src/audio/SoundManager.cpp +++ b/rwengine/src/audio/SoundManager.cpp @@ -8,7 +8,7 @@ extern "C" { #include } //ab -#include +#include // Rename some functions for older libavcodec/ffmpeg versions (e.g. Ubuntu Trusty) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1) diff --git a/rwengine/src/core/Profiler.hpp b/rwengine/src/core/Profiler.hpp index 3dedd39d..516db3ec 100644 --- a/rwengine/src/core/Profiler.hpp +++ b/rwengine/src/core/Profiler.hpp @@ -9,7 +9,7 @@ #include #define time_unit std::chrono::microseconds -#include +#include namespace perf { diff --git a/rwengine/src/data/AnimGroup.cpp b/rwengine/src/data/AnimGroup.cpp index 26ffa6d5..35980a16 100644 --- a/rwengine/src/data/AnimGroup.cpp +++ b/rwengine/src/data/AnimGroup.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include // The default animations for every cycle diff --git a/rwengine/src/data/Chase.cpp b/rwengine/src/data/Chase.cpp index 90eee3bc..d74cf05c 100644 --- a/rwengine/src/data/Chase.cpp +++ b/rwengine/src/data/Chase.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "engine/GameWorld.hpp" #include "objects/GameObject.hpp" diff --git a/rwengine/src/data/ModelData.hpp b/rwengine/src/data/ModelData.hpp index b9f3ff84..45dfc599 100644 --- a/rwengine/src/data/ModelData.hpp +++ b/rwengine/src/data/ModelData.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/rwengine/src/engine/Animator.hpp b/rwengine/src/engine/Animator.hpp index 59842ec9..783e2d24 100644 --- a/rwengine/src/engine/Animator.hpp +++ b/rwengine/src/engine/Animator.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include struct AnimationBone; diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp index 33502fea..25c3fbdf 100644 --- a/rwengine/src/engine/GameData.cpp +++ b/rwengine/src/engine/GameData.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include "core/Logger.hpp" diff --git a/rwengine/src/engine/GameData.hpp b/rwengine/src/engine/GameData.hpp index 9968a827..7ce57019 100644 --- a/rwengine/src/engine/GameData.hpp +++ b/rwengine/src/engine/GameData.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/rwengine/src/engine/Garage.hpp b/rwengine/src/engine/Garage.hpp index 04acc452..1cfc263a 100644 --- a/rwengine/src/engine/Garage.hpp +++ b/rwengine/src/engine/Garage.hpp @@ -1,9 +1,9 @@ -#ifndef _RWENGINE_Garage_HPP_ -#define _RWENGINE_Garage_HPP_ +#ifndef _RWENGINE_GARAGE_HPP_ +#define _RWENGINE_GARAGE_HPP_ #include #include -#include +#include class PlayerController; @@ -109,4 +109,4 @@ public: void tick(float dt); }; -#endif \ No newline at end of file +#endif diff --git a/rwengine/src/engine/Payphone.cpp b/rwengine/src/engine/Payphone.cpp index 965dc530..5c653c83 100644 --- a/rwengine/src/engine/Payphone.cpp +++ b/rwengine/src/engine/Payphone.cpp @@ -1,6 +1,6 @@ #include "engine/Payphone.hpp" -#include +#include #include "ai/PlayerController.hpp" diff --git a/rwengine/src/engine/SaveGame.cpp b/rwengine/src/engine/SaveGame.cpp index 9bb0dfe7..d04f1edf 100644 --- a/rwengine/src/engine/SaveGame.cpp +++ b/rwengine/src/engine/SaveGame.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include "data/ZoneData.hpp" #include "engine/GameData.hpp" diff --git a/rwengine/src/engine/ScreenText.cpp b/rwengine/src/engine/ScreenText.cpp index 19c75405..557b87d5 100644 --- a/rwengine/src/engine/ScreenText.cpp +++ b/rwengine/src/engine/ScreenText.cpp @@ -1,6 +1,6 @@ #include "engine/ScreenText.hpp" -#include +#include void ScreenText::tick(float dt) { int millis = dt * 1000; diff --git a/rwengine/src/loaders/GenericDATLoader.cpp b/rwengine/src/loaders/GenericDATLoader.cpp index ac5b6641..408021d5 100644 --- a/rwengine/src/loaders/GenericDATLoader.cpp +++ b/rwengine/src/loaders/GenericDATLoader.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/rwengine/src/loaders/LoaderCutsceneDAT.cpp b/rwengine/src/loaders/LoaderCutsceneDAT.cpp index ce94660a..e2795859 100644 --- a/rwengine/src/loaders/LoaderCutsceneDAT.cpp +++ b/rwengine/src/loaders/LoaderCutsceneDAT.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include "data/CutsceneData.hpp" #include "platform/FileHandle.hpp" diff --git a/rwengine/src/objects/CharacterObject.cpp b/rwengine/src/objects/CharacterObject.cpp index 76313ffb..961f2ee5 100644 --- a/rwengine/src/objects/CharacterObject.cpp +++ b/rwengine/src/objects/CharacterObject.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "ai/CharacterController.hpp" #include "ai/PlayerController.hpp" diff --git a/rwengine/src/objects/GameObject.hpp b/rwengine/src/objects/GameObject.hpp index b4927c34..d85777b2 100644 --- a/rwengine/src/objects/GameObject.hpp +++ b/rwengine/src/objects/GameObject.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/rwengine/src/objects/PickupObject.hpp b/rwengine/src/objects/PickupObject.hpp index 8143a353..0ea822f6 100644 --- a/rwengine/src/objects/PickupObject.hpp +++ b/rwengine/src/objects/PickupObject.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/rwengine/src/render/DebugDraw.cpp b/rwengine/src/render/DebugDraw.cpp index 84459acd..be0c4431 100644 --- a/rwengine/src/render/DebugDraw.cpp +++ b/rwengine/src/render/DebugDraw.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "render/GameRenderer.hpp" diff --git a/rwengine/src/render/OpenGLRenderer.cpp b/rwengine/src/render/OpenGLRenderer.cpp index 2bd4ccc6..d816d455 100644 --- a/rwengine/src/render/OpenGLRenderer.cpp +++ b/rwengine/src/render/OpenGLRenderer.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace { constexpr GLuint kUBOIndexScene = 1; diff --git a/rwengine/src/render/WaterRenderer.cpp b/rwengine/src/render/WaterRenderer.cpp index 59a37eb0..26fed89e 100644 --- a/rwengine/src/render/WaterRenderer.cpp +++ b/rwengine/src/render/WaterRenderer.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include #include "engine/GameData.hpp" diff --git a/rwengine/src/script/ScriptFunctions.hpp b/rwengine/src/script/ScriptFunctions.hpp index 050094f7..9bed45c9 100644 --- a/rwengine/src/script/ScriptFunctions.hpp +++ b/rwengine/src/script/ScriptFunctions.hpp @@ -1,7 +1,7 @@ #ifndef _RWENGINE_SCRIPTFUNCTIONS_HPP_ #define _RWENGINE_SCRIPTFUNCTIONS_HPP_ -#include +#include #include #include diff --git a/rwengine/src/script/ScriptTypes.hpp b/rwengine/src/script/ScriptTypes.hpp index 7d996555..9164e138 100644 --- a/rwengine/src/script/ScriptTypes.hpp +++ b/rwengine/src/script/ScriptTypes.hpp @@ -9,7 +9,7 @@ #include -#include +#include #include "engine/Garage.hpp" diff --git a/rwgame/GameBase.cpp b/rwgame/GameBase.cpp index 6c09a0e9..60bd8146 100644 --- a/rwgame/GameBase.cpp +++ b/rwgame/GameBase.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include "GitSHA1.h" diff --git a/rwgame/GameConfig.cpp b/rwgame/GameConfig.cpp index f4f7fa3f..9ab72e03 100644 --- a/rwgame/GameConfig.cpp +++ b/rwgame/GameConfig.cpp @@ -1,7 +1,7 @@ #include "GameConfig.hpp" #include -#include +#include #include #include diff --git a/rwgame/MenuSystem.hpp b/rwgame/MenuSystem.hpp index df717dd0..cbf9e911 100644 --- a/rwgame/MenuSystem.hpp +++ b/rwgame/MenuSystem.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include /** * Default values for menus that should match the look and feel of the original diff --git a/rwgame/states/MenuState.cpp b/rwgame/states/MenuState.cpp index a682eb30..a32144c9 100644 --- a/rwgame/states/MenuState.cpp +++ b/rwgame/states/MenuState.cpp @@ -3,7 +3,7 @@ #include "game.hpp" #include -#include +#include #include "RWGame.hpp" MenuState::MenuState(RWGame* game) : State(game) { diff --git a/rwlib/CMakeLists.txt b/rwlib/CMakeLists.txt index e249bb92..68582de4 100644 --- a/rwlib/CMakeLists.txt +++ b/rwlib/CMakeLists.txt @@ -20,7 +20,7 @@ SET(RWLIB_SOURCES source/rw/filesystem.hpp source/rw/forward.hpp source/rw/types.hpp - source/rw/defines.hpp + source/rw/debug.hpp source/platform/FileHandle.hpp source/platform/FileIndex.hpp diff --git a/rwlib/source/loaders/LoaderDFF.cpp b/rwlib/source/loaders/LoaderDFF.cpp index fbed416c..2aa3667c 100644 --- a/rwlib/source/loaders/LoaderDFF.cpp +++ b/rwlib/source/loaders/LoaderDFF.cpp @@ -14,7 +14,7 @@ #include "gl/gl_core_3_3.h" #include "loaders/RWBinaryStream.hpp" #include "platform/FileHandle.hpp" -#include "rw/defines.hpp" +#include "rw/debug.hpp" enum DFFChunks { CHUNK_STRUCT = 0x0001, diff --git a/rwlib/source/loaders/LoaderIMG.cpp b/rwlib/source/loaders/LoaderIMG.cpp index e4fa7cf4..208f67d2 100644 --- a/rwlib/source/loaders/LoaderIMG.cpp +++ b/rwlib/source/loaders/LoaderIMG.cpp @@ -3,7 +3,7 @@ #include #include -#include "rw/defines.hpp" +#include "rw/debug.hpp" LoaderIMG::LoaderIMG() : m_version(GTAIIIVC), m_assetCount(0) { } diff --git a/rwlib/source/loaders/LoaderSDT.cpp b/rwlib/source/loaders/LoaderSDT.cpp index a32c5934..50867864 100644 --- a/rwlib/source/loaders/LoaderSDT.cpp +++ b/rwlib/source/loaders/LoaderSDT.cpp @@ -4,7 +4,7 @@ #include #include -#include "rw/defines.hpp" +#include "rw/debug.hpp" LoaderSDT::LoaderSDT() : m_version(GTAIIIVC), m_assetCount(0) { } diff --git a/rwlib/source/loaders/LoaderTXD.cpp b/rwlib/source/loaders/LoaderTXD.cpp index 2edbac60..5183e4c7 100644 --- a/rwlib/source/loaders/LoaderTXD.cpp +++ b/rwlib/source/loaders/LoaderTXD.cpp @@ -10,7 +10,7 @@ #include "gl/gl_core_3_3.h" #include "loaders/RWBinaryStream.hpp" #include "platform/FileHandle.hpp" -#include "rw/defines.hpp" +#include "rw/debug.hpp" GLuint gErrorTextureData[] = {0xFFFF00FF, 0xFF000000, 0xFF000000, 0xFFFF00FF}; GLuint gDebugTextureData[] = {0xFF0000FF, 0xFF00FF00}; diff --git a/rwlib/source/loaders/RWBinaryStream.hpp b/rwlib/source/loaders/RWBinaryStream.hpp index 92b69633..8a16ba20 100644 --- a/rwlib/source/loaders/RWBinaryStream.hpp +++ b/rwlib/source/loaders/RWBinaryStream.hpp @@ -6,7 +6,7 @@ #include -#include "rw/defines.hpp" +#include "rw/debug.hpp" #include "rw/bit_cast.cpp" /** diff --git a/rwlib/source/rw/bit_cast.cpp b/rwlib/source/rw/bit_cast.cpp index 77112900..3870ae58 100644 --- a/rwlib/source/rw/bit_cast.cpp +++ b/rwlib/source/rw/bit_cast.cpp @@ -4,7 +4,7 @@ //Based on https://gist.github.com/socantre/3472964 #include // memcpy #include // is_trivially_copyable -#include "rw/defines.hpp" // RW_ASSERT +#include "rw/debug.hpp" // RW_ASSERT template inline Dest bit_cast(Source const &source) { diff --git a/rwlib/source/rw/defines.hpp b/rwlib/source/rw/debug.hpp similarity index 96% rename from rwlib/source/rw/defines.hpp rename to rwlib/source/rw/debug.hpp index e38afa15..890af825 100644 --- a/rwlib/source/rw/defines.hpp +++ b/rwlib/source/rw/debug.hpp @@ -1,5 +1,5 @@ -#ifndef _LIBRW_DEFINES_HPP_ -#define _LIBRW_DEFINES_HPP_ +#ifndef _LIBRW_DEBUG_HPP_ +#define _LIBRW_DEBUG_HPP_ #if RW_DEBUG #include diff --git a/rwlib/source/rw/types.hpp b/rwlib/source/rw/types.hpp index f23e40cb..d5bde0dd 100644 --- a/rwlib/source/rw/types.hpp +++ b/rwlib/source/rw/types.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #define RW_USING(feature) 1 == feature diff --git a/tests/test_Config.cpp b/tests/test_Config.cpp index 796e1126..d63b5c10 100644 --- a/tests/test_Config.cpp +++ b/tests/test_Config.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace pt = boost::property_tree;