From 109b602701578b9f2b29282f84bf2757544f8d32 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Fri, 19 Aug 2022 16:55:29 +0200 Subject: Apply C++11 fixits modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using --- src/game-server/npc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game-server/npc.cpp') 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()->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(); + auto npcComponent = npc->getComponent(); Script *script = ScriptManager::currentState(); Script::Ref talkCallback = npcComponent->getTalkCallback(); -- cgit v1.2.3-60-g2f50