mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Revert "Auxiliary commit to revert individual files from c08fce4d65313cb862ea404199be323dcd5c3fd2"
This reverts commit 1e21c0893404a6ec75c2699213cfb6725c21d4de.
This commit is contained in:
parent
3a2951b329
commit
7d58ede8a9
@ -159,11 +159,9 @@ void MapController::repairMap()
|
||||
}
|
||||
}
|
||||
|
||||
EMapFormat::EMapFormat MapController::setMap(std::unique_ptr<CMap> cmap)
|
||||
void MapController::setMap(std::unique_ptr<CMap> cmap)
|
||||
{
|
||||
_map = std::move(cmap);
|
||||
auto version = _map->version;
|
||||
_map->version = EMapFormat::VCMI;
|
||||
|
||||
repairMap();
|
||||
|
||||
@ -182,8 +180,6 @@ EMapFormat::EMapFormat MapController::setMap(std::unique_ptr<CMap> cmap)
|
||||
main->enableRedo(allowRedo);
|
||||
}
|
||||
);
|
||||
|
||||
return version;
|
||||
}
|
||||
|
||||
void MapController::sceneForceUpdate()
|
||||
|
Loading…
Reference in New Issue
Block a user