mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-15 01:24:45 +02:00
Fix build
This commit is contained in:
@ -18,7 +18,7 @@
|
||||
#include "../mock/mock_spells_effects_Registry.h"
|
||||
#include "../mock/mock_ServerCallback.h"
|
||||
|
||||
#include "../../../lib/VCMI_Lib.h"
|
||||
#include "../../../lib/GameLibrary.h"
|
||||
#include "../../lib/json/JsonUtils.h"
|
||||
#include "../../../lib/ScriptHandler.h"
|
||||
#include "../../../lib/CScriptingModule.h"
|
||||
@ -110,7 +110,7 @@ protected:
|
||||
{
|
||||
EXPECT_CALL(registryMock, add(Eq(SCRIPT_NAME), _)).WillOnce(SaveArg<1>(&factory));
|
||||
EXPECT_CALL(scriptMock, getName()).WillRepeatedly(ReturnRef(SCRIPT_NAME));
|
||||
VLC->scriptHandler->lua->registerSpellEffect(®istryMock, &scriptMock);
|
||||
LIBRARY->scriptHandler->lua->registerSpellEffect(®istryMock, &scriptMock);
|
||||
|
||||
GTEST_ASSERT_NE(factory, nullptr);
|
||||
subject.reset(factory->create());
|
||||
|
@ -9,7 +9,7 @@
|
||||
*/
|
||||
#include "StdInc.h"
|
||||
#include "lib/modding/ModScope.h"
|
||||
#include "lib/VCMI_Lib.h"
|
||||
#include "lib/GameLibrary.h"
|
||||
|
||||
#include "ScriptFixture.h"
|
||||
|
||||
@ -31,7 +31,7 @@ void ScriptFixture::loadScriptFromFile(const std::string & path)
|
||||
|
||||
void ScriptFixture::loadScript(const JsonNode & scriptConfig)
|
||||
{
|
||||
subject = VLC->scriptHandler->loadFromJson(&loggerMock, ModScope::scopeBuiltin(), scriptConfig, "test");
|
||||
subject = LIBRARY->scriptHandler->loadFromJson(&loggerMock, ModScope::scopeBuiltin(), scriptConfig, "test");
|
||||
|
||||
GTEST_ASSERT_NE(subject, nullptr);
|
||||
|
||||
@ -42,7 +42,7 @@ void ScriptFixture::loadScript(const JsonNode & scriptConfig)
|
||||
|
||||
void ScriptFixture::loadScript(ModulePtr module, const std::string & scriptSource)
|
||||
{
|
||||
subject = std::make_shared<ScriptImpl>(VLC->scriptHandler.get());
|
||||
subject = std::make_shared<ScriptImpl>(LIBRARY->scriptHandler.get());
|
||||
|
||||
subject->host = module;
|
||||
subject->sourceText = scriptSource;
|
||||
|
Reference in New Issue
Block a user