From: Wolfgang Becker <uafr@gmx.de>
Date: Fri, 14 Mar 2008 18:22:33 +0000 (+0000)
Subject: missingkeys.patch by mathnerd314 to no longer overwrite keys.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=63a5ec3b4fb818b77682af30332bd6c7b6ae4b6e;p=supertux.git

missingkeys.patch by mathnerd314 to no longer overwrite keys.

SVN-Revision: 5373
---

diff --git a/data/levels/world2/default.nut b/data/levels/world2/default.nut
index de5ef1b0a..1a89eb130 100644
--- a/data/levels/world2/default.nut
+++ b/data/levels/world2/default.nut
@@ -7,11 +7,10 @@ function add_key(key)
 
 function level2_init()
 {
-  add_key("air");
-  add_key("earth");
-  add_key("wood");
-  add_key("fire");
-  add_key("water");
+  foreach(name in ["air", "earth", "wood", "fire", "water"])
+  {
+    add_key(name);
+  }
   Tux.deactivate();
   Effect.sixteen_to_nine(2);
   Text.set_text(translate("---Insert Cutscene Here---"));
@@ -31,60 +30,37 @@ if(! ("world2_keys" in state))
 	state.world2_keys <- {}
 	
 local keys = state.world2_keys;
-if(! ("air" in keys))
-	keys.air <- false;
-if(! ("earth" in keys))
-	keys.earth <- false;
-if(! ("wood" in keys))
-	keys.wood <- false;
-if(! ("fire" in keys))
-	keys.fire <- false;
-if(! ("water" in keys))
-	keys.water <- false;
+foreach(name in ["air", "earth", "wood", "fire", "water"])
+{
+  if(! (name in keys))
+    keys[name] <- false;
+}
 
 /// this function updates the key images (call this if tux has collected a key)
 function update_keys()
 {
 	local keys = state.world2_keys;
-	key_air.set_action(keys.air ? "display" : "outline");
-	key_earth.set_action(keys.earth ? "display" : "outline");
-	key_wood.set_action(keys.wood ? "display" : "outline");
-	key_fire.set_action(keys.fire ? "display" : "outline");
-	key_water.set_action(keys.water ? "display" : "outline");
+	foreach(name in ["air", "earth", "wood", "fire", "water"])
+	{
+	  key[name].set_action(keys[name] ? "display" : "outline");
+	}
 }
 
+if(! ("key" in this))
+ key <- {};
+
 local x = 10;
 local y = 10;
 
-
-key_air <- FloatingImage("images/objects/keys/key_air.sprite");
-key_air.set_anchor_point(ANCHOR_TOP_LEFT);
-key_air.set_pos(x, y);
-key_air.set_visible(true);
-x += 30;
-
-key_earth <- FloatingImage("images/objects/keys/key_earth.sprite");
-key_earth.set_anchor_point(ANCHOR_TOP_LEFT);
-key_earth.set_pos(x, y);
-key_earth.set_visible(true);
-x += 30;
-
-key_wood <- FloatingImage("images/objects/keys/key_wood.sprite");
-key_wood.set_anchor_point(ANCHOR_TOP_LEFT);
-key_wood.set_pos(x, y);
-key_wood.set_visible(true);
-x += 30;
-
-key_fire <- FloatingImage("images/objects/keys/key_fire.sprite");
-key_fire.set_anchor_point(ANCHOR_TOP_LEFT);
-key_fire.set_pos(x, y);
-key_fire.set_visible(true);
-x += 30;
-
-key_water <- FloatingImage("images/objects/keys/key_water.sprite");
-key_water.set_anchor_point(ANCHOR_TOP_LEFT);
-key_water.set_pos(x, y);
-key_water.set_visible(true);
-x += 30;
+foreach(name in ["air", "earth", "wood", "fire", "water"])
+{
+  if(! (name in key) {
+    key[name] <- FloatingImage("images/objects/keys/key_" + name + ".sprite");
+    key[name].set_anchor_point(ANCHOR_TOP_LEFT);
+    key[name].set_pos(x, y);
+    key[name].set_visible(true);
+  }
+  x += 30;
+}
 
 update_keys();