From 951769be9e294e0876a09f39e3cdc4f41e96398e Mon Sep 17 00:00:00 2001 From: afritz1 Date: Tue, 10 Apr 2018 09:42:44 -0700 Subject: [PATCH] Removed unnecessary void parameters. Only relevant in C code, not C++. --- BloodXL/BloodXL_Game.cpp | 2 +- BloodXL/BloodXL_Game.h | 2 +- BloodXL/BloodXL_Player.cpp | 2 +- BloodXL/BloodXL_Player.h | 2 +- DaggerXL/DaggerXL_Game.cpp | 2 +- DaggerXL/DaggerXL_Game.h | 2 +- DaggerXL/DaggerXL_Player.cpp | 2 +- DaggerXL/DaggerXL_Player.h | 2 +- DaggerXL/Logic_Door.cpp | 2 +- DaggerXL/Logic_Door.h | 2 +- DaggerXL/Logic_NPC.cpp | 4 +-- DaggerXL/Logic_NPC.h | 4 +-- DaggerXL/Logic_Obj_Action.cpp | 2 +- DaggerXL/Logic_Obj_Action.h | 2 +- DarkXL/DarkXL_Game.cpp | 2 +- DarkXL/DarkXL_Game.h | 2 +- Engine.cpp | 8 +++--- Engine.h | 2 +- OutlawsXL/OutlawsXL_Game.cpp | 2 +- OutlawsXL/OutlawsXL_Game.h | 2 +- OutlawsXL/OutlawsXL_Player.cpp | 2 +- OutlawsXL/OutlawsXL_Player.h | 2 +- PluginAPI_Func.h | 4 +-- fileformats/LFD_Anim.cpp | 2 +- fileformats/LFD_Anim.h | 2 +- math/Matrix.h | 4 +-- math/Vector2.h | 4 +-- math/Vector3.h | 4 +-- math/Vector4.h | 4 +-- movieplayback/MovieManager.cpp | 2 +- movieplayback/MovieManager.h | 2 +- os/Input.cpp | 4 +-- plugin_framework/XLEngine_Plugin_API.h | 40 +++++++++++++------------- render/Font.cpp | 4 +-- render/Font.h | 4 +-- render/ImageLoader.cpp | 4 +-- render/IndexBuffer.cpp | 2 +- render/IndexBuffer.h | 2 +- render/VertexBuffer.cpp | 2 +- render/VertexBuffer.h | 2 +- render/win/Driver3D_OGL_Win.cpp | 2 +- render/win/wglext.h | 36 +++++++++++------------ ui/Console.cpp | 2 +- ui/Console.h | 2 +- 44 files changed, 94 insertions(+), 94 deletions(-) diff --git a/BloodXL/BloodXL_Game.cpp b/BloodXL/BloodXL_Game.cpp index 3debea5..2d38c0e 100644 --- a/BloodXL/BloodXL_Game.cpp +++ b/BloodXL/BloodXL_Game.cpp @@ -98,7 +98,7 @@ BloodXL_Game::BloodXL_Game(const XLEngine_Plugin_API *API) } } -BloodXL_Game::~BloodXL_Game(void) +BloodXL_Game::~BloodXL_Game() { if ( m_Player ) { diff --git a/BloodXL/BloodXL_Game.h b/BloodXL/BloodXL_Game.h index d2e5c07..7841aa4 100644 --- a/BloodXL/BloodXL_Game.h +++ b/BloodXL/BloodXL_Game.h @@ -10,7 +10,7 @@ class BloodXL_Game { public: BloodXL_Game(const XLEngine_Plugin_API *API); - ~BloodXL_Game(void); + ~BloodXL_Game(); void FixedUpdate(); void VariableUpdate(float dt); diff --git a/BloodXL/BloodXL_Player.cpp b/BloodXL/BloodXL_Player.cpp index 999e334..35d0e19 100644 --- a/BloodXL/BloodXL_Player.cpp +++ b/BloodXL/BloodXL_Player.cpp @@ -36,7 +36,7 @@ BloodXL_Player::BloodXL_Player(const XLEngine_Plugin_API *API) m_bPassthruAdjoins = false; } -BloodXL_Player::~BloodXL_Player(void) +BloodXL_Player::~BloodXL_Player() { } diff --git a/BloodXL/BloodXL_Player.h b/BloodXL/BloodXL_Player.h index af9b3db..7a30fd3 100644 --- a/BloodXL/BloodXL_Player.h +++ b/BloodXL/BloodXL_Player.h @@ -9,7 +9,7 @@ class BloodXL_Player { public: BloodXL_Player(const XLEngine_Plugin_API *API); - ~BloodXL_Player(void); + ~BloodXL_Player(); void SetPassthruAdjoins(bool bPassthru) { m_bPassthruAdjoins = bPassthru; } void KeyDown(int32_t key); diff --git a/DaggerXL/DaggerXL_Game.cpp b/DaggerXL/DaggerXL_Game.cpp index 4552fbe..e5084d8 100644 --- a/DaggerXL/DaggerXL_Game.cpp +++ b/DaggerXL/DaggerXL_Game.cpp @@ -58,7 +58,7 @@ DaggerXL_Game::DaggerXL_Game(const XLEngine_Plugin_API *API) s_pGamePtr = this; } -DaggerXL_Game::~DaggerXL_Game(void) +DaggerXL_Game::~DaggerXL_Game() { if ( m_Player ) { diff --git a/DaggerXL/DaggerXL_Game.h b/DaggerXL/DaggerXL_Game.h index a35fe9d..0a3f8ca 100644 --- a/DaggerXL/DaggerXL_Game.h +++ b/DaggerXL/DaggerXL_Game.h @@ -16,7 +16,7 @@ class DaggerXL_Game { public: DaggerXL_Game(const XLEngine_Plugin_API *API); - ~DaggerXL_Game(void); + ~DaggerXL_Game(); void FixedUpdate(); void VariableUpdate(float dt); diff --git a/DaggerXL/DaggerXL_Player.cpp b/DaggerXL/DaggerXL_Player.cpp index f69ee90..f1b8224 100644 --- a/DaggerXL/DaggerXL_Player.cpp +++ b/DaggerXL/DaggerXL_Player.cpp @@ -63,7 +63,7 @@ DaggerXL_Player::DaggerXL_Player(const XLEngine_Plugin_API *API) m_bAutoMove = false; } -DaggerXL_Player::~DaggerXL_Player(void) +DaggerXL_Player::~DaggerXL_Player() { } diff --git a/DaggerXL/DaggerXL_Player.h b/DaggerXL/DaggerXL_Player.h index 9a5da0d..a9d8c17 100644 --- a/DaggerXL/DaggerXL_Player.h +++ b/DaggerXL/DaggerXL_Player.h @@ -9,7 +9,7 @@ class DaggerXL_Player { public: DaggerXL_Player(const XLEngine_Plugin_API *API); - ~DaggerXL_Player(void); + ~DaggerXL_Player(); void KeyDown(int32_t key); diff --git a/DaggerXL/Logic_Door.cpp b/DaggerXL/Logic_Door.cpp index bb0ca73..2a58328 100644 --- a/DaggerXL/Logic_Door.cpp +++ b/DaggerXL/Logic_Door.cpp @@ -15,7 +15,7 @@ Logic_Door::Logic_Door(const XLEngine_Plugin_API *API) m_pAPI->Logic_CreateFromCode("LOGIC_DOOR", this, funcs); } -Logic_Door::~Logic_Door(void) +Logic_Door::~Logic_Door() { } diff --git a/DaggerXL/Logic_Door.h b/DaggerXL/Logic_Door.h index b6c2b59..c8a894f 100644 --- a/DaggerXL/Logic_Door.h +++ b/DaggerXL/Logic_Door.h @@ -9,7 +9,7 @@ class Logic_Door { public: Logic_Door(const XLEngine_Plugin_API *API); - ~Logic_Door(void); + ~Logic_Door(); private: const XLEngine_Plugin_API *m_pAPI; diff --git a/DaggerXL/Logic_NPC.cpp b/DaggerXL/Logic_NPC.cpp index 9c6559a..a66fc4b 100644 --- a/DaggerXL/Logic_NPC.cpp +++ b/DaggerXL/Logic_NPC.cpp @@ -96,7 +96,7 @@ bool NPC::IsEnabled() return m_Data.uState!=NPC_STATE_DISABLED; } -NPC::~NPC(void) +NPC::~NPC() { } @@ -111,7 +111,7 @@ Logic_NPC::Logic_NPC(const XLEngine_Plugin_API *API) m_pAPI->Logic_CreateFromCode("LOGIC_NPC", this, funcs); } -Logic_NPC::~Logic_NPC(void) +Logic_NPC::~Logic_NPC() { } diff --git a/DaggerXL/Logic_NPC.h b/DaggerXL/Logic_NPC.h index c4f980b..5a9ffb0 100644 --- a/DaggerXL/Logic_NPC.h +++ b/DaggerXL/Logic_NPC.h @@ -9,7 +9,7 @@ class Logic_NPC { public: Logic_NPC(const XLEngine_Plugin_API *API); - ~Logic_NPC(void); + ~Logic_NPC(); private: const XLEngine_Plugin_API *m_pAPI; @@ -26,7 +26,7 @@ class NPC { public: NPC(const XLEngine_Plugin_API *pAPI); - ~NPC(void); + ~NPC(); void Reset(const XLEngine_Plugin_API *pAPI, int32_t NPC_file, float x, float y, float z, int32_t worldX, int32_t worldY, float dirx=0.0f, float diry=1.0f); void Enable(const XLEngine_Plugin_API *pAPI, bool bEnable); diff --git a/DaggerXL/Logic_Obj_Action.cpp b/DaggerXL/Logic_Obj_Action.cpp index 2206161..279340f 100644 --- a/DaggerXL/Logic_Obj_Action.cpp +++ b/DaggerXL/Logic_Obj_Action.cpp @@ -31,7 +31,7 @@ Logic_Obj_Action::Logic_Obj_Action(const XLEngine_Plugin_API *API) m_pAPI->Logic_CreateFromCode("LOGIC_OBJ_ACTION", this, funcs); } -Logic_Obj_Action::~Logic_Obj_Action(void) +Logic_Obj_Action::~Logic_Obj_Action() { } diff --git a/DaggerXL/Logic_Obj_Action.h b/DaggerXL/Logic_Obj_Action.h index 6b61e75..55c5d60 100644 --- a/DaggerXL/Logic_Obj_Action.h +++ b/DaggerXL/Logic_Obj_Action.h @@ -9,7 +9,7 @@ class Logic_Obj_Action { public: Logic_Obj_Action(const XLEngine_Plugin_API *API); - ~Logic_Obj_Action(void); + ~Logic_Obj_Action(); private: const XLEngine_Plugin_API *m_pAPI; diff --git a/DarkXL/DarkXL_Game.cpp b/DarkXL/DarkXL_Game.cpp index b7cb9b5..7fbe20f 100644 --- a/DarkXL/DarkXL_Game.cpp +++ b/DarkXL/DarkXL_Game.cpp @@ -32,7 +32,7 @@ DarkXL_Game::DarkXL_Game(const XLEngine_Plugin_API *API) CutscenePlayer::Init(API); } -DarkXL_Game::~DarkXL_Game(void) +DarkXL_Game::~DarkXL_Game() { } diff --git a/DarkXL/DarkXL_Game.h b/DarkXL/DarkXL_Game.h index 3317b56..01120f0 100644 --- a/DarkXL/DarkXL_Game.h +++ b/DarkXL/DarkXL_Game.h @@ -8,7 +8,7 @@ class DarkXL_Game { public: DarkXL_Game(const XLEngine_Plugin_API *API); - ~DarkXL_Game(void); + ~DarkXL_Game(); void FixedUpdate(); void VariableUpdate(float dt); diff --git a/Engine.cpp b/Engine.cpp index 07867bc..5650061 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -489,7 +489,7 @@ void Game_SetGameData(const char *pszName, int versionMajor, int versionMinor) TextureCache::SetPath( szGameDir ); } -void Game_LoadWorldMap(void) +void Game_LoadWorldMap() { WorldMap::Load(); } @@ -506,12 +506,12 @@ void Engine::Engine_SetCameraData(float *pos, float *dir, float fSkew, float fSp pCamera->SetSector( uSector ); } -XL_BOOL Engine::Engine_AllowPlayerControls(void) +XL_BOOL Engine::Engine_AllowPlayerControls() { return (XL_Console::IsActive() == true || XL_Console::IsChatActive() == true ) ? false : true; } -void UnloadAllWorldCells(void) +void UnloadAllWorldCells() { m_pEngineForAPI->GetWorld()->UnloadWorldCells(); } @@ -695,7 +695,7 @@ void Engine::SetupPluginAPI() m_pPluginAPI->SetColormap = TextureLoader::SetColormap; //World m_pPluginAPI->World_CreateTerrain = World_CreateTerrain; - m_pPluginAPI->World_UnloadAllCells = UnloadAllWorldCells; //void World_UnloadAllCells(void); + m_pPluginAPI->World_UnloadAllCells = UnloadAllWorldCells; //void World_UnloadAllCells(); m_pPluginAPI->World_LoadCell = LoadWorldCell; //void World_LoadCell(uint32_t cellType, uint32_t archiveType, const char *pszArchive, const char *pszFile, int32_t worldX, int32_t worldY); m_pPluginAPI->World_Collide = World_Collide; m_pPluginAPI->World_Activate = World_Activate; diff --git a/Engine.h b/Engine.h index a84d20d..507a388 100644 --- a/Engine.h +++ b/Engine.h @@ -55,7 +55,7 @@ class Engine static bool m_bContinueLoop; static void Engine_SetCameraData(float *pos, float *dir, float fSkew, float fSpeed, uint32_t uSector); - static XL_BOOL Engine_AllowPlayerControls(void); + static XL_BOOL Engine_AllowPlayerControls(); static void Object_GetCameraVector(uint32_t uObjID, float& x, float& y, float& z); private: void Destroy(); diff --git a/OutlawsXL/OutlawsXL_Game.cpp b/OutlawsXL/OutlawsXL_Game.cpp index b1bb38c..3a2328f 100644 --- a/OutlawsXL/OutlawsXL_Game.cpp +++ b/OutlawsXL/OutlawsXL_Game.cpp @@ -33,7 +33,7 @@ OutlawsXL_Game::OutlawsXL_Game(const XLEngine_Plugin_API *API) m_Player = xlNew OutlawsXL_Player(API); } -OutlawsXL_Game::~OutlawsXL_Game(void) +OutlawsXL_Game::~OutlawsXL_Game() { if ( m_Player ) { diff --git a/OutlawsXL/OutlawsXL_Game.h b/OutlawsXL/OutlawsXL_Game.h index fc01d9b..8f12c97 100644 --- a/OutlawsXL/OutlawsXL_Game.h +++ b/OutlawsXL/OutlawsXL_Game.h @@ -11,7 +11,7 @@ class OutlawsXL_Game { public: OutlawsXL_Game(const XLEngine_Plugin_API *API); - ~OutlawsXL_Game(void); + ~OutlawsXL_Game(); void FixedUpdate(); void VariableUpdate(float dt); diff --git a/OutlawsXL/OutlawsXL_Player.cpp b/OutlawsXL/OutlawsXL_Player.cpp index 8d6ab28..f88deb3 100644 --- a/OutlawsXL/OutlawsXL_Player.cpp +++ b/OutlawsXL/OutlawsXL_Player.cpp @@ -32,7 +32,7 @@ OutlawsXL_Player::OutlawsXL_Player(const XLEngine_Plugin_API *API) m_bPassthruAdjoins = false; } -OutlawsXL_Player::~OutlawsXL_Player(void) +OutlawsXL_Player::~OutlawsXL_Player() { } diff --git a/OutlawsXL/OutlawsXL_Player.h b/OutlawsXL/OutlawsXL_Player.h index d8f60a1..12fc15c 100644 --- a/OutlawsXL/OutlawsXL_Player.h +++ b/OutlawsXL/OutlawsXL_Player.h @@ -9,7 +9,7 @@ class OutlawsXL_Player { public: OutlawsXL_Player(const XLEngine_Plugin_API *API); - ~OutlawsXL_Player(void); + ~OutlawsXL_Player(); void SetPassthruAdjoins(bool bPassthru) { m_bPassthruAdjoins = bPassthru; } diff --git a/PluginAPI_Func.h b/PluginAPI_Func.h index 39e6b27..ea91742 100644 --- a/PluginAPI_Func.h +++ b/PluginAPI_Func.h @@ -3,8 +3,8 @@ //Input, implemented in Input.cpp extern int32_t Input_IsKeyDown(int32_t key); -extern float Input_GetMousePosX(void); -extern float Input_GetMousePosY(void); +extern float Input_GetMousePosX(); +extern float Input_GetMousePosY(); extern int32_t Input_AddKeyDownCB(Input_KeyDownCB pCB, int32_t nFlags); extern int32_t Input_AddCharDownCB(Input_KeyDownCB pCB); diff --git a/fileformats/LFD_Anim.cpp b/fileformats/LFD_Anim.cpp index 517b9a6..061eaf6 100644 --- a/fileformats/LFD_Anim.cpp +++ b/fileformats/LFD_Anim.cpp @@ -21,7 +21,7 @@ LFD_Anim::LFD_Anim(IDriver3D *pDriver) m_pDriver = pDriver; } -LFD_Anim::~LFD_Anim(void) +LFD_Anim::~LFD_Anim() { Destroy(); } diff --git a/fileformats/LFD_Anim.h b/fileformats/LFD_Anim.h index 79fa8b9..44356cb 100644 --- a/fileformats/LFD_Anim.h +++ b/fileformats/LFD_Anim.h @@ -25,7 +25,7 @@ class LFD_Anim { public: LFD_Anim(IDriver3D *pDriver); - ~LFD_Anim(void); + ~LFD_Anim(); void Destroy(); static bool LoadPLTT(char *pData, int32_t len); diff --git a/math/Matrix.h b/math/Matrix.h index a5d3cec..ec81717 100644 --- a/math/Matrix.h +++ b/math/Matrix.h @@ -24,7 +24,7 @@ class Matrix float m[16]; - Matrix(void) {;} + Matrix() {;} Matrix(int32_t identity) { if ( identity ) @@ -32,7 +32,7 @@ class Matrix Identity(); } } - ~Matrix(void) {;} + ~Matrix() {;} void ProjPersp(float fov, float aspect, float fZNear=0.1f, float fZFar=1000.0f, float fSkew=0.0f); void ProjOrtho(float w, float h, float zMin=0.1f, float zMax=1000.0f); diff --git a/math/Vector2.h b/math/Vector2.h index 699e26e..eb764f0 100644 --- a/math/Vector2.h +++ b/math/Vector2.h @@ -22,9 +22,9 @@ class Vector2 { public: - Vector2(void) { x = 0.0f; y = 0.0f; } + Vector2() { x = 0.0f; y = 0.0f; } Vector2(float _x, float _y) { x = _x; y = _y; } - ~Vector2(void) {;} + ~Vector2() {;} float Normalize(); float Length() diff --git a/math/Vector3.h b/math/Vector3.h index 1f4d87c..abb5775 100644 --- a/math/Vector3.h +++ b/math/Vector3.h @@ -20,9 +20,9 @@ class Vector3 { public: - Vector3(void) { x = 0.0f; y = 0.0f; z = 0.0f; } + Vector3() { x = 0.0f; y = 0.0f; z = 0.0f; } Vector3(float _x, float _y, float _z) { x = _x; y = _y; z = _z; } - ~Vector3(void) {;} + ~Vector3() {;} float Length() { diff --git a/math/Vector4.h b/math/Vector4.h index b5f99a1..d8da509 100644 --- a/math/Vector4.h +++ b/math/Vector4.h @@ -8,9 +8,9 @@ class Vector4 { public: - Vector4(void) { x = 0.0f; y = 0.0f; z = 0.0f; w = 0.0f; } + Vector4() { x = 0.0f; y = 0.0f; z = 0.0f; w = 0.0f; } Vector4(float _x, float _y, float _z, float _w) { x = _x; y = _y; z = _z; w = _w; } - ~Vector4(void) {;} + ~Vector4() {;} float Normalize(); float Normalize3(); diff --git a/movieplayback/MovieManager.cpp b/movieplayback/MovieManager.cpp index e4c8d44..785b677 100644 --- a/movieplayback/MovieManager.cpp +++ b/movieplayback/MovieManager.cpp @@ -93,7 +93,7 @@ int32_t MovieManager::UpdateMovie() return 0; } -void MovieManager::StopMovie(void) +void MovieManager::StopMovie() { if ( m_pCurPlayer ) { diff --git a/movieplayback/MovieManager.h b/movieplayback/MovieManager.h index b93a999..61d699c 100644 --- a/movieplayback/MovieManager.h +++ b/movieplayback/MovieManager.h @@ -22,7 +22,7 @@ class MovieManager static void SetPlayerArchives(uint32_t uArchiveType, const char *pszArchive0, const char *pszArchive1); static int32_t StartMovie(const char *pszFile, uint32_t uFlags, int32_t nSpeed); static int32_t UpdateMovie(); - static void StopMovie(void); + static void StopMovie(); static void RenderMovie(float fDeltaTime); private: diff --git a/os/Input.cpp b/os/Input.cpp index 40e8946..cbb7f02 100644 --- a/os/Input.cpp +++ b/os/Input.cpp @@ -155,12 +155,12 @@ int32_t Input_IsKeyDown(int32_t key) return Input::IsKeyDown(key) ? 1 : 0; } -float Input_GetMousePosX(void) +float Input_GetMousePosX() { return Input::GetMouseX(); } -float Input_GetMousePosY(void) +float Input_GetMousePosY() { return Input::GetMouseY(); } diff --git a/plugin_framework/XLEngine_Plugin_API.h b/plugin_framework/XLEngine_Plugin_API.h index 31a2134..c363cd1 100644 --- a/plugin_framework/XLEngine_Plugin_API.h +++ b/plugin_framework/XLEngine_Plugin_API.h @@ -22,19 +22,19 @@ typedef void (*XAPI_Game_Update)(int32_t, float, XLEngine_Plugin_API*, void*); typedef void (*XAPI_Game_Render)(int32_t, float, XLEngine_Plugin_API*, void*); typedef void (*XAPI_World_Update)(int32_t, int32_t, XLEngine_Plugin_API*, void*); typedef void (*XAPI_Engine_SetCameraData)(float *, float *, float, float, uint32_t); -typedef XL_BOOL (*XAPI_AllowPlayerControls)(void); +typedef XL_BOOL (*XAPI_AllowPlayerControls)(); -typedef const char* (*XAPI_Startup_GetStartMap)(void); -typedef int32_t (*XAPI_IsServer)(void); +typedef const char* (*XAPI_Startup_GetStartMap)(); +typedef int32_t (*XAPI_IsServer)(); typedef int32_t (*XAPI_Game_SetUpdateCB)(XAPI_Game_Update, void*); typedef int32_t (*XAPI_Game_SetRenderCB)(XAPI_Game_Render, void*); typedef void (*XAPI_Game_SetGameInfo)(const char*, int, int); -typedef void (*XAPI_Game_LoadWorldMap)(void); +typedef void (*XAPI_Game_LoadWorldMap)(); typedef int32_t (*XAPI_World_SetUpdateCB)(XAPI_World_Update, void*); typedef int32_t (*XAPI_Input_KeyDown)(int32_t); -typedef float (*XAPI_Input_MousePos)(void); -typedef float (*XAPI_Input_GetMouseDelta)(void); +typedef float (*XAPI_Input_MousePos)(); +typedef float (*XAPI_Input_GetMouseDelta)(); typedef int32_t (*XAPI_Input_GameKeyDownCB)(Input_KeyDownCB, int32_t); typedef int32_t (*XAPI_Input_GameCharDownCB)(Input_KeyDownCB); typedef void (*XAPI_Input_EnableMouseLocking)(XL_BOOL); @@ -47,30 +47,30 @@ typedef void (*XAPI_Start_Script)(const char *); typedef int32_t (*XAPI_ScriptSystem_RegisterFunc)(const char *, const asSFuncPtr&); typedef int32_t (*XAPI_GameFile_Open)(uint32_t, const char *, const char *); -typedef uint32_t (*XAPI_GameFile_Length)(void); +typedef uint32_t (*XAPI_GameFile_Length)(); typedef void (*XAPI_GameFile_Read)(void *, uint32_t); -typedef void (*XAPI_GameFile_Close)(void); +typedef void (*XAPI_GameFile_Close)(); typedef int32_t (*XAPI_SysFile_Open)(const char *); -typedef uint32_t (*XAPI_SysFile_Length)(void); +typedef uint32_t (*XAPI_SysFile_Length)(); typedef void (*XAPI_SysFile_Read)(void *, uint32_t, uint32_t); -typedef void (*XAPI_SysFile_Close)(void); +typedef void (*XAPI_SysFile_Close)(); typedef void (*XAPI_Parser_SetData)(char *, uint32_t, uint32_t); typedef int32_t (*XAPI_Parser_SearchKeyword_int32_t)(const char *, int32_t&); -typedef uint32_t (*XAPI_Parser_GetFilePtr)(void); +typedef uint32_t (*XAPI_Parser_GetFilePtr)(); typedef void (*XAPI_MoviePlayer_SetPlayer)(uint32_t); typedef void (*XAPI_MoviePlayer_SetArchives)(uint32_t, const char *, const char *); typedef int32_t (*XAPI_MoviePlayer_Start)(const char *, uint32_t, int32_t); -typedef int32_t (*XAPI_MoviePlayer_Update)(void); -typedef void (*XAPI_MoviePlayer_Stop)(void); +typedef int32_t (*XAPI_MoviePlayer_Update)(); +typedef void (*XAPI_MoviePlayer_Stop)(); typedef void (*XAPI_MoviePlayer_Render)(float); typedef void (*XAPI_SetGamePalette)(uint8_t, uint8_t *, uint32_t, uint32_t); typedef void (*XAPI_SetColormap)(uint8_t, uint8_t *, int32_t); typedef void (*XAPI_World_CreateTerrain)(int32_t, int32_t); -typedef void (*XAPI_World_UnloadAllCells)(void); +typedef void (*XAPI_World_UnloadAllCells)(); typedef void (*XAPI_World_LoadCell)(uint32_t, uint32_t, const char *, const char *, int32_t, int32_t); typedef void (*XAPI_World_Collide)(void *, void *, uint32_t& , float, int32_t); typedef void (*XAPI_World_Activate)(void *, void *, uint32_t&); @@ -86,7 +86,7 @@ typedef ObjectPhysicsData* (*XAPI_Object_GetPhysicsData)(uint32_t); typedef void* (*XAPI_Object_GetGameData)(uint32_t); typedef void (*XAPI_Object_SetGameData)(uint32_t, void *); typedef void (*XAPI_Object_ReserveObjects)(uint32_t); -typedef void (*XAPI_Object_FreeAllObjects)(void); +typedef void (*XAPI_Object_FreeAllObjects)(); typedef void (*XAPI_SetObjectAngles)(uint32_t, float, float, float); typedef void (*XAPI_ObjectEnableCollision)(uint32_t, int32_t); typedef void (*XAPI_Object_SendMessage)(uint32_t, uint32_t, float); @@ -129,10 +129,10 @@ struct XLEngine_Plugin_API //Input XAPI_Input_KeyDown IsKeyDown; //int32_t IsKeyDown(int32_t key); - XAPI_Input_MousePos GetMouseX; //float GetMouseX(void); - XAPI_Input_MousePos GetMouseY; //float GetMouesY(void); - XAPI_Input_GetMouseDelta GetMouseDx; //float GetMouseDx(void) - XAPI_Input_GetMouseDelta GetMouseDy; //float GetMouseDy(void) + XAPI_Input_MousePos GetMouseX; //float GetMouseX(); + XAPI_Input_MousePos GetMouseY; //float GetMouesY(); + XAPI_Input_GetMouseDelta GetMouseDx; //float GetMouseDx() + XAPI_Input_GetMouseDelta GetMouseDy; //float GetMouseDy() XAPI_Input_GameKeyDownCB AddKeyDownCallback; //int32_t AddKeyDownCallback( Input_KeyDownCB pCB, int32_t nFlags ); XAPI_Input_GameCharDownCB AddCharDownCallback; //int32_t AddCharDownCallback( Input_KeyDownCB pCB ); XAPI_Input_EnableMouseLocking EnableMouseLocking; //void EnableMouseLocking( XL_BOOL bEnable ); @@ -177,7 +177,7 @@ struct XLEngine_Plugin_API //World XAPI_World_CreateTerrain World_CreateTerrain; //void World_CreateTerrain(int width, int height) - XAPI_World_UnloadAllCells World_UnloadAllCells; //void World_UnloadAllCells(void); + XAPI_World_UnloadAllCells World_UnloadAllCells; //void World_UnloadAllCells(); XAPI_World_LoadCell World_LoadCell; //void World_LoadCell(uint32_t cellType, uint32_t archiveType, const char *pszArchive, const char *pszFile, int32_t worldX, int32_t worldY); XAPI_World_Collide World_Collide; //void World_Collision(Vector3 *p0, Vector3 *p1, uint32_t& uSector, float fRadius, int32_t nPassThruAdjoins=0); XAPI_World_Activate World_Activate; //void World_Activate(Vector3 *p0, Vector3 *p1, uint32_t& uSector); diff --git a/render/Font.cpp b/render/Font.cpp index 071dd4c..2269b0d 100644 --- a/render/Font.cpp +++ b/render/Font.cpp @@ -8,12 +8,12 @@ #include #include -XLFont::XLFont(void) +XLFont::XLFont() { m_hTex = XL_INVALID_TEXTURE; } -XLFont::~XLFont(void) +XLFont::~XLFont() { } diff --git a/render/Font.h b/render/Font.h index 954b509..67f8e74 100644 --- a/render/Font.h +++ b/render/Font.h @@ -40,8 +40,8 @@ struct Charset class XLFont { public: - XLFont(void); - ~XLFont(void); + XLFont(); + ~XLFont(); bool Load( const std::string& szFile, IDriver3D *pDriver ); TextureHandle GetTexture() { return m_hTex; } diff --git a/render/ImageLoader.cpp b/render/ImageLoader.cpp index fd5be3a..c670a07 100644 --- a/render/ImageLoader.cpp +++ b/render/ImageLoader.cpp @@ -8,7 +8,7 @@ #define MAX_IMAGE_WIDTH 2048 -ImageLoader::ImageLoader(void) +ImageLoader::ImageLoader() { //we're going to allocate a buffer for image loading. m_pImageData = (uint8_t *)xlMalloc(MAX_IMAGE_WIDTH*MAX_IMAGE_WIDTH*4); @@ -23,7 +23,7 @@ ImageLoader::ImageLoader(void) ilEnable(IL_ORIGIN_SET); } -ImageLoader::~ImageLoader(void) +ImageLoader::~ImageLoader() { if ( m_pImageData ) { diff --git a/render/IndexBuffer.cpp b/render/IndexBuffer.cpp index 5c16410..7b77059 100644 --- a/render/IndexBuffer.cpp +++ b/render/IndexBuffer.cpp @@ -14,7 +14,7 @@ IndexBuffer::IndexBuffer(IDriver3D *pDriver) m_pDriver = pDriver; } -IndexBuffer::~IndexBuffer(void) +IndexBuffer::~IndexBuffer() { if ( m_pMemory ) { diff --git a/render/IndexBuffer.h b/render/IndexBuffer.h index 1c1b0a4..618265a 100644 --- a/render/IndexBuffer.h +++ b/render/IndexBuffer.h @@ -9,7 +9,7 @@ class IndexBuffer { public: IndexBuffer(IDriver3D *pDriver); - ~IndexBuffer(void); + ~IndexBuffer(); bool Create(uint32_t uCount, uint32_t uStride, bool bDynamic); void Destroy(); diff --git a/render/VertexBuffer.cpp b/render/VertexBuffer.cpp index 0ea2b53..9123a8e 100644 --- a/render/VertexBuffer.cpp +++ b/render/VertexBuffer.cpp @@ -16,7 +16,7 @@ VertexBuffer::VertexBuffer(IDriver3D *pDriver) m_pDriver = pDriver; } -VertexBuffer::~VertexBuffer(void) +VertexBuffer::~VertexBuffer() { if ( m_pMemory ) { diff --git a/render/VertexBuffer.h b/render/VertexBuffer.h index 3e7d14f..b386d5a 100644 --- a/render/VertexBuffer.h +++ b/render/VertexBuffer.h @@ -9,7 +9,7 @@ class VertexBuffer { public: VertexBuffer(IDriver3D *pDriver); - ~VertexBuffer(void); + ~VertexBuffer(); bool Create(uint32_t uStride, uint32_t uCount, bool bDynamic, uint32_t uVBO_Flags); void Destroy(); diff --git a/render/win/Driver3D_OGL_Win.cpp b/render/win/Driver3D_OGL_Win.cpp index 363f669..758d529 100644 --- a/render/win/Driver3D_OGL_Win.cpp +++ b/render/win/Driver3D_OGL_Win.cpp @@ -7,7 +7,7 @@ //WGL Extension crap... fortunately only on Windows. typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC)(int interval); -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void); +typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC)(); PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = nullptr; HGLRC m_hRC; diff --git a/render/win/wglext.h b/render/win/wglext.h index b5dc7bf..28d4f61 100644 --- a/render/win/wglext.h +++ b/render/win/wglext.h @@ -501,10 +501,10 @@ typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAt #define WGL_ARB_make_current_read 1 #ifdef WGL_WGLEXT_PROTOTYPES extern BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCARB (void); +extern HDC WINAPI wglGetCurrentReadDCARB (); #endif /* WGL_WGLEXT_PROTOTYPES */ typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void); +typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (); #endif #ifndef WGL_ARB_pbuffer @@ -576,19 +576,19 @@ typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); #ifndef WGL_EXT_extensions_string #define WGL_EXT_extensions_string 1 #ifdef WGL_WGLEXT_PROTOTYPES -extern const char * WINAPI wglGetExtensionsStringEXT (void); +extern const char * WINAPI wglGetExtensionsStringEXT (); #endif /* WGL_WGLEXT_PROTOTYPES */ -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); +typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (); #endif #ifndef WGL_EXT_make_current_read #define WGL_EXT_make_current_read 1 #ifdef WGL_WGLEXT_PROTOTYPES extern BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCEXT (void); +extern HDC WINAPI wglGetCurrentReadDCEXT (); #endif /* WGL_WGLEXT_PROTOTYPES */ typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void); +typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (); #endif #ifndef WGL_EXT_pbuffer @@ -623,10 +623,10 @@ typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAt #define WGL_EXT_swap_control 1 #ifdef WGL_WGLEXT_PROTOTYPES extern BOOL WINAPI wglSwapIntervalEXT (int interval); -extern int WINAPI wglGetSwapIntervalEXT (void); +extern int WINAPI wglGetSwapIntervalEXT (); #endif /* WGL_WGLEXT_PROTOTYPES */ typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); -typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); +typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (); #endif #ifndef WGL_EXT_depth_float @@ -740,13 +740,13 @@ typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LP #ifndef WGL_I3D_swap_frame_lock #define WGL_I3D_swap_frame_lock 1 #ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnableFrameLockI3D (void); -extern BOOL WINAPI wglDisableFrameLockI3D (void); +extern BOOL WINAPI wglEnableFrameLockI3D (); +extern BOOL WINAPI wglDisableFrameLockI3D (); extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag); extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag); #endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (); +typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (); typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag); typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); #endif @@ -755,13 +755,13 @@ typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); #define WGL_I3D_swap_frame_usage 1 #ifdef WGL_WGLEXT_PROTOTYPES extern BOOL WINAPI wglGetFrameUsageI3D (float *pUsage); -extern BOOL WINAPI wglBeginFrameTrackingI3D (void); -extern BOOL WINAPI wglEndFrameTrackingI3D (void); +extern BOOL WINAPI wglBeginFrameTrackingI3D (); +extern BOOL WINAPI wglEndFrameTrackingI3D (); extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); #endif /* WGL_WGLEXT_PROTOTYPES */ typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage); -typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); +typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (); +typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (); typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); #endif @@ -863,7 +863,7 @@ extern HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id); extern HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList); extern BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc); extern BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc); -extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void); +extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (); extern VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); #endif /* WGL_WGLEXT_PROTOTYPES */ typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids); @@ -873,7 +873,7 @@ typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList); typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); +typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (); typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); #endif diff --git a/ui/Console.cpp b/ui/Console.cpp index 0983517..e68cabf 100644 --- a/ui/Console.cpp +++ b/ui/Console.cpp @@ -68,7 +68,7 @@ Console::Console(IDriver3D *pDriver) m_Color.Set(0.20f, 0.20f, 0.20f, 0.85f); } -Console::~Console(void) +Console::~Console() { } diff --git a/ui/Console.h b/ui/Console.h index 12fb31d..859f5b0 100644 --- a/ui/Console.h +++ b/ui/Console.h @@ -34,7 +34,7 @@ class Console public: Console(IDriver3D *pDriver3D); - ~Console(void); + ~Console(); void SetGameInfo(const std::string& gameName, int32_t versionMinor, int32_t versionMajor);