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

Add script category to script creation function in AngelScript.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-13 13:59:07 +01:00
parent eeedbdac03
commit 6032610de6
11 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
View File

@@ -26,7 +26,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script = nullptr;
@@ -46,7 +48,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;

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

@@ -17,7 +17,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script = nullptr;
@@ -37,7 +39,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;

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

@@ -13,7 +13,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script = nullptr;
@@ -33,7 +35,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;

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

@@ -17,7 +17,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script = nullptr;
@@ -37,7 +39,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;

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

@@ -15,7 +15,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script;
@@ -35,7 +37,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;

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

@@ -16,7 +16,9 @@ class testScript1 {
}
)"}};
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
static const char* _testLoadFunc(CreatureLib::Battling::ScriptResolver::ScriptCategory category, const char* name) {
return _scripts[name];
}
struct ScriptData {
AngelScriptScript* Script;
@@ -36,7 +38,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
_resolverCache->CreateScript("testScript1");
_resolverCache->CreateScript(AngelScripResolver::ScriptCategory::Attack ,"testScript1");
_resolverCache->FinalizeModule();
}
return _resolverCache;