diff options
Diffstat (limited to 'Source/MapEditor')
| -rw-r--r-- | Source/MapEditor/MapEditor.pro | 1 | ||||
| -rw-r--r-- | Source/MapEditor/MapEditor.pro.user | 6 | ||||
| -rw-r--r-- | Source/MapEditor/mainwindow.cpp | 15 | ||||
| -rw-r--r-- | Source/MapEditor/settings.ini | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/Source/MapEditor/MapEditor.pro b/Source/MapEditor/MapEditor.pro index 3d53cf5..ecb6f8b 100644 --- a/Source/MapEditor/MapEditor.pro +++ b/Source/MapEditor/MapEditor.pro @@ -10,7 +10,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = MapEditor
TEMPLATE = app
-CONFIG += static
QMAKE_CXXFLAGS += -funsigned-char
diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user index a31f63f..4d40971 100644 --- a/Source/MapEditor/MapEditor.pro.user +++ b/Source/MapEditor/MapEditor.pro.user @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.7.2, 2018-11-25T21:05:26. --> +<!-- Written by QtCreator 4.7.2, 2018-11-27T22:49:44. --> <qtcreator> <data> <variable>EnvironmentId</variable> @@ -65,7 +65,7 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.0 GCC 64bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.0 GCC 64bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5120.gcc_64_kit</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> @@ -312,7 +312,7 @@ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">MapEditor.pro</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">/home/xavier/Airport/Source/MapEditor</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Release</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> diff --git a/Source/MapEditor/mainwindow.cpp b/Source/MapEditor/mainwindow.cpp index 7282c6a..64f4678 100644 --- a/Source/MapEditor/mainwindow.cpp +++ b/Source/MapEditor/mainwindow.cpp @@ -482,6 +482,11 @@ void MainWindow::addBuilding(quint8 CurrentBuilding, const int i, const int j) BUILDING_ATC_TOWER_V = 0,
BUILDING_ATC_TOWER_W = 29,
BUILDING_ATC_TOWER_H = 34,
+
+ BUILDING_ATC_LOC_U = 87,
+ BUILDING_ATC_LOC_V = 0,
+ BUILDING_ATC_LOC_W = 10,
+ BUILDING_ATC_LOC_H = 34
};
enum
@@ -503,6 +508,9 @@ void MainWindow::addBuilding(quint8 CurrentBuilding, const int i, const int j) BUILDING_ATC_TOWER_ORIGIN_X = 12,
BUILDING_ATC_TOWER_ORIGIN_Y = 20,
+
+ BUILDING_ATC_LOC_ORIGIN_X = 6,
+ BUILDING_ATC_LOC_ORIGIN_Y = 32
};
static const struct
@@ -521,7 +529,7 @@ void MainWindow::addBuilding(quint8 CurrentBuilding, const int i, const int j) BUILDING_DATA(BUILDING_HANGAR),
BUILDING_DATA(BUILDING_ILS),
BUILDING_DATA(BUILDING_ATC_TOWER),
- NODATA,
+ BUILDING_DATA(BUILDING_ATC_LOC),
BUILDING_DATA(BUILDING_TERMINAL),
BUILDING_DATA(BUILDING_TERMINAL_2),
BUILDING_DATA(BUILDING_GATE)
@@ -575,6 +583,11 @@ void MainWindow::addBuilding(quint8 CurrentBuilding, const int i, const int j) cropped = cropped.convertToFormat(QImage::Format_ARGB32); // or maybe other format
+ if (CurrentBuilding & TILE_MIRROR_FLAG)
+ {
+ cropped = cropped.mirrored(true, false);
+ }
+
for (int i = 0; i < cropped.width(); i++)
{
for (int j = 0; j < cropped.height(); j++)
diff --git a/Source/MapEditor/settings.ini b/Source/MapEditor/settings.ini index f1b65ed..99bbfbc 100644 --- a/Source/MapEditor/settings.ini +++ b/Source/MapEditor/settings.ini @@ -1,3 +1,3 @@ [app_settings] -last_dir=/home/xavier/Airport/Levels/LEVEL2.LVL +last_dir=/home/xavier/Airport/Levels/LEVEL18.LVL window_geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x5U\0\0\x2\xdb\0\0\0\xa5\0\0\0\x1d\0\0\x4<\0\0\x2\xa4\0\0\0\0\x2\0\0\0\x5V\0\0\0\0\0\0\0\x1d\0\0\x5U\0\0\x2\xdb) |