diff --git a/Docs/Unuk Documentation.odt b/Docs/Unuk Documentation.odt index 3ab023f..864c55f 100644 Binary files a/Docs/Unuk Documentation.odt and b/Docs/Unuk Documentation.odt differ diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro index e583cc9..bafdfd9 100644 --- a/Unuk-QT/Unuk-QT.pro +++ b/Unuk-QT/Unuk-QT.pro @@ -12,7 +12,6 @@ HEADERS += ../src/Libs/wglext.h \ ../src/libUnuk/Engine/WorldManager.h \ ../src/libUnuk/Engine/ParticleEmitter.h \ ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/MemClass.h \ ../src/libUnuk/Engine/Collision.h \ ../src/libUnuk/Engine/Character.h \ ../src/libUnuk/Sprite/TextureManager.h \ diff --git a/src/Unuk/Game.h b/src/Unuk/Game.h index 350fa7b..1e1e256 100644 --- a/src/Unuk/Game.h +++ b/src/Unuk/Game.h @@ -16,7 +16,6 @@ #include "../libUnuk/System/Debug.h" #include "../libUnuk/UI/Text.h" #include "../libUnuk/UI/Bar.h" -#include "../libUnuk/Engine/MemClass.h" using namespace std; enum gameNavVal_t { gameMainMenu, gameQuitGame }; diff --git a/src/Unuk/main.cpp b/src/Unuk/main.cpp index 8256774..f1e1926 100644 --- a/src/Unuk/main.cpp +++ b/src/Unuk/main.cpp @@ -10,7 +10,6 @@ #include "../libUnuk/Engine/NPC.h" #include "../libUnuk/System/Debug.h" #include "../libUnuk/System/Input.h" -#include "../libUnuk/Engine/MemClass.h" #include "Constants.h" #include "Globals.h" diff --git a/src/libUnuk/Engine/Character.h b/src/libUnuk/Engine/Character.h index ab9fb0e..fdf00c8 100644 --- a/src/libUnuk/Engine/Character.h +++ b/src/libUnuk/Engine/Character.h @@ -5,7 +5,6 @@ #include "../../Unuk/Globals.h" #include "../../Unuk/Constants.h" -#include "../Engine/MemClass.h" #include "../Sprite/ApplySurface.h" #include "../Sprite/ImageLoader.h" #include "../Engine/Collision.h" diff --git a/src/libUnuk/Engine/MemManager.cpp b/src/libUnuk/Engine/MemManager.cpp index 0ea7d5b..1fd6b5c 100644 --- a/src/libUnuk/Engine/MemManager.cpp +++ b/src/libUnuk/Engine/MemManager.cpp @@ -118,7 +118,7 @@ static int allocationCount = 0; // Amount of allocations. static int allocationMemory = 0; // Memory allocated. static int PeakMemoryUsage = 0; -static int peakPointers = 0; +static int peakPointers = 0; int CalculateHashIndex(const void* buffer) { int value = reinterpret_cast (buffer); diff --git a/src/libUnuk/Engine/WorldManager.h b/src/libUnuk/Engine/WorldManager.h index f03b417..0ea9b17 100644 --- a/src/libUnuk/Engine/WorldManager.h +++ b/src/libUnuk/Engine/WorldManager.h @@ -1,6 +1,5 @@ #pragma once #include -#include "MemClass.h" class Character; class NPC; class Player; diff --git a/src/libUnuk/LevelGen/LevelGen.h b/src/libUnuk/LevelGen/LevelGen.h index 8f2096c..25386c7 100644 --- a/src/libUnuk/LevelGen/LevelGen.h +++ b/src/libUnuk/LevelGen/LevelGen.h @@ -16,7 +16,6 @@ #include "../System/Debug.h" #include "../System/Serialisable.h" #include "../Engine/WorldManager.h" -#include "../Engine/MemClass.h" using namespace std; class Character; diff --git a/src/libUnuk/UI/ButtonGroup.h b/src/libUnuk/UI/ButtonGroup.h index 75ec8cb..74789ad 100644 --- a/src/libUnuk/UI/ButtonGroup.h +++ b/src/libUnuk/UI/ButtonGroup.h @@ -2,7 +2,6 @@ #include #include "../UI/Button.h" -#include "../Engine/MemClass.h" class ButtonGroup { public: