diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-05-04 01:36:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-05-05 19:36:52 +0300 |
| commit | 7ed077a94dd553e5aa7675144ce98fd6e4ce723e (patch) | |
| tree | 1cdb4cad6692d0dc34b4220f62038f67af77da2e /src/localplayer.cpp | |
| parent | 7ba882b543b45794301f2490fceb84b0dd9c60e1 (diff) | |
| download | plus-7ed077a94dd553e5aa7675144ce98fd6e4ce723e.tar.gz plus-7ed077a94dd553e5aa7675144ce98fd6e4ce723e.tar.bz2 plus-7ed077a94dd553e5aa7675144ce98fd6e4ce723e.tar.xz plus-7ed077a94dd553e5aa7675144ce98fd6e4ce723e.zip | |
Add pickup ignore list.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 6cf02bf4a..ade74edc1 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -937,8 +937,11 @@ bool LocalPlayer::pickUp(FloorItem *item) if (dx * dx + dy * dy < dist) { - Net::getPlayerHandler()->pickUp(item); - mPickUpTarget = nullptr; + if (actorSpriteManager->checkForPickup(item)) + { + Net::getPlayerHandler()->pickUp(item); + mPickUpTarget = nullptr; + } } else if (mPickUpType >= 4 && mPickUpType <= 6) { |