From ef1d6340574c6b980f18d517991994f3d1694d2c Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 24 Feb 2018 16:00:04 +0000 Subject: [PATCH] Trigger gameplay message crash fix. --- src/world/triggers.c | 4 ++-- src/world/triggers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/triggers.c b/src/world/triggers.c index 6d4c9a5..63f84b1 100644 --- a/src/world/triggers.c +++ b/src/world/triggers.c @@ -36,7 +36,7 @@ void doLocationTriggers(void) if (t->message != NULL) { - setGameplayMessage(t->message, MSG_GAMEPLAY); + setGameplayMessage(MSG_GAMEPLAY, t->message); } if (t == world.triggerTail) @@ -68,7 +68,7 @@ void fireTriggers(char *name) if (t->message != NULL) { - setGameplayMessage(t->message, MSG_GAMEPLAY); + setGameplayMessage(MSG_GAMEPLAY, t->message); } if (t == world.triggerTail) diff --git a/src/world/triggers.h b/src/world/triggers.h index b530ee6..abf3ff4 100644 --- a/src/world/triggers.h +++ b/src/world/triggers.h @@ -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 void activateEntities(char *names, int activate); -extern void setGameplayMessage(char *newMessage, int newMessageType); +extern void setGameplayMessage(int type, char *format, ...); extern World world;