From 425e697d9f807227a6355292d762a6543575a664 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Fri, 22 Jul 2016 13:57:08 +0200
Subject: [PATCH] Small bugfixes for stoutford.

---
 AndorsTrail/res/raw/conversationlist_stoutford.json           | 4 ++--
 .../src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json
index 074af15ee..2a7aeebb0 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford.json
@@ -503,7 +503,7 @@
                     },
                     {
                         "requireType":"questProgress",
-                        "value":71,
+                        "value":70,
                         "requireID":"farrik"
                     }
                 ]
@@ -929,7 +929,7 @@
             },
             {
                 "nextPhraseID":"glasforn_rumblings60_1",
-                "text":"I'm all hears."
+                "text":"I'm all ears."
             }
         ],
         "rewards":[
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index 15bf2e4db..083c68f78 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -56,6 +56,7 @@ public final class PredefinedMap {
 		this.initiallyActiveMapObjectGroups = initiallyActiveMapObjectGroups;
 		this.activeMapObjectGroups = new LinkedList<String>();
 		this.activeMapObjectGroups.addAll(this.initiallyActiveMapObjectGroups);
+		activateMapObjects();
 		assert(size.width > 0);
 		assert(size.height > 0);
 		this.isOutdoors = isOutdoors;