diff --git a/conanfile.py b/conanfile.py index 90671d6..66e9490 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ class PkmnLibConan(ConanFile): self.options["AngelScript"].link_std_statically = True def requirements(self): - self.requires("CreatureLib/645ba95bbc46f4add28ba6440a707e89ea609a25@creaturelib/master") + self.requires("CreatureLib/5f891cd4edb72e948d5c63f518c5d6eeeb52dd74@creaturelib/master") if self.options.script_handler == "angelscript": self.requires("AngelScript/2.34@AngelScript/Deukhoofd") else: diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.cpp index a33428f..6c3b023 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.cpp @@ -64,4 +64,8 @@ void RegisterBattleClass::RegisterBattle(asIScriptEngine* engine) { "Battle", "void AddVolatile(const string &in name) const", asMETHODPR(CreatureLib::Battling::Battle, AddVolatileScript, (const std::string&), void), asCALL_THISCALL); assert(r >= 0); + r = engine->RegisterObjectMethod( + "Battle", "void RemoveVolatile(const string &in name) const", + asMETHODPR(CreatureLib::Battling::Battle, RemoveVolatileScript, (const std::string&), void), asCALL_THISCALL); + assert(r >= 0); } diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp index fdbfe48..232a9fc 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp @@ -179,4 +179,8 @@ void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) { "Pokemon", "void AddVolatile(const string &in name) const", asMETHODPR(PkmnLib::Battling::Pokemon, AddVolatileScript, (const std::string&), void), asCALL_THISCALL); assert(r >= 0); + r = engine->RegisterObjectMethod( + "Pokemon", "void RemoveVolatile(const string &in name) const", + asMETHODPR(PkmnLib::Battling::Pokemon, RemoveVolatileScript, (const std::string&), void), asCALL_THISCALL); + assert(r >= 0); } \ No newline at end of file