Merge pull request #152 from TheFakeMontyOnTheRun/ui-ux-tweaks

UI ux tweaks
TheFakeMontyOnTheRun · Jul 1, 2024 · bf4f544 · bf4f544
2 parents 5c094b4 + 0164108
commit bf4f544
Show file tree

Hide file tree

Showing 151 changed files with 12,144 additions and 3,521 deletions.
diff --git a/art/Blaec-gw22P.ttf b/art/Blaec-gw22P.ttf
diff --git a/art/ending.svg b/art/ending.svg
diff --git a/art/logo.svg b/art/logo.svg
diff --git a/common/include/Common.h b/common/include/Common.h
@@ -43,20 +43,25 @@ struct StaticBuffer {
     size_t size;
 };
 
+#ifndef USE_CUSTOM_MEMORY_HANDLER
+#ifndef NO_DYNAMIC_MEMORY_ALLOC
 void *allocMem(size_t sizeInBytes, enum MemoryType type, uint8_t clearAfterAlloc);
 
 void disposeMem(void* ptr);
+#endif
 
 void memCopyToFrom(void* dst, void* src, size_t sizeInBytes);
 
 void memFill(void* dst, uint8_t val, size_t sizeInBytes);
+#endif
 
+#ifdef ENDIANESS_AWARE
 uint8_t isBigEndian(void);
 
-void initFileReader(const char *  dataFilePath);
-
 uint32_t toNativeEndianess(const uint32_t val);
+#endif
 
+int countLines(const char* text);
 
 extern const char *mainText;
 extern char *textBuffer;
@@ -70,6 +75,9 @@ extern size_t biggestOption;
 
 #define TEXT_BUFFER_SIZE (40 * 25)
 
+
+#ifndef USE_OWN_MIN_MAX
+
 #ifndef SMD
 #ifndef WIN32
 #ifndef LEAN_BUILD
@@ -80,3 +88,5 @@ extern size_t biggestOption;
 #endif
 
 #endif
+
+#endif
diff --git a/common/include/Dungeon.h b/common/include/Dungeon.h
@@ -10,7 +10,7 @@ struct GameSnapshot {
     struct Vec2i playerTarget;
 };
 
-struct GameSnapshot dungeon_tick(const enum ECommand cmd);
+struct GameSnapshot dungeonTick(const enum ECommand command);
 
 void dungeon_loadMap(
         const uint8_t *__restrict__ mapData,

diff --git a/common/include/Engine.h b/common/include/Engine.h
@@ -63,8 +63,6 @@ enum EGameMenuState HackingScreen_tickCallback(enum ECommand, void* data);
 
 void HackingScreen_unloadStateCallback(enum EGameMenuState newState);
 
-int countLines(void);
-
 void enterState(enum EGameMenuState State);
 
 int loopTick(enum ECommand cmd);

diff --git a/common/include/Enums.h b/common/include/Enums.h
@@ -12,7 +12,8 @@ enum EDirection {
 enum CrawlerState {
     kCrawlerGameOver = -1,
     kCrawlerQuit = 0,
-    kCrawlerGameInProgress = 1
+    kCrawlerGameInProgress = 1,
+    kCrawlerGameFinished = 2
 };
 
 enum ECommand {

diff --git a/common/include/UI.h b/common/include/UI.h
@@ -37,7 +37,7 @@ enum EGameMenuState handleCursor(const enum EGameMenuState* options,
 				 const enum ECommand cmd,
 				 enum EGameMenuState backState);
 
-void drawGraphic(const uint8_t *shapes);
+void drawGraphic(uint16_t x, uint8_t  y, uint16_t dx, uint8_t dy, const uint8_t *shapes);
 
 extern int8_t cursorPosition;
 

diff --git a/common/src/CTile3DProperties.c b/common/src/CTile3DProperties.c
@@ -97,7 +97,7 @@ void loadPropertyList(const char *propertyFile, struct MapWithCharKey *map, stru
         uint8_t len = *(bufferHead++);
 
         char* meshName = (char*)allocMem(len + 1, GENERAL_MEMORY, 1);
-        memcpy(meshName, bufferHead, len);
+        memCopyToFrom(meshName, (char*)bufferHead, len);
         mesh = (struct Mesh*)allocMem(sizeof(struct Mesh), GENERAL_MEMORY, 1);
         sprintf(&meshNameWithExtension[0], "%s.mdl", meshName);
         loadMesh(mesh, &meshNameWithExtension[0]);

diff --git a/common/src/Common.c b/common/src/Common.c
@@ -43,7 +43,7 @@
 
 
 #ifndef USE_CUSTOM_MEMORY_HANDLER
-
+#ifndef NO_DYNAMIC_MEMORY_ALLOC
 void *allocMem(size_t sizeInBytes, enum MemoryType type, uint8_t clearAfterAlloc) {
     /*
     For the general allocator, we're not worried about the type of memory. It all comes from the
@@ -60,7 +60,7 @@ void *allocMem(size_t sizeInBytes, enum MemoryType type, uint8_t clearAfterAlloc
     if (clearAfterAlloc) {
         memset(ptr, 0, sizeInBytes);
     }
-    
+
     (void)type;
 
     return ptr;
@@ -74,7 +74,7 @@ void disposeMem(void *ptr) {
 #endif
 
 }
-
+#endif
 void memCopyToFrom(void *dst, void *src, size_t sizeInBytes) {
     memcpy(dst, src, sizeInBytes);
 }
@@ -112,3 +112,27 @@ uint32_t toNativeEndianess(const uint32_t val) {
     return val2;
 }
 #endif
+
+
+int countLines(const char* text) {
+    int lines = 1;
+    int chars = 0;
+
+    while(*text) {
+        ++chars;
+
+        if (
+#ifdef XRES_FRAMEBUFFER
+                (chars >= (XRES_FRAMEBUFFER / 8)) ||
+#endif
+                *text == '\n') {
+            ++lines;
+            chars = 0;
+        }
+
+        ++text;
+    }
+
+
+    return lines;
+}
diff --git a/common/src/Crawler.c b/common/src/Crawler.c
@@ -131,8 +131,8 @@ void Crawler_repaintCallback(void) {
         /* The dithered filter on top of the 3D rendering*/
         fillRect(0, 0, XRES_FRAMEBUFFER, YRES_FRAMEBUFFER, getPaletteEntry(0xFF000000), TRUE);
 
-        drawWindowWithOptions((XRES_FRAMEBUFFER / 8) - biggestOption - 3,
-                              ((YRES_FRAMEBUFFER / 8) + 1) - (optionsHeight / 8) - 3,
+        drawWindowWithOptions((XRES_FRAMEBUFFER / 8) - biggestOption - 4,
+                              ((YRES_FRAMEBUFFER / 8) + 1) - (optionsHeight / 8) - 4,
                               biggestOption + 2,
                               (optionsHeight / 8) + 2,
                               AbandonMission_Title,