Convert trigger activation to event (#225)

cxong · May 24, 2014 · 2a6a250 · 2a6a250
1 parent 72ff5cd
commit 2a6a250
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 15 deletions.
diff --git a/src/cdogs/actors.c b/src/cdogs/actors.c
@@ -409,16 +409,21 @@ void UpdateActorState(TActor * actor, int ticks)
 }
 
 
-static void CheckTrigger(Vec2i pos)
+static void CheckTrigger(const Vec2i tilePos)
 {
-	Tile *t = MapGetTile(&gMap, Vec2iToTile(pos));
+	const Tile *t = MapGetTile(&gMap, tilePos);
 	int i;
 	for (i = 0; i < (int)t->triggers.size; i++)
 	{
-		TriggerActivate(
-			*(Trigger **)CArrayGet(&t->triggers, i),
-			gMission.flags,
-			&gMap.triggers);
+		Trigger **tp = CArrayGet(&t->triggers, i);
+		if (TriggerCanActivate(*tp, gMission.flags))
+		{
+			GameEvent e;
+			e.Type = GAME_EVENT_TRIGGER;
+			e.u.Trigger.Id = (*tp)->id;
+			e.u.Trigger.TilePos = tilePos;
+			GameEventsEnqueue(&gGameEvents, e);
+		}
 	}
 }
 
@@ -610,7 +615,7 @@ bool TryMoveActor(TActor *actor, Vec2i pos)
 		}
 	}
 
-	CheckTrigger(realPos);
+	CheckTrigger(Vec2iToTile(realPos));
 
 	if (actor->pData)
 	{

diff --git a/src/cdogs/game_events.h b/src/cdogs/game_events.h
@@ -58,6 +58,7 @@ typedef enum
 	GAME_EVENT_HIT_CHARACTER,
 	GAME_EVENT_ACTOR_IMPULSE,
 	GAME_EVENT_DAMAGE_CHARACTER,
+	GAME_EVENT_TRIGGER,
 	GAME_EVENT_UPDATE_OBJECTIVE,
 
 	// Can complete mission
@@ -135,6 +136,11 @@ typedef struct
 			int TargetPlayerIndex;
 		} DamageCharacter;
 		struct
+		{
+			int Id;
+			Vec2i TilePos;
+		} Trigger;
+		struct
 		{
 			int ObjectiveIndex;
 			int Update;

diff --git a/src/cdogs/triggers.c b/src/cdogs/triggers.c
@@ -236,14 +236,14 @@ static int ConditionsMet(CArray *conditions)
 	return 1;
 }
 
-void TriggerActivate(Trigger *t, int flags, CArray *mapTriggers)
+bool TriggerCanActivate(const Trigger *t, const int flags)
 {
-	int i;
-	if (!t->isActive || (t->flags != 0 && !(t->flags & flags)))
-	{
-		return;
-	}
-	for (i = 0; i < (int)t->actions.size; i++)
+	return t->isActive && (t->flags == 0 || (t->flags & flags));
+}
+
+void TriggerActivate(Trigger *t, CArray *mapTriggers)
+{
+	for (int i = 0; i < (int)t->actions.size; i++)
 	{
 		ActionRun(CArrayGet(&t->actions, i), mapTriggers);
 	}

diff --git a/src/cdogs/triggers.h b/src/cdogs/triggers.h
@@ -102,7 +102,8 @@ struct Watch {
 typedef struct Watch TWatch;
 
 
-void TriggerActivate(Trigger *t, int flags, CArray *mapTriggers);
+bool TriggerCanActivate(const Trigger *t, const int flags);
+void TriggerActivate(Trigger *t, CArray *mapTriggers);
 void UpdateWatches(CArray *mapTriggers);
 Trigger *TriggerNew(void);
 void TriggerTerminate(Trigger *t);

diff --git a/src/handle_game_events.c b/src/handle_game_events.c
@@ -30,6 +30,7 @@
 #include <cdogs/damage.h>
 #include <cdogs/game_events.h>
 #include <cdogs/objs.h>
+#include <cdogs/triggers.h>
 
 
 static void HandleGameEvent(
@@ -147,6 +148,20 @@ static void HandleGameEvent(
 					-e->u.DamageCharacter.Power);
 			}
 			break;
+		case GAME_EVENT_TRIGGER:
+			{
+				const Tile *t = MapGetTile(&gMap, e->u.Trigger.TilePos);
+				for (int i = 0; i < (int)t->triggers.size; i++)
+				{
+					Trigger **tp = CArrayGet(&t->triggers, i);
+					if ((*tp)->id == e->u.Trigger.Id)
+					{
+						TriggerActivate(*tp, &gMap.triggers);
+						break;
+					}
+				}
+			}
+			break;
 		case GAME_EVENT_UPDATE_OBJECTIVE:
 			{
 				struct Objective *o = CArrayGet(