diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2022-08-19 16:55:29 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2022-08-19 17:34:55 +0200 |
| commit | 109b602701578b9f2b29282f84bf2757544f8d32 (patch) | |
| tree | a2fd70556c86385a75bfb7651e865beb0a05fd37 /src/game-server/npc.cpp | |
| parent | 6c6090991e17276de09f5f82d2fc8a6c1adf5bf4 (diff) | |
| download | manaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.gz manaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.bz2 manaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.xz manaserv-109b602701578b9f2b29282f84bf2757544f8d32.zip | |
Apply C++11 fixits
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
Diffstat (limited to 'src/game-server/npc.cpp')
| -rw-r--r-- | src/game-server/npc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp index 2b6ab1fd..bcc62d33 100644 --- a/src/game-server/npc.cpp +++ b/src/game-server/npc.cpp @@ -76,7 +76,7 @@ static Script *prepareResume(Entity *ch, Script::ThreadState expectedState) Script::Thread *thread = ch->getComponent<CharacterComponent>()->getNpcThread(); if (!thread || thread->mState != expectedState) - return 0; + return nullptr; Script *script = ScriptManager::currentState(); script->prepareResume(thread); @@ -85,7 +85,7 @@ static Script *prepareResume(Entity *ch, Script::ThreadState expectedState) void Npc::start(Entity *npc, Entity *ch) { - NpcComponent *npcComponent = npc->getComponent<NpcComponent>(); + auto npcComponent = npc->getComponent<NpcComponent>(); Script *script = ScriptManager::currentState(); Script::Ref talkCallback = npcComponent->getTalkCallback(); |