mirror of
https://github.com/vcmi/vcmi.git
synced 2025-03-03 14:52:11 +02:00
code style
This commit is contained in:
parent
bf832d4b13
commit
9438c5f9f7
@ -8,6 +8,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "StdInc.h"
|
||||||
#include "mapcontroller.h"
|
#include "mapcontroller.h"
|
||||||
|
|
||||||
#include "../lib/ArtifactUtils.h"
|
#include "../lib/ArtifactUtils.h"
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
//code is copied from vcmiclient/mapHandler.h with minimal changes
|
//code is copied from vcmiclient/mapHandler.h with minimal changes
|
||||||
|
|
||||||
#include "StdInc.h"
|
|
||||||
#include "../lib/int3.h"
|
#include "../lib/int3.h"
|
||||||
#include "Animation.h"
|
#include "Animation.h"
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "StdInc.h"
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include "playerparams.h"
|
#include "playerparams.h"
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ bool WindowNewMap::loadUserSettings()
|
|||||||
|
|
||||||
ui->widthTxt->setText(QString::number(mapGenOptions.getWidth()));
|
ui->widthTxt->setText(QString::number(mapGenOptions.getWidth()));
|
||||||
ui->heightTxt->setText(QString::number(mapGenOptions.getHeight()));
|
ui->heightTxt->setText(QString::number(mapGenOptions.getHeight()));
|
||||||
for(auto & sz : mapSizes)
|
for(const auto & sz : mapSizes)
|
||||||
{
|
{
|
||||||
if(sz.second.first == mapGenOptions.getWidth() &&
|
if(sz.second.first == mapGenOptions.getWidth() &&
|
||||||
sz.second.second == mapGenOptions.getHeight())
|
sz.second.second == mapGenOptions.getHeight())
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
|
#include "../lib/mapping/CMapHeader.h"
|
||||||
#include "../lib/rmg/CMapGenOptions.h"
|
#include "../lib/rmg/CMapGenOptions.h"
|
||||||
|
|
||||||
namespace Ui
|
namespace Ui
|
||||||
@ -62,7 +64,7 @@ class WindowNewMap : public QDialog
|
|||||||
{7, 6},
|
{7, 6},
|
||||||
{8, 7}
|
{8, 7}
|
||||||
};
|
};
|
||||||
|
|
||||||
const std::map<int, std::pair<int, int>> mapSizes
|
const std::map<int, std::pair<int, int>> mapSizes
|
||||||
{
|
{
|
||||||
{0, {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_SMALL}},
|
{0, {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_SMALL}},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user