Map loading basically done for now

assets/testmap.json

@@ -23,14 +23,5 @@
       "x": 0,
       "y": 0
     }
-  ],
-  "triggers": [
-    {
-      "type": 1,
-      "x": 1,
-      "y": 1,
-      "width": 2,
-      "height": 2
-    }
   ]
 }

src/dawn/asset/assetmap.c

@@ -75,6 +75,7 @@ void assetMapLoad(
 
   // Load entity data
   assetjson_t *entities = assetJsonGetObjectValue(json, "entities");
+  if(entities != NULL) {
     assertTrue(
       entities->type == ASSET_JSON_DATA_TYPE_ARRAY,
       "assetMapLoad: Entities is not an array!"
@@ -97,9 +98,11 @@ void assetMapLoad(
 
       // TODO: Parse any extra data.
     }
+  }
 
   // Load trigger data
   assetjson_t *triggers = assetJsonGetObjectValue(json, "triggers");
+  if(triggers != NULL) {
     assertTrue(
       triggers->type == ASSET_JSON_DATA_TYPE_ARRAY,
       "assetMapLoad: Triggers is not an array!"
@@ -121,6 +124,7 @@ void assetMapLoad(
       trigger_t *trigger = mapTriggerAdd(map);
       triggerInit(trigger, type, x, y, width, height);
     }
+  }
 
   assetJsonDispose(json);
 }