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

NewObject pack now receives visitable position instead of h3m position

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-20 22:06:45 +03:00
parent 56680e102d
commit d8879f1e53
8 changed files with 45 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -4432,7 +4432,7 @@ bool CGameHandler::hireHero(const CGObjectInstance *obj, ui8 hid, PlayerColor pl
NewObject no;
no.ID = Obj::BOAT;
no.subID = nh->getBoatType().getNum();
no.pos = hr.tile + int3(1,0,0);
no.targetPos = obj->visitablePos();
sendAndApply(&no);
hr.boatId = getTopObj(hr.tile)->id;
@ -5660,7 +5660,7 @@ bool CGameHandler::buildBoat(ObjectInstanceID objid, PlayerColor playerID)
NewObject no;
no.ID = Obj::BOAT;
no.subID = obj->getBoatType().getNum();
no.pos = tile + int3(1,0,0);
no.targetPos = tile;
sendAndApply(&no);
return true;
@ -5806,7 +5806,7 @@ bool CGameHandler::dig(const CGHeroInstance *h)
//create a hole
NewObject no;
no.ID = Obj::HOLE;
no.pos = h->visitablePos();
no.targetPos = h->visitablePos();
no.subID = 0;
sendAndApply(&no);
@ -7409,7 +7409,7 @@ const ObjectInstanceID CGameHandler::putNewObject(Obj ID, int subID, int3 pos)
NewObject no;
no.ID = ID; //creature
no.subID= subID;
no.pos = pos;
no.targetPos = pos;
sendAndApply(&no);
return no.id; //id field will be filled during applying on gs
return no.createdObjectID; //id field will be filled during applying on gs
}