walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies 

Conflicts:
	locale/tbftss.pot
	src/battle/battle.c
	src/battle/battle.h
	src/galaxy/mission.c
This commit is contained in:
Steve 2016-03-27 11:25:50 +01:00
parent 5d1edf89b3 1938c6714c
commit 147f2afae4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle/battle.c
View File

@ -153,7 +153,7 @@ static void doBattle(void)
if (player != NULL) if (player != NULL)
{ {
doSpawners(); doSpawners();
doLocations(); doLocations();
doMessageBox(); doMessageBox();
@ -440,7 +440,7 @@ void destroyBattle(void)
free(l); free(l);
} }
battle.locationTail = &battle.locationHead; battle.locationTail = &battle.locationHead;
while (battle.spawnerHead.next) while (battle.spawnerHead.next)
{ {
s = battle.spawnerHead.next; s = battle.spawnerHead.next;

6
src/galaxy/mission.c
View File

@ -154,7 +154,7 @@ void loadMission(char *filename)
loadItems(cJSON_GetObjectItem(root, "items")); loadItems(cJSON_GetObjectItem(root, "items"));
loadLocations(cJSON_GetObjectItem(root, "locations")); loadLocations(cJSON_GetObjectItem(root, "locations"));
loadSpawners(cJSON_GetObjectItem(root, "spawners")); loadSpawners(cJSON_GetObjectItem(root, "spawners"));
if (cJSON_GetObjectItem(root, "epic")) if (cJSON_GetObjectItem(root, "epic"))
@ -334,7 +334,7 @@ static void loadEntities(cJSON *node)
number = getJSONValue(node, "number", 1); number = getJSONValue(node, "number", 1);
active = getJSONValue(node, "active", 1); active = getJSONValue(node, "active", 1);
scatter = getJSONValue(node, "scatter", 1); scatter = getJSONValue(node, "scatter", 1);
if (cJSON_GetObjectItem(node, "flags")) if (cJSON_GetObjectItem(node, "flags"))
{ {
flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring, &addFlags); flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring, &addFlags);
@ -367,7 +367,7 @@ static void loadEntities(cJSON *node)
{ {
STRNCPY(e->groupName, groupName, MAX_NAME_LENGTH); STRNCPY(e->groupName, groupName, MAX_NAME_LENGTH);
} }
if (flags != -1) if (flags != -1)
{ {
if (addFlags) if (addFlags)