aboutsummaryrefslogtreecommitdiff
path: root/Source/MapEditor/mainwindow.h
diff options
context:
space:
mode:
authorXavier ASUS <xavi92psx@gmail.com>2018-11-25 18:02:18 +0100
committerXavier ASUS <xavi92psx@gmail.com>2018-11-25 18:02:18 +0100
commit64dbf5cdd5c16ab6ccdadcfd66949aba5b8fa1e2 (patch)
treed408c06ac5573c35eaee8fd451114fd73acde2f8 /Source/MapEditor/mainwindow.h
parent135a1e93cb9b3a859c4269a94ababe33b3558f9a (diff)
Bugfix: minutes were not being retrieved from PLT files.
Game.c: parking slots cannot be selected if an aircraft in STATE_PARKED state is on it. Other fixes and improvements. Added some tiles from TILESET2.TIM
Diffstat (limited to 'Source/MapEditor/mainwindow.h')
-rw-r--r--Source/MapEditor/mainwindow.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/MapEditor/mainwindow.h b/Source/MapEditor/mainwindow.h
index 40963c9..97e39ef 100644
--- a/Source/MapEditor/mainwindow.h
+++ b/Source/MapEditor/mainwindow.h
@@ -37,7 +37,7 @@ private:
void appSettings(void);
void loadTilesetData(void);
void loadBuildingData(void);
- void parseMapData(QDataStream &ds, const QPixmap &tileSet);
+ void parseMapData(QDataStream &ds, const QPixmap &tileSet, const QPixmap &tileSet2);
Ui::MainWindow ui;
QString _last_dir;
@@ -49,6 +49,7 @@ private:
QList<QGraphicsTextItem*> textItems;
QShortcut tileSet;
QShortcut tileMoveUp;
+ QString tilesetPaths[2];
private slots:
void loadMap(void);