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

Trigger gameplay message crash fix.

This commit is contained in:
Steve 2018-02-24 16:00:04 +00:00
parent 600032a41b
commit ef1d634057
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/world/triggers.c
View File

@ -36,7 +36,7 @@ void doLocationTriggers(void)
if (t->message != NULL) if (t->message != NULL)
{ {
setGameplayMessage(t->message, MSG_GAMEPLAY); setGameplayMessage(MSG_GAMEPLAY, t->message);
} }
if (t == world.triggerTail) if (t == world.triggerTail)
@ -68,7 +68,7 @@ void fireTriggers(char *name)
if (t->message != NULL) if (t->message != NULL)
{ {
setGameplayMessage(t->message, MSG_GAMEPLAY); setGameplayMessage(MSG_GAMEPLAY, t->message);
} }
if (t == world.triggerTail) if (t == world.triggerTail)

2
src/world/triggers.h
View File

@ -22,6 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
extern void activateEntities(char *names, int activate); extern void activateEntities(char *names, int activate);
extern void setGameplayMessage(char *newMessage, int newMessageType); extern void setGameplayMessage(int type, char *format, ...);
extern World world; extern World world;