Bug 737968: Weapons looted while under the firepotion effect are corr…

…ectly saved
prodigeni · Mar 23, 2012 · e0ab40c · e0ab40c
1 parent d51a4cb
commit e0ab40c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ build.txt
 config_build.json
 config_local*
 client/audio
+.DS_Store
diff --git a/client/js/game.js b/client/js/game.js
@@ -1051,11 +1051,9 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
                 });
 
                 self.player.onSwitchItem(function() {
-                    if(self.player.getSpriteName() !== "firefox") {
-                        self.storage.savePlayer(self.renderer.getPlayerImage(),
-                                                self.player.getSpriteName(),
-                                                self.player.getWeaponName());
-                    }
+                    self.storage.savePlayer(self.renderer.getPlayerImage(),
+                                            self.player.getArmorName(),
+                                            self.player.getWeaponName());
                     if(self.equipment_callback) {
                         self.equipment_callback();
                     }

diff --git a/client/js/player.js b/client/js/player.js
@@ -71,6 +71,19 @@ define(['character', 'exceptions'], function(Character, Exceptions) {
         setSpriteName: function(name) {
             this.spriteName = name;
         },
+
+        getArmorName: function() {
+            var sprite = this.getArmorSprite();
+            return sprite.id;
+        },
+
+        getArmorSprite: function() {
+            if(this.invincible) {
+                return this.currentArmorSprite;
+            } else {
+                return this.sprite;
+            }
+        },
 
         getWeaponName: function() {
             return this.weaponName;

diff --git a/client/js/renderer.js b/client/js/renderer.js
@@ -670,7 +670,7 @@ function(Camera, Item, Character, Player, Timer) {
     	        ctx = canvas.getContext('2d'),
     	        os = this.upscaledRendering ? 1 : this.scale,
     	        player = this.game.player,
-    	        sprite = player.sprite,
+    	        sprite = player.getArmorSprite(),
     	        spriteAnim = sprite.animationData["idle_down"],
     	        // character
     	        row = spriteAnim.row,