Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link to library we use for stacktraces.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-08-16 11:22:43 +02:00
parent b5a1d74bdb
commit cd4893936e
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -75,6 +75,10 @@ add_library(pkmnLib ${LIBTYPE} ${CORE_SRC_FILES})
SET(_LINKS CreatureLib Arbutils) SET(_LINKS CreatureLib Arbutils)
SET(_TESTLINKS pkmnLib CreatureLib Arbutils) SET(_TESTLINKS pkmnLib CreatureLib Arbutils)
if (NOT WINDOWS)
set(_LINKS ${_LINKS} -lbfd -ldl)
endif ()
if (SCRIPT_PROVIDER STREQUAL "angelscript") if (SCRIPT_PROVIDER STREQUAL "angelscript")
message(STATUS "Using Angelscript as script provider.") message(STATUS "Using Angelscript as script provider.")

4
src/Battling/Pokemon/CreatePokemon.hpp
View File

@ -49,8 +49,8 @@ namespace PkmnLib::Battling {
public: public:
CreatePokemon(const BattleLibrary* library, const ArbUt::StringView& species, uint8_t level) CreatePokemon(const BattleLibrary* library, const ArbUt::StringView& species, uint8_t level)
: _library(library), _species(species), _level(level), _attacks(library->GetSettings()->GetMaximalAttacks()) { : _library(library), _species(species), _level(level),
} _attacks(library->GetSettings()->GetMaximalAttacks()) {}
CreatePokemon& WithForme(const ArbUt::StringView& forme); CreatePokemon& WithForme(const ArbUt::StringView& forme);
CreatePokemon& WithGender(CreatureLib::Library::Gender gender); CreatePokemon& WithGender(CreatureLib::Library::Gender gender);

5
tests/ScriptTests/BaseScriptClassTests.cpp
View File

@ -344,10 +344,9 @@ TEST_CASE("Handle script exceptions.") {
auto mainLib = TestLibrary::GetLibrary(); auto mainLib = TestLibrary::GetLibrary();
auto script = GetScript(mainLib, "throwScript"_cnc); auto script = GetScript(mainLib, "throwScript"_cnc);
REQUIRE(script != nullptr); REQUIRE(script != nullptr);
try{ try {
TryException(script); TryException(script);
} } catch (const ArbUt::Exception& e) {
catch (const ArbUt::Exception& e){
REQUIRE(strcmp(e.what(), "Script exception in script 'throwScript', line 1. Message: 'test exception'.") == 0); REQUIRE(strcmp(e.what(), "Script exception in script 'throwScript', line 1. Message: 'test exception'.") == 0);
delete script; delete script;
return; return;