diff --git a/src/battle/battle.c b/src/battle/battle.c index 040f395..ecea5b9 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -153,7 +153,7 @@ static void doBattle(void) if (player != NULL) { doSpawners(); - + doLocations(); doMessageBox(); @@ -440,7 +440,7 @@ void destroyBattle(void) free(l); } battle.locationTail = &battle.locationHead; - + while (battle.spawnerHead.next) { s = battle.spawnerHead.next; diff --git a/src/galaxy/mission.c b/src/galaxy/mission.c index 4da86a0..e575e1c 100644 --- a/src/galaxy/mission.c +++ b/src/galaxy/mission.c @@ -154,7 +154,7 @@ void loadMission(char *filename) loadItems(cJSON_GetObjectItem(root, "items")); loadLocations(cJSON_GetObjectItem(root, "locations")); - + loadSpawners(cJSON_GetObjectItem(root, "spawners")); if (cJSON_GetObjectItem(root, "epic")) @@ -334,7 +334,7 @@ static void loadEntities(cJSON *node) number = getJSONValue(node, "number", 1); active = getJSONValue(node, "active", 1); scatter = getJSONValue(node, "scatter", 1); - + if (cJSON_GetObjectItem(node, "flags")) { flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring, &addFlags); @@ -367,7 +367,7 @@ static void loadEntities(cJSON *node) { STRNCPY(e->groupName, groupName, MAX_NAME_LENGTH); } - + if (flags != -1) { if (addFlags)