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

Style fixes.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2021-03-27 22:40:16 +01:00
parent e748f6e96f
commit 78268c51c0
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ScriptResolving/AngelScript/AngelScriptResolver.hpp
View File

@ -85,7 +85,7 @@ public:
auto v = _baseTypes.TryGet(name); auto v = _baseTypes.TryGet(name);
if (!v.has_value()) { if (!v.has_value()) {
t = _mainModule->GetTypeInfoByName(name.c_str()); t = _mainModule->GetTypeInfoByName(name.c_str());
if (t == NULL){ if (t == NULL) {
t = _engine->GetTypeInfoByDecl(name.c_str()); t = _engine->GetTypeInfoByDecl(name.c_str());
} }
_baseTypes.Insert(name, t); _baseTypes.Insert(name, t);

3
tests/ScriptTests/BaseScriptClassTests.cpp
View File

@ -391,7 +391,8 @@ TEST_CASE("Add Volatile with return script function") {
script->OnSecondaryEffect(nullptr, mon, 0); script->OnSecondaryEffect(nullptr, mon, 0);
auto scriptObjOption = const_cast<CreatureLib::Battling::ScriptAggregator&>(mon->GetScriptIterator()).GetNextNotNull(); auto scriptObjOption =
const_cast<CreatureLib::Battling::ScriptAggregator&>(mon->GetScriptIterator()).GetNextNotNull();
REQUIRE(scriptObjOption.has_value()); REQUIRE(scriptObjOption.has_value());
REQUIRE(scriptObjOption.value()->GetName() == "AddVolatileModSecondary"_cnc); REQUIRE(scriptObjOption.value()->GetName() == "AddVolatileModSecondary"_cnc);
auto scriptObj = scriptObjOption.value(); auto scriptObj = scriptObjOption.value();