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();