Assert.hpp

src/TimeManager.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "TimeManager.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 #if TIME_SDL2
   #include <SDL2/SDL.h>

src/assert/Assert.cpp

@@ -5,7 +5,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "assert.hpp"
+#include "Assert.hpp"
 #include "debug/debug.hpp"
 
 #ifndef ASSERTIONS_FAKED

src/assert/Assert.hpp

@@ -96,15 +96,6 @@
     const char *message
   );
 
-  void assertMemoryRangeMatchesImpl(
-    const char *file,
-    const int32_t line,
-    const void *start,
-    const void *end,
-    const size_t size,
-    const char *message
-  );
-
   #define assertTrue(x, message) \
     assertTrueImpl(__FILE__, __LINE__, x, message)
 
@@ -139,5 +130,4 @@
   #define assertDeprecated(message) ((void)0)
   #define assertStrLenMax(str, len, message) ((void)0)
   #define assertStrLenMin(str, len, message) ((void)0)
-
 #endif

src/assert/CMakeLists.txt

@@ -6,5 +6,5 @@
 # Sources
 target_sources(${DUSK_TARGET_NAME}
   PRIVATE
-    assert.cpp
+    Assert.cpp
 )

src/asset/asset.cpp

@@ -8,7 +8,7 @@
 #include "asset.hpp"
 #include "util/memory.hpp"
 #include "util/string.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "asset/assettype.h"
 #include "Engine.hpp"
 #include "debug/debug.hpp"

