games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Merge pull request #4134 from kambala-decapitator/editor-fix-crash-on-exit

Browse Source 
[editor] fix crash on quit
This commit is contained in:
Ivan Savenko 2024-06-17 17:25:12 +03:00 committed by GitHub
commit a7fd048a88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mapping/CMapHeader.h
View File

@ -207,13 +207,13 @@ class DLL_LINKAGE CMapHeader
void setupEvents();
public:
static const int MAP_SIZE_SMALL = 36;
static const int MAP_SIZE_MIDDLE = 72;
static const int MAP_SIZE_LARGE = 108;
static const int MAP_SIZE_XLARGE = 144;
static const int MAP_SIZE_HUGE = 180;
static const int MAP_SIZE_XHUGE = 216;
static const int MAP_SIZE_GIANT = 252;
static constexpr int MAP_SIZE_SMALL = 36;
static constexpr int MAP_SIZE_MIDDLE = 72;
static constexpr int MAP_SIZE_LARGE = 108;
static constexpr int MAP_SIZE_XLARGE = 144;
static constexpr int MAP_SIZE_HUGE = 180;
static constexpr int MAP_SIZE_XHUGE = 216;
static constexpr int MAP_SIZE_GIANT = 252;
CMapHeader();
virtual ~CMapHeader();

4
mapeditor/mapcontroller.cpp
View File

@ -8,6 +8,7 @@
*
*/
#include "StdInc.h"
#include "mapcontroller.h"
#include "../lib/ArtifactUtils.h"
@ -57,6 +58,7 @@ void MapController::connectScenes()
MapController::~MapController()
{
main = nullptr;
}
const std::unique_ptr<CMap> & MapController::getMapUniquePtr() const
@ -228,6 +230,8 @@ void MapController::setMap(std::unique_ptr<CMap> cmap)
_map->getEditManager()->getUndoManager().setUndoCallback([this](bool allowUndo, bool allowRedo)
{
if(!main)
return;
main->enableUndo(allowUndo);
main->enableRedo(allowRedo);
}

1
mapeditor/maphandler.h
View File

@ -11,7 +11,6 @@
#pragma once
//code is copied from vcmiclient/mapHandler.h with minimal changes
#include "StdInc.h"
#include "../lib/int3.h"
#include "Animation.h"

1
mapeditor/playersettings.h
View File

@ -10,7 +10,6 @@
#pragma once
#include "StdInc.h"
#include <QDialog>
#include "playerparams.h"

2
mapeditor/windownewmap.cpp
View File

@ -108,7 +108,7 @@ bool WindowNewMap::loadUserSettings()
ui->widthTxt->setText(QString::number(mapGenOptions.getWidth()));
ui->heightTxt->setText(QString::number(mapGenOptions.getHeight()));
for(auto & sz : mapSizes)
for(const auto & sz : mapSizes)
{
if(sz.second.first == mapGenOptions.getWidth() &&
sz.second.second == mapGenOptions.getHeight())

4
mapeditor/windownewmap.h
View File

@ -11,6 +11,8 @@
#pragma once
#include <QDialog>
#include "../lib/mapping/CMapHeader.h"
#include "../lib/rmg/CMapGenOptions.h"
namespace Ui
@ -62,7 +64,7 @@ class WindowNewMap : public QDialog
{7, 6},
{8, 7}
};
const std::map<int, std::pair<int, int>> mapSizes
{
{0, {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_SMALL}},