From e0dc264b5f1d1f8ba9c110028ec53ff5f2cc3862 Mon Sep 17 00:00:00 2001
From: Nils Kneuper <crazy-ivanovic@gmx.net>
Date: Tue, 22 Aug 2006 16:05:18 +0000
Subject: [PATCH] fixed bug #6704

---
 changelog                                     |  5 ++-
 .../scenarios/3_Guarded_Castle.cfg            | 38 +++++++++++--------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/changelog b/changelog
index 8c4f0fa89a9..378d08c3ce7 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,10 @@ Version 1.1.8+SVN:
    * Heir to the Throne
      * fixed gold typo in Dwarven Doors (#6481)
      * Isle of the Damned: removed merman recall on HARD
- * multiplayer maps:
+   * Two Brothers
+     * fixed showing the objecitv "kill the mage to get the key" if you
+       already obtained the key (#6704)
+* multiplayer maps:
    * revised multiplayer maps: Sablestone Delta
  * language and i18n:
    * updated translations: Dutch, Esperanto, Finnish, French, German, Italian,
diff --git a/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
index 38fe28ee1d0..e4baef4b153 100644
--- a/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
+++ b/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
@@ -538,21 +538,29 @@ victory_when_enemies_defeated=no
 			message= _ "The damn Dark Sorcerer Rotharik has imprisoned me behind this magical barrier. You must get the key from him to free me. You can only open it with the key."
 			image="bjarn.png"
 		[/message]
-		[objectives]
-			side=1
-			[objective]
-				description= _ "Kill the dark sorcerer to get the cellkey"
-				condition=win
-			[/objective]
-			[objective]
-				description= _ "Death of Arne"
-				condition=lose
-			[/objective]
-			[objective]
-				description= _ "Turns run out"
-				condition=lose
-			[/objective]
-		[/objectives]
+        [if]
+            [variable]
+                name=Got_Key
+                numerical_equals=0
+            [/variable]
+            [then]
+        		[objectives]
+		        	side=1
+        			[objective]
+		        		description= _ "Kill the dark sorcerer to get the cellkey"
+        				condition=win
+        			[/objective]
+	        		[objective]
+	        			description= _ "Death of Arne"
+	        			condition=lose
+	        		[/objective]
+        			[objective]
+        				description= _ "Turns run out"
+        				condition=lose
+        			[/objective]
+        		[/objectives]
+            [/then]
+        [/if]
 	[/event]
 
 	[event]