games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +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

10
server/CVCMIServer.cpp
View File

@ -170,7 +170,7 @@ void CVCMIServer::run()
#endif
startAsyncAccept();
#ifndef VCMI_ANDROID
if(shm)
{
@ -735,14 +735,14 @@ void CVCMIServer::optionNextHero(PlayerColor player, int dir)
if(s.hero == PlayerSettings::RANDOM) // first/last available
{
int max = static_cast<int>(VLC->heroh->heroes.size()),
int max = static_cast<int>(VLC->heroh->size()),
min = 0;
s.hero = nextAllowedHero(player, min, max, 0, dir);
}
else
{
if(dir > 0)
s.hero = nextAllowedHero(player, s.hero, (int)VLC->heroh->heroes.size(), 1, dir);
s.hero = nextAllowedHero(player, s.hero, (int)VLC->heroh->size(), 1, dir);
else
s.hero = nextAllowedHero(player, -1, s.hero, 1, dir); // min needs to be -1 -- hero at index 0 would be skipped otherwise
}
@ -796,8 +796,8 @@ void CVCMIServer::optionNextBonus(PlayerColor player, int dir)
bool CVCMIServer::canUseThisHero(PlayerColor player, int ID)
{
return VLC->heroh->heroes.size() > ID
&& si->playerInfos[player].castle == VLC->heroh->heroes[ID]->heroClass->faction
return VLC->heroh->size() > ID
&& si->playerInfos[player].castle == VLC->heroh->objects[ID]->heroClass->faction
&& !vstd::contains(getUsedHeroes(), ID)
&& mi->mapHeader->allowedHeroes[ID];
}