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

Fix boat visibility

Browse Source
This commit is contained in:
nordsoft
2023-04-25 00:46:29 +04:00
committed by Nordsoft91
parent 3489c4fd5c
commit c899956e71
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/NetPacksLib.cpp
View File

@ -1475,15 +1475,17 @@ void NewObject::applyGs(CGameState *gs)
terrainType = t.terType->getId();
}
CGObjectInstance *o = nullptr;
auto handler = VLC->objtypeh->getHandlerFor(ID, subID);
CGObjectInstance * o = handler->create();
handler->configureObject(o, gs->getRandomGenerator());
switch(ID)
{
case Obj::BOAT:
o = new CGBoat();
terrainType = ETerrainId::WATER; //TODO: either boat should only spawn on water, or all water objects should be handled this way
break;
case Obj::MONSTER: //probably more options will be needed
o = new CGCreature();
{
//CStackInstance hlp;
auto * cre = dynamic_cast<CGCreature *>(o);
@ -1496,14 +1498,11 @@ void NewObject::applyGs(CGameState *gs)
cre->addToSlot(SlotID(0), new CStackInstance(CreatureID(subID), -1)); //add placeholder stack
}
break;
default:
o = new CGObjectInstance();
break;
}
o->ID = ID;
o->subID = subID;
o->pos = pos;
o->appearance = VLC->objtypeh->getHandlerFor(o->ID, o->subID)->getTemplates(terrainType).front();
o->appearance = handler->getTemplates(terrainType).front();
id = o->id = ObjectInstanceID(static_cast<si32>(gs->map->objects.size()));
gs->map->objects.emplace_back(o);