diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-28 20:43:22 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-28 20:43:22 +0100 |
| commit | c3ac08bc7629b69ece1a7a44e4d224b95ea51f27 (patch) | |
| tree | 7a647f3dd1875054f362521a16348ab28af12faf | |
| parent | ce36f9733315ffecb41379f9f07063133968a54f (diff) | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| download | mana-c3ac08bc7629b69ece1a7a44e4d224b95ea51f27.tar.gz mana-c3ac08bc7629b69ece1a7a44e4d224b95ea51f27.tar.bz2 mana-c3ac08bc7629b69ece1a7a44e4d224b95ea51f27.tar.xz mana-c3ac08bc7629b69ece1a7a44e4d224b95ea51f27.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/player.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -27,6 +27,7 @@ Makefile config.h config.log config.status +config.status.lineno po/POTFILES .deps stamp-h1 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 { |