From b83e507346e3c2b3f1e0c810f11ccd1507189a47 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 27 Jan 2009 08:17:31 +0000 Subject: Restore punching animation after weapon removal --- src/player.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/player.cpp b/src/player.cpp index ec3b1c1c..5ab94595 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -144,6 +144,11 @@ void Player::setSprite(int slot, int id, std::string color) { delete mSprites[slot]; mSprites[slot] = NULL; + + if (slot == WEAPON_SPRITE) + { + mEquippedWeapon = NULL; + } } else { -- cgit v1.2.3-60-g2f50 From 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 27 Jan 2009 21:24:13 +0100 Subject: Another file added to the ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2eeb0c11..0693d1c7 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ Makefile config.h config.log config.status +config.status.lineno po/POTFILES .deps stamp-h1 -- cgit v1.2.3-60-g2f50