src/asset/type/assetalphaimage.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "assetalphaimage.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "display/texture.hpp"
 
 void assetAlphaImageLoad(void *data, void *output) {

src/asset/type/assetchunk.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "asset/asset.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "rpg/entity/entity.hpp"
 
 #pragma pack(push, 1)

src/asset/type/assetlanguage.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "asset/asset.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "locale/localemanager.hpp"
 
 void assetLanguageHandler(assetcustom_t custom) {

src/asset/type/assetmap.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "asset/asset.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 
 void assetMapLoad(void *data, void *output) {

src/asset/type/assetpaletteimage.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "assetpaletteimage.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "display/texture.hpp"
 
 void assetPaletteImageLoad(void *data, void *output) {

src/asset/type/assetscript.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "asset/asset.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 void assetScriptHandler(assetcustom_t custom) {
   assertNotNull(custom.zipFile, "Custom asset zip file cannot be NULL");

src/display/camera.cpp

@@ -7,7 +7,7 @@
 
 #include "camera.hpp"
 #include "display/display.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "display/framebuffer.hpp"
 #include "display/screen.hpp"
 

src/display/framebuffer.cpp

@@ -7,7 +7,7 @@
 
 #include "framebuffer.hpp"
 #include "display/display.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 
 framebuffer_t FRAMEBUFFER_BACKBUFFER = {0};

src/display/mesh/mesh.cpp

@@ -7,7 +7,7 @@
 
 #include "mesh.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 void meshInit(
   mesh_t *mesh,

src/display/mesh/quad.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "quad.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 mesh_t QUAD_MESH_SIMPLE;
 meshvertex_t QUAD_MESH_SIMPLE_VERTICES[QUAD_VERTEX_COUNT] = {

src/display/screen.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "screen.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 #include "display/mesh/quad.hpp"
 

src/display/spritebatch.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "spritebatch.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 
 spritebatch_t SPRITEBATCH;

src/display/texture.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "texture.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 #include "util/math.hpp"
 #include "display/palette/palettelist.hpp"

src/input/InputManager.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "InputManager.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 #include "util/string.hpp"
 #include "util/math.hpp"

src/input/inputaction.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "inputaction.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/string.hpp"
 
 // inputaction_t inputActionGetByName(const char_t *name) {

src/input/inputbutton.cpp

@@ -7,7 +7,7 @@
 
 #include "inputbutton.hpp"
 #include "InputManager.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/string.hpp"
 
 inputbuttondata_t INPUT_BUTTON_DATA[] = {

src/locale/localemanager.cpp

@@ -8,7 +8,7 @@
 #include "localemanager.hpp"
 #include "util/memory.hpp"
 #include "asset/asset.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 localemanager_t LOCALE;
 

src/rpg/entity/entity.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "entity.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 #include "util/math.hpp"
 #include "rpg/cutscene/cutscenemode.hpp"

src/rpg/entity/entitydir.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "entitydir.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 entitydir_t entityDirGetOpposite(const entitydir_t dir) {
   switch(dir) {

src/rpg/entity/npc.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "entity.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 #include "rpg/cutscene/scene/testcutscene.hpp"
 #include "rpg/rpgtextbox.hpp"

src/rpg/entity/player.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "entity.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "rpg/rpgcamera.hpp"
 #include "Engine.hpp"
 

src/rpg/rpg.cpp

@@ -12,7 +12,7 @@
 #include "rpgcamera.hpp"
 #include "rpgtextbox.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "Engine.hpp"
 
 using namespace Dusk;

src/rpg/rpgcamera.cpp

@@ -9,7 +9,7 @@
 #include "util/memory.hpp"
 #include "rpg/entity/entity.hpp"
 #include "rpg/world/map.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 rpgcamera_t RPG_CAMERA;
 

src/rpg/rpgtextbox.cpp

@@ -8,7 +8,7 @@
 #include "rpgtextbox.hpp"
 #include "util/memory.hpp"
 #include "util/string.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 rpgtextbox_t RPG_TEXTBOX;
 

src/rpg/world/map.cpp

@@ -7,7 +7,7 @@
 
 #include "map.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "asset/asset.hpp"
 #include "rpg/entity/entity.hpp"
 

src/rpg/world/worldpos.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "worldpos.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 bool_t worldPosIsEqual(const worldpos_t a, const worldpos_t b) {
   return a.x == b.x && a.y == b.y && a.z == b.z;

src/scene/scene/scenemap.cpp

@@ -8,7 +8,7 @@
 #include "scenemap.hpp"
 #include "scene/scenedata.hpp"
 #include "display/spritebatch.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "asset/asset.hpp"
 #include "rpg/entity/entity.hpp"
 #include "rpg/world/map.hpp"

src/scene/scenemanager.cpp

@@ -7,7 +7,7 @@
 
 #include "scenemanager.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "display/framebuffer.hpp"
 #include "util/string.hpp"
 

src/script/func/scriptfunccamera.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "script/scriptcontext.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 
 

src/script/func/scriptfuncentity.hpp

@@ -8,7 +8,7 @@
 #pragma once
 #include "script/scriptcontext.hpp"
 #include "rpg/entity/entity.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 int32_t scriptFuncEntityAdd(lua_State *L) {
   assertNotNull(L, "Lua state cannot be NULL");

src/script/func/scriptfuncsystem.hpp

@@ -8,7 +8,7 @@
 #pragma once
 #include "script/scriptcontext.hpp"
 #include "debug/debug.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 int32_t scriptContextPrint(lua_State *L) {
   assertNotNull(L, "Lua state cannot be NULL");

src/script/scriptcontext.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "scriptcontext.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "asset/asset.hpp"
 #include "util/memory.hpp"
 #include "debug/debug.hpp"

src/script/scriptmanager.cpp

@@ -7,7 +7,7 @@
 
 #include "scriptmanager.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "debug/debug.hpp"
 #include "asset/asset.hpp"
 

src/thread/thread.cpp

@@ -7,7 +7,7 @@
 
 #include "thread.hpp"
 #include "util/memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 void threadInit(thread_t *thread, const threadcallback_t callback) {
   assertNotNull(thread, "Thread cannot be NULL.");

src/ui/ui.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "ui.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "ui/uidebug.hpp"
 #include "util/memory.hpp"
 #include "display/tileset/tileset_minogram.hpp"

src/ui/uiframe.cpp

@@ -7,7 +7,7 @@
 
 #include "uiframe.hpp"
 #include "display/spritebatch.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include <math.h>
 
 void uiFrameDraw(

src/ui/uitext.cpp

@@ -6,7 +6,7 @@
 //  */
 
 #include "uitext.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 #include "display/spritebatch.hpp"
 

src/util/memory.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "memory.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 
 void * memoryAllocate(const size_t size) {
   assertTrue(size > 0, "Cannot allocate 0 bytes of memory.");

src/util/string.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "string.hpp"
-#include "assert/assert.hpp"
+#include "assert/Assert.hpp"
 #include "util/memory.hpp"
 
 bool_t stringIsWhitespace(const char_t c) {