fix: migrate map to new code after refactor

src/structs.h

@@ -450,6 +450,6 @@ typedef struct
   Settings settings;
 
   Map map;
-} Game_System;
+} GameState;
 
 #endif // STRUCTS_H

src/system/clearResources.c

@@ -14,9 +14,9 @@
  *********************************************************/
 
 #include "../CRougeLite.h" // NOTE: declare global extern vars
-#include "../game/player.h"
-#include "../game/enemy.h"
 #include "../game/combatAction.h"
+#include "../game/enemy.h"
+#include "../game/player.h"
 
 // ***************************
 // Private Function Prototypes
@@ -45,7 +45,8 @@ void clearGameState() {
 }
 
 void freeResource(void *item) {
-  if (item == NULL) return;
+  if (item == NULL)
+    return;
   free(item);
 }
 
@@ -54,7 +55,8 @@ void freeResource(void *item) {
 // *****************
 // FIXME: BROKEN???
 static void clearDictionary(Dictionary *dict) {
-  if (dict == NULL) return;
+  if (dict == NULL)
+    return;
 
   while (dict->opcode != -1) {
     clearDictionaryItem(&dict);
@@ -68,15 +70,13 @@ static void clearDictionaryItem(Dictionary **dict) {
   if (dict == NULL || *dict == NULL)
     return;
 
-
   free(*dict);
   *dict = NULL;
 }
 
 void clearMap() {
-  Game_System *game_system = getGameSystemInstance();
-  Map *map = &(game_system->map);
-  TilesMapper *tiles_mapper = &(game_system->map.tilesMapper);
+  Map *map = &(gameState->map);
+  TilesMapper *tiles_mapper = &(gameState->map.tilesMapper);
 
   for (int i = 0; i < tiles_mapper->numOfTiles; i++) {
     free(tiles_mapper->mapper[i]);
@@ -90,4 +90,4 @@ void clearMap() {
 
   free(map->textures);
   free(map->isTexturesLoaded);
-}
+}

src/system/map.c

@@ -1,12 +1,12 @@
 /**********************************************
-* 
-*    ███╗   ███╗ █████╗ ██████╗ 
-*    ████╗ ████║██╔══██╗██╔══██╗
-*    ██╔████╔██║███████║██████╔╝
-*    ██║╚██╔╝██║██╔══██║██╔═══╝ 
-*    ██║ ╚═╝ ██║██║  ██║██║     
-*    ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝     
-**********************************************/
+ *
+ *    ███╗   ███╗ █████╗ ██████╗
+ *    ████╗ ████║██╔══██╗██╔══██╗
+ *    ██╔████╔██║███████║██████╔╝
+ *    ██║╚██╔╝██║██╔══██║██╔═══╝
+ *    ██║ ╚═╝ ██║██║  ██║██║
+ *    ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝
+ **********************************************/
 
 #include "map.h"
 #include <raylib.h>
@@ -15,9 +15,9 @@
 /**
  * initTilesMapper - initilizes the TilesMapper mapper with NULL,
  * and set path with mapper path.
-*/
+ */
 static void initTilesMapper() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   TilesMapper *tiles_mapper = &(game_system->map.tilesMapper);
 
   for (int i = 0; i < MAX_TILES_NUM; i++) {
@@ -34,13 +34,13 @@ static void initTilesMapper() {
  * loadTilesMapper - loades the tiles mapper file at the set path into memory.
  *
  * return: 0 if no errors, 1 if an error occured.
-*/
+ */
 int loadTilesMapper() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   TilesMapper *tiles_mapper = &(game_system->map.tilesMapper);
 
   char *file_content = LoadFileText(tiles_mapper->path);
- 
+
   char *line = strtok(file_content, "\n");
 
   while (line) {
@@ -73,18 +73,19 @@ int loadTilesMapper() {
 
 /**
  * initMap - initilizes the map and the tilesMapper.
-*/
+ */
 void initMap() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   Map *map = &(game_system->map);
-  
+
   initTilesMapper();
 
   map->loaded = false;
   map->currentLevel = 0;
   map->numOfRows = 0;
   map->numOfCols = 0;
-  map->currentLevelPath = "./src/resources/gfx/map-assets/level_one/level_one_map.csv";
+  map->currentLevelPath =
+      "./src/resources/gfx/map-assets/level_one/level_one_map.csv";
   map->scale = 2.0f;
 
   map->textures = malloc(map->tilesMapper.numOfTiles * sizeof(Texture2D));
@@ -96,7 +97,7 @@ void initMap() {
 }
 
 static void resetMapIds() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   Map *map = &(game_system->map);
 
   for (int row = 0; row < MAX_ROW_NUM; row++) {
@@ -110,9 +111,9 @@ static void resetMapIds() {
 
 /**
  * parseLevelFile - parses the current level file into the memory
-*/
+ */
 void parseLevelFile() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   Map *map = &(game_system->map);
 
   resetMapIds();
@@ -154,41 +155,46 @@ void parseLevelFile() {
 }
 
 void drawMap() {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   Map *map = &(game_system->map);
   TilesMapper *tilesMapper = &(game_system->map.tilesMapper);
 
-
   for (int row = 0; row < map->numOfRows; row++) {
     for (int col = 0; col < map->numOfCols; col++) {
       int idIdx = 0;
       int tileId = map->mapIds[row][col][idIdx++];
 
       while (idIdx < 5 && tileId != -1) {
         loadTileTexture(tileId);
-
-        int tileWidth = map->textures[tileId].width, tileHeight = map->textures[tileId].height;
 
-        Rectangle src = {0.0f, 0.0f, (float)tileWidth, (float)tileHeight};
-        Rectangle dest = {(float)(col * tileWidth) * map->scale, (float)(row * tileHeight) * map->scale,
-          (float)tileWidth * map->scale, (float)tileHeight * map->scale};  //Scaling the drawn texture by 2
+        int tileWidth = map->textures[tileId].width,
+            tileHeight = map->textures[tileId].height;
 
-        DrawTexturePro(map->textures[tileId], src, dest, (Vector2){0, 0}, (float)0, WHITE);
+        Rectangle src = {0.0f, 0.0f, (float)tileWidth, (float)tileHeight};
+        Rectangle dest = {(float)(col * tileWidth) * map->scale,
+                          (float)(row * tileHeight) * map->scale,
+                          (float)tileWidth * map->scale,
+                          (float)tileHeight *
+                              map->scale}; // Scaling the drawn texture by 2
+
+        DrawTexturePro(map->textures[tileId], src, dest, (Vector2){0, 0},
+                       (float)0, WHITE);
         tileId = map->mapIds[row][col][idIdx++];
       }
     }
   }
 }
 
 static void loadTileTexture(int tileIdx) {
-  Game_System *game_system = getGameSystemInstance();
+  GameState *game_system = gameState;
   Map *map = &(game_system->map);
 
   if (map->isTexturesLoaded[tileIdx])
     return;
 
   char buffer[256];
-  sprintf(buffer, "./src/resources/gfx/assets-prepare/%s", map->tilesMapper.mapper[tileIdx]);
+  sprintf(buffer, "./src/resources/gfx/assets-prepare/%s",
+          map->tilesMapper.mapper[tileIdx]);
 
   map->textures[tileIdx] = LoadTexture(buffer);
   map->isTexturesLoaded[tileIdx] = true;