mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there. * Declared existing Entity APIs. * Added basic script context caching * Started Lua script module * Started Lua spell effect API * Started script state persistence * Started battle info callback binding * CommitPackage removed * Extracted spells::Caster to own header; Expanded Spell API. * implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C * !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented * Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key) * Re-enabled VERM macros. * !?GM0 added * !?TM implemented * Added !!MF:N * Started !?OB, !!BM, !!HE, !!OW, !!UN * Added basic support of w-variables * Added support for ERM indirect variables * Made !?FU regular trigger * !!re (ERA loop receiver) implemented * Fixed ERM receivers with zero args.
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "mock/mock_BonusBearer.h"
|
||||
#include "mock/mock_battle_IBattleState.h"
|
||||
#include "mock/mock_battle_Unit.h"
|
||||
#include "mock/mock_scripting_Pool.h"
|
||||
|
||||
using namespace battle;
|
||||
using namespace testing;
|
||||
@@ -104,8 +105,12 @@ public:
|
||||
class TestSubject : public CBattleInfoCallback
|
||||
{
|
||||
public:
|
||||
TestSubject()
|
||||
: CBattleInfoCallback()
|
||||
|
||||
scripting::Pool * pool;
|
||||
|
||||
TestSubject(scripting::Pool * p)
|
||||
: CBattleInfoCallback(),
|
||||
pool(p)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -113,13 +118,27 @@ public:
|
||||
{
|
||||
CBattleInfoCallback::setBattle(battleInfo);
|
||||
}
|
||||
|
||||
scripting::Pool * getContextPool() const override
|
||||
{
|
||||
return pool;
|
||||
}
|
||||
};
|
||||
|
||||
StrictMock<scripting::PoolMock> pool;
|
||||
|
||||
TestSubject subject;
|
||||
|
||||
BattleStateMock battleMock;
|
||||
UnitsFake unitsFake;
|
||||
|
||||
CBattleInfoCallbackTest()
|
||||
: pool(),
|
||||
subject(&pool)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void startBattle()
|
||||
{
|
||||
subject.setBattle(&battleMock);
|
||||
|
||||
Reference in New Issue
Block a user