Door and map changing

assets/testmap.json

@@ -49,7 +49,8 @@
       "door": {
         "x": 0,
         "y": 0,
-        "direction": 3
+        "direction": 3,
+        "map": "testmap2.json"
       }
     }
   ]

assets/testmap2.json

@@ -0,0 +1,20 @@
+{
+  "width": 3,
+  "height": 3,
+  "layers": [
+    {
+      "tiles": [
+        1, 1, 1,
+        1, 1, 1,
+        1, 1, 1
+      ]
+    }
+  ],
+  "entities": [
+    {
+      "type": 1,
+      "x": 0,
+      "y": 0
+    }
+  ]
+}

src/dawn/CMakeLists.txt

@@ -31,5 +31,6 @@ target_sources(${DAWN_TARGET_NAME}
 
 # Assets
 tool_copy(testmap testmap.json)
+tool_copy(testmap2 testmap2.json)
 
 add_dependencies(${DAWN_TARGET_NAME} dawnassets)

src/dawn/asset/assetmap.c

@@ -8,7 +8,92 @@
 #include "assetmap.h"
 #include "asset/asset.h"
 #include "assert/assert.h"
-#include "asset/assetjson.h"
+
+void assetMapLoadEntity(
+  assetjson_t *jEnt,
+  map_t *map
+) {
+  int32_t x = (int32_t)assetJsonGetObjectValue(jEnt, "x")->number;
+  int32_t y = (int32_t)assetJsonGetObjectValue(jEnt, "y")->number;
+  entitytype_t type = (entitytype_t)assetJsonGetObjectValue(
+    jEnt, "type"
+  )->number;
+
+  entity_t *ent = mapEntityAdd(map);
+  entityInit(ent, type, map);
+  entityPositionSet(ent, x, y);
+
+  assetjson_t *val;
+  switch(type) {
+    case ENTITY_TYPE_NPC:
+      val = assetJsonGetObjectValue(jEnt, "name");
+      if(val != NULL) {
+        assertTrue(
+          val->type == ASSET_JSON_DATA_TYPE_STRING,
+          "assetMapLoad: NPC name is not a string!"
+        );
+        npcNameSet(&ent->npc, val->string);
+      }
+
+      val = assetJsonGetObjectValue(jEnt, "text");
+      if(val != NULL) {
+        assertTrue(
+          val->type == ASSET_JSON_DATA_TYPE_STRING,
+          "assetMapLoad: NPC text is not a string!"
+        );
+        npcTextSet(&ent->npc, val->string);
+      }
+      break;
+
+    case ENTITY_TYPE_SIGN:
+      val = assetJsonGetObjectValue(jEnt, "text");
+      if(val != NULL)  {
+        assertTrue(
+          val->type == ASSET_JSON_DATA_TYPE_STRING,
+          "assetMapLoad: Sign text is not a string!"
+        );
+        signTextSet(&ent->sign, val->string);
+      }
+      break;
+
+    case ENTITY_TYPE_DOOR:
+      val = assetJsonGetObjectValue(jEnt, "door");
+      if(val != NULL) {
+        assetjson_t *door = assetJsonGetObjectValue(val, "x");
+        x = (int32_t)door->number;
+        assertTrue(
+          door->type == ASSET_JSON_DATA_TYPE_NUMBER,
+          "assetMapLoad: Door x is not a number!"
+        );
+
+        door = assetJsonGetObjectValue(val, "y");
+        y = (int32_t)door->number;
+        assertTrue(
+          door->type == ASSET_JSON_DATA_TYPE_NUMBER,
+          "assetMapLoad: Door y is not a number!"
+        );
+        entitydirection_t direction = (entitydirection_t)(
+          assetJsonGetObjectValue(val, "direction")->number
+        );
+        door = assetJsonGetObjectValue(val, "map");
+        maplist_t list;
+        if(door == NULL) {
+          list = map->list;
+        } else if(door->type == ASSET_JSON_DATA_TYPE_STRING) {
+          list = mapListGet(door->string);
+        } else if(door->type == ASSET_JSON_DATA_TYPE_NUMBER) {
+          list = (maplist_t)door->number;
+        } else {
+          assertUnreachable("assetMapLoad: Door map not string or number!");
+        }
+        doorDestinationSet(&ent->door, x, y, direction, list);
+      }
+      break;
+    
+    default:
+      break;
+  }
+}
 
 void assetMapLoad(
   const char_t *path,
@@ -47,7 +132,7 @@ void assetMapLoad(
   int32_t layerCount = layers->array.length;
   assertTrue(layerCount == MAP_LAYERS_MAX, "assetMapLoad: No layers found!");
 
-  mapInit(map, width, height, layerCount);
+  mapInit(map, mapListGet(path), width, height, layerCount);
 
   // Load tile data.
   for(int32_t i = 0; i < layerCount; i++) {
@@ -86,78 +171,7 @@ void assetMapLoad(
         jEnt->type == ASSET_JSON_DATA_TYPE_OBJECT,
         "assetMapLoad: Entity is not an object!"
       );
-
+      assetMapLoadEntity(jEnt, map);
-      int32_t x = (int32_t)assetJsonGetObjectValue(jEnt, "x")->number;
-      int32_t y = (int32_t)assetJsonGetObjectValue(jEnt, "y")->number;
-      entitytype_t type = (entitytype_t)assetJsonGetObjectValue(
-        jEnt, "type"
-      )->number;
-
-      entity_t *ent = mapEntityAdd(map);
-      entityInit(ent, type, map);
-      entityPositionSet(ent, x, y);
-
-      assetjson_t *val;
-      switch(type) {
-        case ENTITY_TYPE_NPC:
-          val = assetJsonGetObjectValue(jEnt, "name");
-          if(val != NULL) {
-            assertTrue(
-              val->type == ASSET_JSON_DATA_TYPE_STRING,
-              "assetMapLoad: NPC name is not a string!"
-            );
-            npcNameSet(&ent->npc, val->string);
-          }
-
-          val = assetJsonGetObjectValue(jEnt, "text");
-          if(val != NULL) {
-            assertTrue(
-              val->type == ASSET_JSON_DATA_TYPE_STRING,
-              "assetMapLoad: NPC text is not a string!"
-            );
-            npcTextSet(&ent->npc, val->string);
-          }
-          break;
-
-        case ENTITY_TYPE_SIGN:
-          val = assetJsonGetObjectValue(jEnt, "text");
-          if(val != NULL)  {
-            assertTrue(
-              val->type == ASSET_JSON_DATA_TYPE_STRING,
-              "assetMapLoad: Sign text is not a string!"
-            );
-            signTextSet(&ent->sign, val->string);
-          }
-          break;
-
-        case ENTITY_TYPE_DOOR:
-          val = assetJsonGetObjectValue(jEnt, "door");
-          if(val != NULL) {
-            assetjson_t *door = assetJsonGetObjectValue(val, "x");
-            x = (int32_t)door->number;
-            assertTrue(
-              door->type == ASSET_JSON_DATA_TYPE_NUMBER,
-              "assetMapLoad: Door x is not a number!"
-            );
-
-            door = assetJsonGetObjectValue(val, "y");
-            y = (int32_t)door->number;
-            assertTrue(
-              door->type == ASSET_JSON_DATA_TYPE_NUMBER,
-              "assetMapLoad: Door y is not a number!"
-            );
-            entitydirection_t direction = (entitydirection_t)assetJsonGetObjectValue(
-              val, "direction"
-            )->number;
-            doorDestinationSet(&ent->door, x, y, direction);
-          }
-          break;
-        
-        default:
-          break;
-      }
-
-      // TODO: Parse any extra data.
     }
   }
 

src/dawn/asset/assetmap.h

@@ -7,7 +7,25 @@
 
 #pragma once
 #include "rpg/world/map.h"
+#include "asset/assetjson.h"
 
+/**
+ * Loads an entity from the specified JSON object.
+ * 
+ * @param jEnt JSON object to load the entity from.
+ * @param map Map to load the entity into.
+ */
+void assetMapLoadEntity(
+  assetjson_t *jEnt,
+  map_t *map
+);
+
+/**
+ * Loads a map from the specified path.
+ * 
+ * @param path Path to the map file.
+ * @param map Map to load the data into.
+ */
 void assetMapLoad(
   const char_t *path,
   map_t *map

src/dawn/game/game.c

@@ -13,7 +13,6 @@
 #include "asset/asset.h"
 #include "asset/assetmap.h"
 
-map_t MAP;
 game_t GAME;
 
 void gameInit() {
@@ -25,8 +24,8 @@ void gameInit() {
   assetInit();
   textboxInit();
 
-  assetMapLoad("testmap.json", &MAP);
+  GAME.mapNext = MAP_LIST_TEST;
-  gameSetMap(&MAP);
+  GAME.state = GAME_STATE_MAP_CHANGE;
 }
 
 gameupdateresult_t gameUpdate(const float_t delta) {
@@ -47,6 +46,13 @@ gameupdateresult_t gameUpdate(const float_t delta) {
     case GAME_STATE_PAUSED:
       if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_OVERWORLD;
       break;
+
+    case GAME_STATE_MAP_CHANGE:
+      assetMapLoad(MAP_LIST_PATHS[GAME.mapNext], &MAP_MAIN);
+      GAME.state = GAME_STATE_OVERWORLD;
+      GAME.currentMap = &MAP_MAIN;
+      map_t *test = &MAP_MAIN;
+      break;
   }
 
   // Perform render.
@@ -56,10 +62,6 @@ gameupdateresult_t gameUpdate(const float_t delta) {
   return GAME_UPDATE_RESULT_CONTINUE;
 }
 
-void gameSetMap(map_t *map) {
-  GAME.currentMap = map;
-}
-
 void gameDispose() {
   assetDispose();
   displayDispose();

src/dawn/game/game.h

@@ -16,13 +16,15 @@ typedef enum {
 typedef enum {
   GAME_STATE_INITIAL = 0,
   GAME_STATE_OVERWORLD = 1,
-  GAME_STATE_PAUSED = 2
+  GAME_STATE_PAUSED = 2,
+  GAME_STATE_MAP_CHANGE = 3
 } gamestate_t;
 
 typedef struct {
   map_t *currentMap;
   gamestate_t state;
   bool_t shouldExit;
+  maplist_t mapNext;
 } game_t;
 
 extern game_t GAME;
@@ -40,13 +42,6 @@ void gameInit();
  */
 gameupdateresult_t gameUpdate(const float_t delta);
 
-/**
- * Sets the current map, does not take ownership.
- * 
- * @param map Map to set.
- */
-void gameSetMap(map_t *map);
-
 /**
  * Cleans up the game state.
  */

src/dawn/rpg/entity/door.c

@@ -16,10 +16,12 @@ void doorDestinationSet(
   door_t *door,
   const int32_t x,
   const int32_t y,
-  const entitydirection_t direction
+  const entitydirection_t direction,
+  const maplist_t map
 ) {
   assertNotNull(door, "Door cannot be NULL.");
   door->x = x;
   door->y = y;
   door->direction = direction;
+  door->map = map;
 }

src/dawn/rpg/entity/door.h

@@ -7,11 +7,13 @@
 
 #pragma once
 #include "entitydirection.h"
+#include "rpg/world/maplist.h"
 
 typedef struct {
   int32_t x;
   int32_t y;
   entitydirection_t direction;
+  maplist_t map;
 } door_t;
 
 /**
@@ -28,10 +30,12 @@ void doorInit(door_t *door);
  * @param x X coordinate of the destination.
  * @param y Y coordinate of the destination.
  * @param direction Direction the player should face when they arrive.
+ * @param map Map the player should arrive in.
  */
 void doorDestinationSet(
   door_t *door,
   const int32_t x,
   const int32_t y,
-  const entitydirection_t direction
+  const entitydirection_t direction,
+  const maplist_t map
 );

src/dawn/rpg/entity/interact.c

@@ -7,6 +7,7 @@
 
 #include "interact.h"
 #include "assert/assert.h"
+#include "game/game.h"
 
 void entityInteractEntity(
   entity_t *source,
@@ -34,6 +35,11 @@ void entityInteractEntity(
     case ENTITY_TYPE_DOOR:
       entityPositionSet(source, target->door.x, target->door.y);
       source->direction = target->door.direction;
+      
+      if(GAME.mapNext != target->door.map) {
+        GAME.mapNext = target->door.map;
+        GAME.state = GAME_STATE_MAP_CHANGE;
+      }
       return;
 
     default:

src/dawn/rpg/world/CMakeLists.txt

@@ -11,4 +11,5 @@ target_sources(${DAWN_TARGET_NAME}
     tile.c
     map.c
     trigger.c
+    maplist.c
 )

src/dawn/rpg/world/map.c

@@ -8,8 +8,11 @@
 #include "map.h"
 #include "assert/assert.h"
 
+map_t MAP_MAIN;
+
 void mapInit(
   map_t *map,
+  const maplist_t list,
   const uint16_t width,
   const uint16_t height,
   const uint8_t layers
@@ -40,8 +43,9 @@ void mapInit(
     "Map layers must be less than or equal to MAP_LAYERS_MAX."
   );
 
-  memset(map, 0, sizeof(map));
+  memset(map, 0, sizeof(map_t));
 
+  map->list = list;
   map->width = width;
   map->height = height;
   map->layers = layers;

src/dawn/rpg/world/map.h

@@ -9,6 +9,7 @@
 #include "tile.h"
 #include "rpg/entity/entity.h"
 #include "rpg/world/trigger.h"
+#include "maplist.h"
 
 #define MAP_WIDTH_MAX 2048
 #define MAP_HEIGHT_MAX 2048
@@ -22,6 +23,8 @@ typedef struct _map_t {
   uint16_t height;
   uint8_t layers;
 
+  maplist_t list;
+
   entity_t entities[MAP_ENTITIES_MAX];
   uint8_t entityCount;
   
@@ -29,6 +32,9 @@ typedef struct _map_t {
   uint8_t triggerCount;
 } map_t;
 
+
+extern map_t MAP_MAIN;
+
 /**
  * Initializes a map.
  * 
@@ -39,6 +45,7 @@ typedef struct _map_t {
  */
 void mapInit(
   map_t *map,
+  const maplist_t list,
   const uint16_t width,
   const uint16_t height,
   const uint8_t layers

src/dawn/rpg/world/maplist.c

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2024 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "maplist.h"
+#include "assert/assert.h"
+
+const char_t * MAP_LIST_PATHS[] = {
+  "testmap.json",
+  "testmap2.json"
+};
+
+const int32_t MAP_LIST_COUNT = sizeof(MAP_LIST_PATHS) / sizeof(char_t*);
+
+maplist_t mapListGet(const char_t *name) {
+  for(int32_t i = 0; i < MAP_LIST_COUNT; i++) {
+    if(strcmp(name, MAP_LIST_PATHS[i]) != 0) continue;
+    return (maplist_t)i;
+  }
+  assertUnreachable("mapListGet: Map list %s not found!", name);
+}

src/dawn/rpg/world/maplist.h

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2024 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dawn.h"
+
+typedef enum {
+  MAP_LIST_TEST,
+  MAP_LIST_TEST2
+} maplist_t;
+
+extern const char_t *MAP_LIST_PATHS[];
+
+/**
+ * Returns the map list for the given name.
+ * 
+ * @param name Name of the map list to get.
+ * @return Map list for the given name.
+ */
+maplist_t mapListGet(const char_t *name);