games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Entities redesign and a few ERM features

Browse Source 
* 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:
AlexVinS
2018-03-17 17:58:30 +03:00
committed by AlexVinS
parent 11bb46780a
commit ecaa9f5d0b
475 changed files with 22491 additions and 7123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/spells/ProxyCaster.cpp
View File

@@ -29,12 +29,12 @@ int32_t ProxyCaster::getCasterUnitId() const
return actualCaster->getCasterUnitId();
}
ui8 ProxyCaster::getSpellSchoolLevel(const Spell * spell, int * outSelectedSchool) const
int32_t ProxyCaster::getSpellSchoolLevel(const Spell * spell, int32_t * outSelectedSchool) const
{
return actualCaster->getSpellSchoolLevel(spell, outSelectedSchool);
}
int ProxyCaster::getEffectLevel(const Spell * spell) const
int32_t ProxyCaster::getEffectLevel(const Spell * spell) const
{
return actualCaster->getEffectLevel(spell);
}
@@ -49,12 +49,12 @@ int64_t ProxyCaster::getSpecificSpellBonus(const Spell * spell, int64_t base) co
return actualCaster->getSpecificSpellBonus(spell, base);
}
int ProxyCaster::getEffectPower(const Spell * spell) const
int32_t ProxyCaster::getEffectPower(const Spell * spell) const
{
return actualCaster->getEffectPower(spell);
}
int ProxyCaster::getEnchantPower(const Spell * spell) const
int32_t ProxyCaster::getEnchantPower(const Spell * spell) const
{
return actualCaster->getEnchantPower(spell);
}
@@ -64,9 +64,9 @@ int64_t ProxyCaster::getEffectValue(const Spell * spell) const
return actualCaster->getEffectValue(spell);
}
const PlayerColor ProxyCaster::getOwner() const
PlayerColor ProxyCaster::getCasterOwner() const
{
return actualCaster->getOwner();
return actualCaster->getCasterOwner();
}
void ProxyCaster::getCasterName(MetaString & text) const
@@ -79,7 +79,7 @@ void ProxyCaster::getCastDescription(const Spell * spell, const std::vector<cons
actualCaster->getCastDescription(spell, attacked, text);
}
void ProxyCaster::spendMana(const PacketSender * server, const int spellCost) const
void ProxyCaster::spendMana(ServerCallback * server, const int32_t spellCost) const
{
actualCaster->spendMana(server, spellCost);
}