From 6c4983120d18fd8ea554612384ef1dc46fc7ea9f Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Mon, 25 Nov 2013 15:51:24 +0000
Subject: [PATCH] [Fix] Segfault when having active missions.

---
 src/mission.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/mission.c b/src/mission.c
index 5292572..300d386 100644
--- a/src/mission.c
+++ b/src/mission.c
@@ -88,6 +88,7 @@ MissionData* mission_get(int id) {
 
 /* Initialize a mission. */
 static int mission_init(Mission* mission, MissionData* misn, int load) {
+  int i;
   char* buf;
   uint32_t bufsize;
 
@@ -99,6 +100,12 @@ static int mission_init(Mission* mission, MissionData* misn, int load) {
   else
     mission->id = mission_genID();
 
+  /* Init the timers. */
+  for(i = 0; i < MISSION_TIMER_MAX; i++) {
+    mission->timer[i] = 0.;
+    mission->tfunc[i] = NULL;
+  }
+
   mission->data = misn;
 
   /* Init lua. */
@@ -309,7 +316,7 @@ void missions_update(const double dt) {
   for(i = 0; i < MISSION_MAX; i++) {
     /* Mission must be active. */
     if(player_missions[i].id != 0) {
-      for(j = 0; j < MISSION_TIMER_MAX; i++) {
+      for(j = 0; j < MISSION_TIMER_MAX; j++) {
         /* Timer must be active. */
         if(player_missions[i].timer[j] != 0.) {
           player_missions[i].timer[j] -= dt;