diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-10 23:04:42 +0200 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-11 13:47:17 +0200 |
commit | d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da (patch) | |
tree | 1b4d200ba66c6afcdb7763951980476756339cf1 /src/game-server/quest.cpp | |
parent | aa04597c5f8bb806996d604699fc8ebff6d53bdd (diff) | |
download | manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.tar.gz manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.tar.bz2 manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.tar.xz manaserv-d7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da.zip |
Converted Being into a Component
I did not really care too much about staying consistent with the use of
static_casts to Actors since they are only temporary anyway until Actor
is a component too.
Diffstat (limited to 'src/game-server/quest.cpp')
-rw-r--r-- | src/game-server/quest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp index 803ec60b..515e6200 100644 --- a/src/game-server/quest.cpp +++ b/src/game-server/quest.cpp @@ -36,7 +36,7 @@ typedef std::map< std::string, QuestCallbacks > PendingVariables; struct PendingQuest { - Being *character; + Entity *character; sigc::connection removedConnection; sigc::connection disconnectedConnection; PendingVariables variables; @@ -46,7 +46,7 @@ typedef std::map< int, PendingQuest > PendingQuests; static PendingQuests pendingQuests; -bool getQuestVar(Being *ch, const std::string &name, std::string &value) +bool getQuestVar(Entity *ch, const std::string &name, std::string &value) { std::map< std::string, std::string >::iterator i = ch->getComponent<CharacterComponent>()->questCache.find(name); @@ -56,7 +56,7 @@ bool getQuestVar(Being *ch, const std::string &name, std::string &value) return true; } -void setQuestVar(Being *ch, const std::string &name, +void setQuestVar(Entity *ch, const std::string &name, const std::string &value) { auto *characterComponent = @@ -79,7 +79,7 @@ void setQuestVar(Being *ch, const std::string &name, accountHandler->updateCharacterVar(ch, name, value); } -void QuestRefCallback::triggerCallback(Being *ch, +void QuestRefCallback::triggerCallback(Entity *ch, const std::string &value) const { if (!mRef.isValid()) @@ -120,7 +120,7 @@ static void fullRemove(Entity &ch) pendingQuests.erase(id); } -void recoverQuestVar(Being *ch, const std::string &name, +void recoverQuestVar(Entity *ch, const std::string &name, QuestCallback *f) { auto *characterComponent = @@ -171,7 +171,7 @@ void recoveredQuestVar(int id, return; } - Being *ch = pendingQuest.character; + Entity *ch = pendingQuest.character; auto *characterComponent = ch->getComponent<CharacterComponent>(); characterComponent->questCache[name] = value; |