games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

Fixed http://bugs.vcmi.eu/view.php?id=2521

Browse Source 
* show icons at visitable position
* do not duplicate visible objects icons
This commit is contained in:
AlexVinS 2016-09-28 07:58:15 +03:00
parent 2576dd4692
commit 30aa379a9d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spells/AdventureSpellMechanics.cpp
View File

@ -346,17 +346,22 @@ ESpellCastResult ViewMechanics::applyAdventureEffects(const SpellCastEnvironment
{ {
ShowWorldViewEx pack; ShowWorldViewEx pack;
pack.player = parameters.caster->tempOwner; pack.player = parameters.caster->getOwner();
const int spellLevel = parameters.caster->getSpellSchoolLevel(owner); const int spellLevel = parameters.caster->getSpellSchoolLevel(owner);
const auto & fowMap = env->getCb()->getPlayerTeam(parameters.caster->getOwner())->fogOfWarMap;
for(const CGObjectInstance * obj : env->getMap()->objects) for(const CGObjectInstance * obj : env->getMap()->objects)
{ {
//todo:we need to send only not visible objects //deleted object remain as empty pointer
if(obj && filterObject(obj, spellLevel))
{
ObjectPosInfo posInfo(obj);
if(obj)//for some reason deleted object remain as empty pointer if(fowMap[posInfo.pos.x][posInfo.pos.y][posInfo.pos.z] == 0)
if(filterObject(obj, spellLevel)) pack.objectPositions.push_back(posInfo);
pack.objectPositions.push_back(ObjectPosInfo(obj)); }
} }
env->sendAndApply(&pack); env->sendAndApply(&pack);

4
lib/spells/ViewSpellInt.cpp
View File

@ -15,13 +15,13 @@
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
ObjectPosInfo::ObjectPosInfo(): ObjectPosInfo::ObjectPosInfo():
pos(),id(Obj::NO_OBJ), subId(-1), owner(PlayerColor::CANNOT_DETERMINE) pos(), id(Obj::NO_OBJ), subId(-1), owner(PlayerColor::CANNOT_DETERMINE)
{ {
} }
ObjectPosInfo::ObjectPosInfo(const CGObjectInstance * obj): ObjectPosInfo::ObjectPosInfo(const CGObjectInstance * obj):
pos(obj->pos),id(obj->ID), subId(obj->subID), owner(obj->tempOwner) pos(obj->visitablePos()), id(obj->ID), subId(obj->subID), owner(obj->tempOwner)
{ {
} }