summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-13 22:14:56 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-13 22:14:56 +0300
commit6b894220f3c029d256f7f15f41ecb2f635d25bde (patch)
treea8c9b891f3f0df44440def2ea755fcf7454ddb32 /src/being.cpp
parentb4cd8029339cac3c577b67bd161b4dd3ab4f1530 (diff)
downloadmv-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.gz
mv-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.bz2
mv-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.xz
mv-6b894220f3c029d256f7f15f41ecb2f635d25bde.zip
Add more MANASERV_SUPPORT defines to disable server type checks, if manaserv disabled.
Fix some compilation warnings.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 5e5fd3bdc..383d392f8 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -351,7 +351,9 @@ void Being::setPosition(const Vector &pos)
void Being::setDestination(int dstX, int dstY)
{
+#ifdef MANASERV_SUPPORT
if (Net::getNetworkType() == ServerInfo::TMWATHENA)
+#endif
{
if (mMap)
setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask()));
@@ -411,8 +413,12 @@ void Being::setPath(const Path &path)
if (mPath.empty())
return;
+#ifdef MANASERV_SUPPORT
if ((Net::getNetworkType() == ServerInfo::TMWATHENA) &&
mAction != MOVE && mAction != DEAD)
+#else
+ if (mAction != MOVE && mAction != DEAD)
+#endif
{
nextTile();
mActionTime = tick_time;
@@ -655,7 +661,9 @@ void Being::handleAttack(Being *victim, int damage,
else if (mInfo->getAttack(mAttackType))
fireMissile(victim, mInfo->getAttack(mAttackType)->missileParticle);
+#ifdef MANASERV_SUPPORT
if (Net::getNetworkType() == ServerInfo::TMWATHENA)
+#endif
{
reset();
mActionTime = tick_time;
@@ -1194,8 +1202,8 @@ void Being::logic()
}
}
else
-#endif
if (Net::getNetworkType() == ServerInfo::TMWATHENA)
+#endif
{
switch (mAction)
{
@@ -1203,6 +1211,7 @@ void Being::logic()
case SIT:
case DEAD:
case HURT:
+ case SPAWN:
default:
break;