diff --git a/src/battle/script.c b/src/battle/script.c index 73ac040..1420443 100644 --- a/src/battle/script.c +++ b/src/battle/script.c @@ -25,7 +25,6 @@ static void executeNextLine(ScriptRunner *runner); static cJSON *scriptJSON; static ScriptRunner head; static ScriptRunner *tail; -static char funcNameBuffer[MAX_NAME_LENGTH]; void initScript(cJSON *scriptNode) { @@ -71,6 +70,7 @@ void runScriptFunction(const char *format, ...) ScriptRunner *scriptRunner; cJSON *function; char *functionName; + char funcNameBuffer[MAX_NAME_LENGTH]; va_list args; memset(&funcNameBuffer, '\0', sizeof(funcNameBuffer)); @@ -95,7 +95,7 @@ void runScriptFunction(const char *format, ...) tail->next = scriptRunner; tail = scriptRunner; - printf("Running script '%s'\n", funcNameBuffer); + SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Running script '%s'", funcNameBuffer); } function = function->next; @@ -118,6 +118,11 @@ static void executeNextLine(ScriptRunner *runner) sscanf(line, "%*s %[^\n]", strParam[0]); activateEntities(strParam[0]); } + else if (strcmp(command, "ACTIVATE_ENTITY_GROUP") == 0) + { + sscanf(line, "%*s %[^\n]", strParam[0]); + activateEntityGroup(strParam[0]); + } else if (strcmp(command, "ACTIVATE_OBJECTIVE") == 0) { sscanf(line, "%*s %d", &intParam[0]); diff --git a/src/battle/script.h b/src/battle/script.h index 945b5b5..a713149 100644 --- a/src/battle/script.h +++ b/src/battle/script.h @@ -31,6 +31,7 @@ extern void retreatAllies(void); extern void addHudMessage(SDL_Color c, char *format, ...); extern void addMessageBox(int time, char *title, char *format, ...); extern void activateEntities(char *name); +extern void activateEntityGroup(char *groupName); extern void activateObjective(int num); extern Battle battle;