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

Spawner updates.

This commit is contained in:
Steve 2016-04-14 11:56:58 +01:00
parent 9c8b7af0d6
commit 7eee4d3d8e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle/script.c
View File

@ -218,9 +218,9 @@ static void executeNextLine(ScriptRunner *runner)
{ {
activateNextWaypoint(); activateNextWaypoint();
} }
else if (strcmp(command, "ACTIVATE_SPAWNERS") == 0) else if (strcmp(command, "ACTIVATE_SPAWNER") == 0)
{ {
sscanf(line, "%*s %[^;] %d", strParam[0], &intParam[0]); sscanf(line, "%*s %d %[^\n]", &intParam[0], strParam[0]);
activateSpawner(strParam[0], intParam[0]); activateSpawner(strParam[0], intParam[0]);
} }
else if (strcmp(command, "MSG_BOX") == 0) else if (strcmp(command, "MSG_BOX") == 0)

1
src/battle/spawners.c
View File

@ -116,7 +116,6 @@ void loadSpawners(cJSON *node)
s->types = toTypeArray(cJSON_GetObjectItem(node, "types")->valuestring, &s->numTypes); s->types = toTypeArray(cJSON_GetObjectItem(node, "types")->valuestring, &s->numTypes);
s->side = lookup(cJSON_GetObjectItem(node, "side")->valuestring); s->side = lookup(cJSON_GetObjectItem(node, "side")->valuestring);
s->interval = cJSON_GetObjectItem(node, "interval")->valueint * FPS; s->interval = cJSON_GetObjectItem(node, "interval")->valueint * FPS;
s->limit = getJSONValue(node, "limit", 0);
s->total = getJSONValue(node, "total", 0); s->total = getJSONValue(node, "total", 0);
s->step = cJSON_GetObjectItem(node, "step")->valueint; s->step = cJSON_GetObjectItem(node, "step")->valueint;
s->offscreen = getJSONValue(node, "offscreen", 0); s->offscreen = getJSONValue(node, "offscreen", 0);

1
src/structs.h
View File

@ -314,7 +314,6 @@ struct Spawner {
int side; int side;
int time; int time;
int interval; int interval;
int limit;
int total; int total;
int step; int step;
int offscreen; int offscreen;