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

Allow side to be set for entities (mostly applies to mines).

This commit is contained in:
Steve 2016-04-01 14:21:11 +01:00
parent a913dc613b
commit 26ed8dc322
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/galaxy/mission.c
View File

@ -311,7 +311,7 @@ static void loadEntities(cJSON *node)
{ {
Entity *e; Entity *e;
char *name, *groupName; char *name, *groupName;
int i, type, scatter, number, active, addFlags; int i, type, scatter, number, active, addFlags, side;
float x, y; float x, y;
long flags; long flags;
@ -334,6 +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);
side = getJSONValue(node, "side", SIDE_NONE);
if (cJSON_GetObjectItem(node, "flags")) if (cJSON_GetObjectItem(node, "flags"))
{ {
@ -388,6 +389,8 @@ static void loadEntities(cJSON *node)
e->x = x; e->x = x;
e->y = y; e->y = y;
e->side = side;
if (scatter > 1) if (scatter > 1)
{ {
@ -396,8 +399,6 @@ static void loadEntities(cJSON *node)
} }
e->active = active; e->active = active;
SDL_QueryTexture(e->texture, NULL, NULL, &e->w, &e->h);
} }
node = node->next; node = node->next;