YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map loading basically done for now

Browse Source
This commit is contained in:
Dominic Masters
2024-10-06 19:03:22 -05:00
parent ffc46c677c
commit b7987401af
2 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/testmap.json
View File

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

4
src/dawn/asset/assetmap.c
View File

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