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

Merge beta -> develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-26 22:45:41 +03:00
parent 1bb5077231 9296306fa3
commit fb739e7186
34 changed files with 307 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mapView/MapViewController.cpp
View File

@ -63,7 +63,7 @@ void MapViewController::setViewCenter(const Point & position, int level)
model->setViewCenter(betterPosition);
model->setLevel(std::clamp(level, 0, context->getMapSize().z));
if(adventureInt) // may be called before adventureInt is initialized
if(adventureInt && !puzzleMapContext) // may be called before adventureInt is initialized
adventureInt->onMapViewMoved(model->getTilesTotalRect(), model->getLevel());
}
@ -154,6 +154,7 @@ void MapViewController::updateBefore(uint32_t timeDelta)
adventureContext->settingShowGrid = settings["gameTweaks"]["showGrid"].Bool();
adventureContext->settingShowVisitable = settings["session"]["showVisitable"].Bool();
adventureContext->settingShowBlocked = settings["session"]["showBlocked"].Bool();
adventureContext->settingSpellRange = settings["session"]["showSpellRange"].Bool();
}
}