From 9685037cf3fb64b4e6b7c2eb8391ec6e00058c03 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 21 Nov 2021 12:42:35 +0100 Subject: [PATCH] Update to new Throw message. --- src/Tester/AngelScript/BattleFunctions.hpp | 2 +- src/Tester/AngelScript/MiscMockFunctions.hpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tester/AngelScript/BattleFunctions.hpp b/src/Tester/AngelScript/BattleFunctions.hpp index 9c3a280..b32a0bb 100644 --- a/src/Tester/AngelScript/BattleFunctions.hpp +++ b/src/Tester/AngelScript/BattleFunctions.hpp @@ -155,7 +155,7 @@ class BattleFunctions { static void LearnMove(PkmnLib::Battling::Pokemon* user, const ArbUt::StringView& moveName) { auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName); if (!move.has_value()) { - THROW("Unknown move: " << moveName); + THROW("Unknown move: ", moveName); } user->AddAttack( new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown)); diff --git a/src/Tester/AngelScript/MiscMockFunctions.hpp b/src/Tester/AngelScript/MiscMockFunctions.hpp index ec1c8fa..c90e554 100644 --- a/src/Tester/AngelScript/MiscMockFunctions.hpp +++ b/src/Tester/AngelScript/MiscMockFunctions.hpp @@ -5,7 +5,8 @@ class MiscMockFunctions { static CScriptHandle CreateMoveScript(const ArbUt::StringView& name) { - auto script = Globals::Library.GetValue()->GetScriptResolver()->LoadScript(nullptr, ScriptCategory::Attack, name); + auto script = + Globals::Library.GetValue()->GetScriptResolver()->LoadScript(nullptr, ScriptCategory::Attack, name); if (script != nullptr) { auto* ctx = asGetActiveContext(); TestEnvironment* env = static_cast(ctx->GetUserData(684)); @@ -25,7 +26,7 @@ class MiscMockFunctions { auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName); if (!move.has_value()) { - THROW("Unknown move: " << moveName); + THROW("Unknown move: ", moveName); } auto learnedMove = new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown);