summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-17 12:50:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-17 12:50:19 +0300
commit819b10633d3218ac4b758e62051d0c1376d91205 (patch)
treed4e537837e5e5993d32597c22ec23d0148a4bb9e
parent0412f90e54bbdde0a98eac5291f3975e212cebbb (diff)
downloadmv-819b10633d3218ac4b758e62051d0c1376d91205.tar.gz
mv-819b10633d3218ac4b758e62051d0c1376d91205.tar.bz2
mv-819b10633d3218ac4b758e62051d0c1376d91205.tar.xz
mv-819b10633d3218ac4b758e62051d0c1376d91205.zip
Add missing eathena and tmwa defines into actormanager.
-rw-r--r--src/actormanager.cpp4
-rw-r--r--src/actormanager.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index cabd8fba1..2367f8fd4 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -1512,6 +1512,7 @@ void ActorManager::updatePlayerGuild() const
}
}
+#ifdef TMWA_SUPPORT
void ActorManager::parseLevels(std::string levels) const
{
levels.append(", ");
@@ -1540,6 +1541,7 @@ void ActorManager::parseLevels(std::string levels) const
}
updatePlayerNames();
}
+#endif
void ActorManager::optionChanged(const std::string &name)
{
@@ -1816,6 +1818,7 @@ Being *ActorManager::cloneBeing(const Being *const srcBeing,
return dstBeing;
}
+#ifdef EATHENA_SUPPORT
void ActorManager::removeRoom(const int chatId)
{
for_actors
@@ -1855,3 +1858,4 @@ void ActorManager::updateRoom(const ChatObject *const newChat)
}
}
}
+#endif
diff --git a/src/actormanager.h b/src/actormanager.h
index 25b2f6e00..9387b2961 100644
--- a/src/actormanager.h
+++ b/src/actormanager.h
@@ -244,7 +244,9 @@ class ActorManager final: public ConfigListener
void updatePlayerGuild() const;
+#ifdef TMWA_SUPPORT
void parseLevels(std::string levels) const;
+#endif
bool pickUpAll(const int x1, const int y1, const int x2, const int y2,
const bool serverBuggy = false);
@@ -319,9 +321,11 @@ class ActorManager final: public ConfigListener
void updateEffects(const std::map<int, int> &addEffects,
const std::set<int> &removeEffects) const;
+#ifdef EATHENA_SUPPORT
void removeRoom(const int chatId);
void updateRoom(const ChatObject *const newChat);
+#endif
protected:
bool validateBeing(const Being *const aroundBeing,