diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-03 23:21:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-03 23:21:00 +0300 |
| commit | 60efa209d05ecdfe5c6ad69c8e76e6a34b206e1b (patch) | |
| tree | e6f2c349b29030ad86144aeb4d8a4ffab09cd0d5 /src | |
| parent | 576d56c7b5636cf95ac8eb1650949da6a26a1bd7 (diff) | |
| download | manaplus-60efa209d05ecdfe5c6ad69c8e76e6a34b206e1b.tar.gz manaplus-60efa209d05ecdfe5c6ad69c8e76e6a34b206e1b.tar.bz2 manaplus-60efa209d05ecdfe5c6ad69c8e76e6a34b206e1b.tar.xz manaplus-60efa209d05ecdfe5c6ad69c8e76e6a34b206e1b.zip | |
dont spawn pet on collision.
Diffstat (limited to 'src')
| -rw-r--r-- | src/being/being.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 511df5dc8..e155dc886 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -3312,6 +3312,14 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const } dstX += offsetX; dstY += offsetY; + if (mMap) + { + if (!mMap->getWalk(dstX, dstY, getWalkMask())) + { + dstX = mOwner->getTileX(); + dstY = mOwner->getTileY(); + } + } } void Being::playSfx(const SoundInfo &sound, Being *const being, |