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

Fix issues with AngelScript not handling statistics enum well.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-12 20:36:05 +01:00
parent b8d7e5624c
commit c91b1b0906
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp
View File

@ -26,17 +26,17 @@ void RegisterSpeciesTypes::RegisterGenderEnum(asIScriptEngine* engine) {
void RegisterSpeciesTypes::RegisterStatisticEnum(asIScriptEngine* engine) { void RegisterSpeciesTypes::RegisterStatisticEnum(asIScriptEngine* engine) {
[[maybe_unused]] int r = engine->RegisterEnum("Statistic"); [[maybe_unused]] int r = engine->RegisterEnum("Statistic");
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "HP", PkmnLib::Library::Statistic::HealthPoints); r = engine->RegisterEnumValue("Statistic", "HP", (int)PkmnLib::Library::Statistic::HealthPoints);
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "Attack", PkmnLib::Library::Statistic::PhysicalAttack); r = engine->RegisterEnumValue("Statistic", "Attack", (int)PkmnLib::Library::Statistic::PhysicalAttack);
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "Defense", PkmnLib::Library::Statistic::PhysicalDefense); r = engine->RegisterEnumValue("Statistic", "Defense", (int)PkmnLib::Library::Statistic::PhysicalDefense);
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "SpecialAttack", PkmnLib::Library::Statistic::SpecialAttack); r = engine->RegisterEnumValue("Statistic", "SpecialAttack", (int)PkmnLib::Library::Statistic::SpecialAttack);
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "SpecialDefense", PkmnLib::Library::Statistic::SpecialDefense); r = engine->RegisterEnumValue("Statistic", "SpecialDefense", (int)PkmnLib::Library::Statistic::SpecialDefense);
assert(r >= 0); assert(r >= 0);
r = engine->RegisterEnumValue("Statistic", "Speed", PkmnLib::Library::Statistic::Speed); r = engine->RegisterEnumValue("Statistic", "Speed", (int)PkmnLib::Library::Statistic::Speed);
assert(r >= 0); assert(r >= 0);
} }

6
tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
View File

@ -145,14 +145,14 @@ TEST_CASE("Validate Forme GetStatistic in Script") {
auto mainLib = TestLibrary::GetLibrary(); auto mainLib = TestLibrary::GetLibrary();
// Iterate over each stat, ensure they return the expected value. // Iterate over each stat, ensure they return the expected value.
for (uint8_t statInt = CreatureLib::Core::Statistic::Health; statInt != CreatureLib::Core::Statistic::Speed; for (uint8_t statInt = static_cast<uint8_t>(CreatureLib::Core::Statistic::Health);
statInt++) { statInt != static_cast<uint8_t>(CreatureLib::Core::Statistic::Speed); statInt++) {
auto stat = static_cast<CreatureLib::Core::Statistic>(statInt); auto stat = static_cast<CreatureLib::Core::Statistic>(statInt);
auto data = GetScript(mainLib, "testGetStatistic"); auto data = GetScript(mainLib, "testGetStatistic");
auto forme = mainLib->GetSpeciesLibrary()->GetPkmnSpecies("testSpecies2")->GetDefaultForme(); auto forme = mainLib->GetSpeciesLibrary()->GetPkmnSpecies("testSpecies2")->GetDefaultForme();
data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonForme*>(forme)); data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonForme*>(forme));
data.Context->SetArgDWord(1, stat); data.Context->SetArgDWord(1, static_cast<asDWORD>(stat));
data.Context->SetArgDWord(2, forme->GetStatistic(stat)); data.Context->SetArgDWord(2, forme->GetStatistic(stat));
REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED); REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
REQUIRE((bool)data.Context->GetReturnWord()); REQUIRE((bool)data.Context->GetReturnWord());