games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Some ideas to fix imported maps

Browse Source
This commit is contained in:
nordsoft 2022-09-07 02:56:40 +04:00
parent b284652f71
commit a2c63e7ed2
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mapeditor/mapcontroller.cpp
View File

@ -7,6 +7,8 @@
#include "../lib/Terrain.h" #include "../lib/Terrain.h"
#include "../lib/mapObjects/CObjectClassesHandler.h" #include "../lib/mapObjects/CObjectClassesHandler.h"
#include "../lib/rmg/ObstaclePlacer.h" #include "../lib/rmg/ObstaclePlacer.h"
#include "../lib/CSkillHandler.h"
#include "../lib/spells/CSpellHandler.h"
#include "mapview.h" #include "mapview.h"
#include "scenelayer.h" #include "scenelayer.h"
#include "maphandler.h" #include "maphandler.h"
@ -64,11 +66,9 @@ MinimapScene * MapController::miniScene(int level)
return _miniscenes[level].get(); return _miniscenes[level].get();
} }
void MapController::setMap(std::unique_ptr<CMap> cmap) void MapController::repairMap()
{ {
_map = std::move(cmap); //fix owners for objects
//fix map
for(auto obj : _map->objects) for(auto obj : _map->objects)
if(obj->getOwner() == PlayerColor::UNFLAGGABLE) if(obj->getOwner() == PlayerColor::UNFLAGGABLE)
if(dynamic_cast<CGMine*>(obj.get()) || if(dynamic_cast<CGMine*>(obj.get()) ||
@ -77,7 +77,31 @@ void MapController::setMap(std::unique_ptr<CMap> cmap)
dynamic_cast<CGGarrison*>(obj.get()) || dynamic_cast<CGGarrison*>(obj.get()) ||
dynamic_cast<CGShipyard*>(obj.get()) || dynamic_cast<CGShipyard*>(obj.get()) ||
dynamic_cast<CGHeroInstance*>(obj.get())) dynamic_cast<CGHeroInstance*>(obj.get()))
obj->tempOwner = PlayerColor::NEUTRAL; obj->tempOwner = PlayerColor::NEUTRAL;
//there might be extra skills, arts and spells not imported from map
if(VLC->skillh->getDefaultAllowed().size() > map()->allowedAbilities.size())
{
for(int i = map()->allowedAbilities.size(); i < VLC->skillh->getDefaultAllowed().size(); ++i)
map()->allowedAbilities.push_back(false);
}
if(VLC->arth->getDefaultAllowed().size() > map()->allowedArtifact.size())
{
for(int i = map()->allowedArtifact.size(); i < VLC->arth->getDefaultAllowed().size(); ++i)
map()->allowedArtifact.push_back(false);
}
if(VLC->spellh->getDefaultAllowed().size() > map()->allowedSpell.size())
{
for(int i = map()->allowedSpell.size(); i < VLC->spellh->getDefaultAllowed().size(); ++i)
map()->allowedSpell.push_back(false);
}
}
void MapController::setMap(std::unique_ptr<CMap> cmap)
{
_map = std::move(cmap);
repairMap();
_scenes[0].reset(new MapScene(0)); _scenes[0].reset(new MapScene(0));
_scenes[1].reset(new MapScene(1)); _scenes[1].reset(new MapScene(1));

2
mapeditor/mapcontroller.h
View File

@ -17,6 +17,8 @@ public:
void setMap(std::unique_ptr<CMap>); void setMap(std::unique_ptr<CMap>);
void repairMap();
const std::unique_ptr<CMap> & getMapUniquePtr() const; //to be used for map saving const std::unique_ptr<CMap> & getMapUniquePtr() const; //to be used for map saving
CMap * map(); CMap * map();
MapHandler * mapHandler(); MapHandler * mapHandler();