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

Bit more cleanup

Browse Source
This commit is contained in:
Dominic Masters
2024-10-06 21:01:05 -05:00
parent b7987401af
commit b5d7b7e229
14 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,9 +67,7 @@ void assetMapLoad(
);
for(int32_t j = 0; j < width * height; j++) {
map->tiles[j] = (tile_t){
.id = (uint16_t)tiles->array.value[j]->number
};
map->tiles[j] = (tile_t)tiles->array.value[j]->number;
}
}
@ -90,7 +88,9 @@ void assetMapLoad(
int32_t x = (int32_t)assetJsonGetObjectValue(jEnt, "x")->number;
int32_t y = (int32_t)assetJsonGetObjectValue(jEnt, "y")->number;
uint8_t type = (uint8_t)assetJsonGetObjectValue(jEnt, "type")->number;
entitytype_t type = (entitytype_t)assetJsonGetObjectValue(
jEnt, "type"
)->number;
entity_t *ent = mapEntityAdd(map);
entityInit(ent, type, map);
@ -118,8 +118,12 @@ void assetMapLoad(
int32_t x = (int32_t)assetJsonGetObjectValue(jTrig, "x")->number;
int32_t y = (int32_t)assetJsonGetObjectValue(jTrig, "y")->number;
int32_t width = (int32_t)assetJsonGetObjectValue(jTrig, "width")->number;
int32_t height = (int32_t)assetJsonGetObjectValue(jTrig, "height")->number;
uint8_t type = (uint8_t)assetJsonGetObjectValue(jTrig, "type")->number;
int32_t height = (int32_t)assetJsonGetObjectValue(
jTrig, "height"
)->number;
triggertype_t type = (triggertype_t)assetJsonGetObjectValue(
jTrig, "type"
)->number;
trigger_t *trigger = mapTriggerAdd(map);
triggerInit(trigger, type, x, y, width, height);