From 9f7294f0135be72b9fa9ff57f56f0985296e4e27 Mon Sep 17 00:00:00 2001 From: Matthew Fioravante Date: Thu, 21 Mar 2019 23:22:01 -0400 Subject: [PATCH] EnterHeroName on bad actor? Report error instead of crash --- src/game_interpreter_map.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp index b4582933f73..610d571bbd5 100644 --- a/src/game_interpreter_map.cpp +++ b/src/game_interpreter_map.cpp @@ -560,15 +560,14 @@ bool Game_Interpreter_Map::CommandEnterHeroName(RPG::EventCommand const& com) { Game_Temp::hero_name_id = com.parameters[0]; Game_Temp::hero_name_charset = com.parameters[1]; - if (com.parameters[2] != 0) { - Game_Actor *actor = Game_Actors::GetActor(Game_Temp::hero_name_id); - - if (!actor) { - Output::Warning("EnterHeroName: Invalid actor ID %d", Game_Temp::hero_name_id); - Game_Temp::hero_name.clear(); - } else { - Game_Temp::hero_name = actor->GetName(); - } + Game_Actor *actor = Game_Actors::GetActor(Game_Temp::hero_name_id); + + if (!actor) { + Output::Error("EnterHeroName: Invalid actor ID %d", Game_Temp::hero_name_id); + } + + if (com.parameters[2]) { + Game_Temp::hero_name = actor->GetName(); } else { Game_Temp::hero_name.clear(); }