diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-06-11 13:58:33 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-06-11 13:58:33 +0200 |
| commit | d1f55e8b45df2dfd84bdde3e2566ef14c9ba40f1 (patch) | |
| tree | 1b6f25f6dfecbbd94b7b9db271dea7cde8ea6221 /Source | |
| parent | 022c72fe369da0045f9ca7dd4b8d4d7dd169c87c (diff) | |
| download | airport-d1f55e8b45df2dfd84bdde3e2566ef14c9ba40f1.tar.gz | |
* Tried to get some work done in MapEditor with no success so far.
* Timers with no repeat flag were being set to NULL, but this is not actually desired!
* Reenabled transparency for aircraft shadow.
* Deprecated NotificationRequest flags, and replaced by system timer handling.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Aircraft.c | 19 | ||||
| -rw-r--r-- | Source/Game.c | 12 | ||||
| -rw-r--r-- | Source/GameGui.c | 110 | ||||
| -rw-r--r-- | Source/GameGui.h | 1 | ||||
| -rw-r--r-- | Source/GameStructures.h | 1 | ||||
| -rw-r--r-- | Source/MapEditor/Makefile | 72 | ||||
| -rw-r--r-- | Source/MapEditor/Makefile.Debug | 200 | ||||
| -rw-r--r-- | Source/MapEditor/Makefile.Release | 206 | ||||
| -rw-r--r-- | Source/MapEditor/MapEditor.pro | 3 | ||||
| -rw-r--r-- | Source/MapEditor/MapEditor.pro.user | 4 | ||||
| -rw-r--r-- | Source/MapEditor/mainwindow.cpp | 20 | ||||
| -rw-r--r-- | Source/MapEditor/mainwindow.h | 1 | ||||
| -rw-r--r-- | Source/MapEditor/mainwindow.ui | 13 | ||||
| -rw-r--r-- | Source/MapEditor/ui_mainwindow.h | 15 | ||||
| -rw-r--r-- | Source/Menu.c | 4 | ||||
| -rw-r--r-- | Source/PltParser.c | 2 | ||||
| -rw-r--r-- | Source/System.c | 8 |
17 files changed, 556 insertions, 135 deletions
diff --git a/Source/Aircraft.c b/Source/Aircraft.c index 97ee1be..6e3a4ec 100644 --- a/Source/Aircraft.c +++ b/Source/Aircraft.c @@ -325,7 +325,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer) AircraftSpr.g = 0;
AircraftSpr.b = 0;
- //AircraftSpr.attribute |= ENABLE_TRANS | TRANS_MODE(0);
+ AircraftSpr.attribute |= ENABLE_TRANS | TRANS_MODE(0);
GfxSortSprite(&AircraftSpr);
}
@@ -336,7 +336,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer) AircraftSpr.x = cartPos.x - (AircraftSpr.w >> 1);
AircraftSpr.y = cartPos.y - (AircraftSpr.h >> 1);
- //AircraftSpr.attribute &= ~(ENABLE_TRANS | TRANS_MODE(0));
+ AircraftSpr.attribute &= ~(ENABLE_TRANS | TRANS_MODE(0));
CameraApplyCoordinatesToSprite(ptrPlayer, &AircraftSpr);
@@ -643,3 +643,18 @@ bool AircraftCheckCollision(TYPE_AIRCRAFT_DATA* ptrRefAircraft, TYPE_AIRCRAFT_DA return false;
}
+
+void AircraftRenderFromTile(uint16_t tile)
+{
+ uint8_t i;
+
+ for(i = 0; i < GAME_MAX_AIRCRAFT; i++)
+ {
+ TYPE_AIRCRAFT_DATA* ptrAircraft = &AircraftData[i];
+
+ if(ptrAircraft->State != STATE_IDLE)
+ {
+
+ }
+ }
+}
diff --git a/Source/Game.c b/Source/Game.c index 4b642a6..5882c25 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -107,7 +107,7 @@ enum UNBOARDING_KEY_SEQUENCE_EASY = 4, UNBOARDING_KEY_SEQUENCE_MEDIUM = 6, UNBOARDING_KEY_SEQUENCE_HARD = GAME_MAX_SEQUENCE_KEYS, - UNBOARDING_PASSENGERS_PER_SEQUENCE = 50 + UNBOARDING_PASSENGERS_PER_SEQUENCE = 100 }; /* ************************************* @@ -837,7 +837,8 @@ void GameAircraftState(void) GameAircraftCreatedFlag = true; // Create notification request for incoming aircraft - FlightData.NotificationRequest[i] = true; + dprintf("1!!!!\n"); + GameGuiBubbleShow(); target[0] = FlightData.Parking[i]; @@ -857,8 +858,11 @@ void GameAircraftState(void) dprintf("Flight %d set to STATE_APPROACH.\n", i); FlightData.State[i] = STATE_APPROACH; GameAircraftCreatedFlag = true; + + dprintf("2!!!!\n"); + // Create notification request for incoming aircraft - FlightData.NotificationRequest[i] = true; + GameGuiBubbleShow(); } } @@ -2269,6 +2273,7 @@ void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData else { // Flight has finished. Remove aircraft and set finished flag + ptrPlayer->Unboarding = false; GameRemoveFlight(ptrPlayer->FlightDataSelectedAircraft, true); } @@ -2498,7 +2503,6 @@ void GameRemoveFlight(uint8_t idx, bool successful) dprintf("Player two\n"); } - ptrPlayer->Unboarding = false; memset(ptrPlayer->UnboardingSequence, 0, GAME_MAX_SEQUENCE_KEYS); ptrPlayer->UnboardingSequenceIdx = 0; diff --git a/Source/GameGui.c b/Source/GameGui.c index c69747a..b8b1261 100644 --- a/Source/GameGui.c +++ b/Source/GameGui.c @@ -180,6 +180,8 @@ enum static void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData);
static void GameGuiClearPassengersLeft(void);
+static void GameGuiBubbleStop(void);
+static void GameGuiBubbleStopVibration(void);
/* **************************************
* Local variables *
@@ -193,6 +195,8 @@ static GsGPoly4 PauseRect; static GsSprite SecondDisplay;
static TYPE_TIMER* ShowAircraftPassengersTimer;
static bool GameGuiClearPassengersLeft_Flag;
+static bool GameGuiBubbleShowFlag;
+static bool GameGuiBubbleVibrationFlag;
static char* GameFileList[] = {"cdrom:\\DATA\\SPRITES\\BUBBLE.TIM;1" ,
"cdrom:\\DATA\\FONTS\\FONT_1.FNT;1" ,
@@ -267,6 +271,8 @@ void GameGuiInit(void) ArrowsSpr.h = AIRCRAFT_DATA_FLIGHT_ARROWS_SIZE;
slowScore = 0;
+
+ GameGuiBubbleShowFlag = false;
}
bool GameGuiPauseDialog(TYPE_PLAYER* ptrPlayer)
@@ -577,64 +583,62 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData }
-void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData)
+void GameGuiBubbleShow(void)
{
- uint8_t i;
- static uint16_t BubbleVibrationTimer;
- static uint8_t FirstNotification;
- bool AtLeastOneEnabled = false;
-
- if(GameStartupFlag == true)
+ static TYPE_TIMER* GameGuiBubbleTimer = NULL;
+
+ if(GameGuiBubbleTimer == NULL)
{
- // Set initial values to static variables
- BubbleVibrationTimer = 0;
- FirstNotification = 0;
+ dprintf("Started GameGuiBubbleTimer...\n");
+ GameGuiBubbleTimer = SystemCreateTimer(50, false, &GameGuiBubbleStop);
}
-
- for(i = FirstNotification ; i < ptrFlightData->nAircraft ; i++)
+ else
+ {
+ SystemTimerRestart(GameGuiBubbleTimer);
+ }
+
+ GameGuiBubbleShowFlag = true;
+ GameGuiBubbleVibrationFlag = true;
+}
+
+void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData)
+{
+ static bool GameGuiBubbleShowFlagOld;
+
+ if(GameGuiBubbleShowFlag == true)
{
- if(ptrFlightData->NotificationRequest[i] != 0)
+ static TYPE_TIMER* GameGuiBubbleVibrationTimer = NULL;
+
+ if(GameGuiBubbleShowFlagOld == false)
{
- AtLeastOneEnabled = true;
-
- BubbleSpr.x = BUBBLE_SPRITE_X;
- BubbleSpr.y = BUBBLE_SPRITE_Y;
-
- if(BubbleVibrationTimer >= BUBBLE_VIBRATION_TIMER_LIMIT)
+ if(GameGuiBubbleVibrationTimer == NULL)
{
- // Reset timer and notification request for current aircraft
- if(ptrFlightData->NotificationRequest[i] == 0)
- {
- FirstNotification = 0;
- BubbleVibrationTimer = 0;
- }
+ dprintf("Started GameGuiBubbleVibrationTimer...\n");
+ GameGuiBubbleVibrationTimer = SystemCreateTimer(20, false, &GameGuiBubbleStopVibration);
}
else
{
- BubbleSpr.x += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX);
- BubbleSpr.y += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX);
-
- // Keep information about last aircraft notified...
- // so that it gets called on next cycle
- FirstNotification = i;
- BubbleVibrationTimer++;
+ SystemTimerRestart(GameGuiBubbleVibrationTimer);
}
-
- GfxSortSprite(&BubbleSpr);
- FontSetFlags(&SmallFont, FONT_CENTERED);
- FontPrintText(&SmallFont,BubbleSpr.x + 8 , BubbleSpr.y + 2, "%d", ptrFlightData->ActiveAircraft);
-
- GfxDrawButton(NOTIFICATION_BUTTON_X, NOTIFICATION_BUTTON_Y, PAD_CIRCLE);
- break;
}
+
+ BubbleSpr.x = BUBBLE_SPRITE_X;
+ BubbleSpr.y = BUBBLE_SPRITE_Y;
+
+ if(GameGuiBubbleVibrationFlag == true)
+ {
+ BubbleSpr.x += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX);
+ BubbleSpr.y += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX);
+ }
+
+ GfxSortSprite(&BubbleSpr);
+ FontSetFlags(&SmallFont, FONT_CENTERED);
+ FontPrintText(&SmallFont,BubbleSpr.x + 8 , BubbleSpr.y + 2, "%d", ptrFlightData->ActiveAircraft);
+
+ GfxDrawButton(NOTIFICATION_BUTTON_X, NOTIFICATION_BUTTON_Y, PAD_CIRCLE);
}
-
- if(AtLeastOneEnabled == false)
- {
- FirstNotification = 0;
- BubbleVibrationTimer = 0;
- }
- //dprintf("Bubble timer: %d\n",BubbleVibrationTimer);
+
+ GameGuiBubbleShowFlagOld = GameGuiBubbleShowFlag;
}
void GameGuiClock(uint8_t hour, uint8_t min)
@@ -825,7 +829,7 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight FontPrintText( &SmallFont,
AircraftDataRemainingTime_X,
AircraftDataRemainingTime_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j),
- "Time: %d sec.",
+ "%d sec.",
ptrFlightData->RemainingTime[ptrPlayer->ActiveAircraftList[i]] );
}
}
@@ -967,3 +971,15 @@ void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer) }while(ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) == false);
}
+
+void GameGuiBubbleStop(void)
+{
+ dprintf("GameGuiBubbleStop\n");
+ GameGuiBubbleShowFlag = false;
+}
+
+void GameGuiBubbleStopVibration(void)
+{
+ dprintf("GameGuiBubbleStopVibration\n");
+ GameGuiBubbleVibrationFlag = false;
+}
diff --git a/Source/GameGui.h b/Source/GameGui.h index 649522a..f2f1760 100644 --- a/Source/GameGui.h +++ b/Source/GameGui.h @@ -40,5 +40,6 @@ void GameGuiDrawUnboardingSequence(TYPE_PLAYER* ptrPlayer); void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData);
bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer);
void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer);
+void GameGuiBubbleShow(void);
#endif //__GAME_GUI_HEADER__
diff --git a/Source/GameStructures.h b/Source/GameStructures.h index faf5d38..e308531 100644 --- a/Source/GameStructures.h +++ b/Source/GameStructures.h @@ -88,7 +88,6 @@ typedef struct t_flightData uint8_t nRemainingAircraft;
uint8_t ActiveAircraft;
FL_STATE State[GAME_MAX_AIRCRAFT];
- bool NotificationRequest[GAME_MAX_AIRCRAFT];
bool Finished[GAME_MAX_AIRCRAFT];
}TYPE_FLIGHT_DATA;
diff --git a/Source/MapEditor/Makefile b/Source/MapEditor/Makefile index fb5d1b1..6a9b2b2 100644 --- a/Source/MapEditor/Makefile +++ b/Source/MapEditor/Makefile @@ -3,14 +3,14 @@ # Generated by qmake (3.0) (Qt 5.7.0)
# Project: MapEditor.pro
# Template: app
-# Command: C:\Qt\5.7\mingw53_32\bin\qmake.exe -spec win32-g++ "CONFIG+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro
+# Command: C:\Qt\5.7\mingw53_32\bin\qmake.exe -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro
#############################################################################
MAKEFILE = Makefile
-first: release
-install: release-install
-uninstall: release-uninstall
+first: debug
+install: debug-install
+uninstall: debug-uninstall
QMAKE = C:\Qt\5.7\mingw53_32\bin\qmake.exe
DEL_FILE = del
CHK_DIR_EXISTS= if not exist
@@ -26,24 +26,10 @@ SYMLINK = $(QMAKE) -install ln -f -s DEL_DIR = rmdir
MOVE = move
SUBTARGETS = \
- release \
- debug
+ debug \
+ release
-release: FORCE
- $(MAKE) -f $(MAKEFILE).Release
-release-make_first: FORCE
- $(MAKE) -f $(MAKEFILE).Release
-release-all: FORCE
- $(MAKE) -f $(MAKEFILE).Release all
-release-clean: FORCE
- $(MAKE) -f $(MAKEFILE).Release clean
-release-distclean: FORCE
- $(MAKE) -f $(MAKEFILE).Release distclean
-release-install: FORCE
- $(MAKE) -f $(MAKEFILE).Release install
-release-uninstall: FORCE
- $(MAKE) -f $(MAKEFILE).Release uninstall
debug: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: FORCE
@@ -58,6 +44,20 @@ debug-install: FORCE $(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall
+release: FORCE
+ $(MAKE) -f $(MAKEFILE).Release
+release-make_first: FORCE
+ $(MAKE) -f $(MAKEFILE).Release
+release-all: FORCE
+ $(MAKE) -f $(MAKEFILE).Release all
+release-clean: FORCE
+ $(MAKE) -f $(MAKEFILE).Release clean
+release-distclean: FORCE
+ $(MAKE) -f $(MAKEFILE).Release distclean
+release-install: FORCE
+ $(MAKE) -f $(MAKEFILE).Release install
+release-uninstall: FORCE
+ $(MAKE) -f $(MAKEFILE).Release uninstall
Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/5.7/mingw53_32/mkspecs/features/spec_pre.prf \
C:/Qt/5.7/mingw53_32/mkspecs/qdevice.pri \
@@ -176,6 +176,7 @@ Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/ C:/Qt/5.7/mingw53_32/mkspecs/features/win32/qt_config.prf \
C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf \
C:/Qt/5.7/mingw53_32/mkspecs/features/spec_post.prf \
+ .qmake.stash \
C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds.prf \
C:/Qt/5.7/mingw53_32/mkspecs/features/default_pre.prf \
C:/Qt/5.7/mingw53_32/mkspecs/features/win32/default_pre.prf \
@@ -198,11 +199,11 @@ Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/ C:/Qt/5.7/mingw53_32/mkspecs/features/yacc.prf \
C:/Qt/5.7/mingw53_32/mkspecs/features/lex.prf \
MapEditor.pro \
- C:/Qt/5.7/mingw53_32/lib/qtmain.prl \
+ C:/Qt/5.7/mingw53_32/lib/qtmaind.prl \
C:/Qt/5.7/mingw53_32/lib/Qt5Widgets.prl \
C:/Qt/5.7/mingw53_32/lib/Qt5Gui.prl \
C:/Qt/5.7/mingw53_32/lib/Qt5Core.prl
- $(QMAKE) -spec win32-g++ "CONFIG+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro
+ $(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro
C:/Qt/5.7/mingw53_32/mkspecs/features/spec_pre.prf:
C:/Qt/5.7/mingw53_32/mkspecs/qdevice.pri:
C:/Qt/5.7/mingw53_32/mkspecs/features/device_config.prf:
@@ -320,6 +321,7 @@ C:/Qt/5.7/mingw53_32/mkspecs/features/qt_config.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/win32/qt_config.prf:
C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf:
C:/Qt/5.7/mingw53_32/mkspecs/features/spec_post.prf:
+.qmake.stash:
C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds.prf:
C:/Qt/5.7/mingw53_32/mkspecs/features/default_pre.prf:
C:/Qt/5.7/mingw53_32/mkspecs/features/win32/default_pre.prf:
@@ -342,38 +344,38 @@ C:/Qt/5.7/mingw53_32/mkspecs/features/exceptions.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/yacc.prf:
C:/Qt/5.7/mingw53_32/mkspecs/features/lex.prf:
MapEditor.pro:
-C:/Qt/5.7/mingw53_32/lib/qtmain.prl:
+C:/Qt/5.7/mingw53_32/lib/qtmaind.prl:
C:/Qt/5.7/mingw53_32/lib/Qt5Widgets.prl:
C:/Qt/5.7/mingw53_32/lib/Qt5Gui.prl:
C:/Qt/5.7/mingw53_32/lib/Qt5Core.prl:
qmake: FORCE
- @$(QMAKE) -spec win32-g++ "CONFIG+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro
+ @$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro
qmake_all: FORCE
-make_first: release-make_first debug-make_first FORCE
-all: release-all debug-all FORCE
-clean: release-clean debug-clean FORCE
-distclean: release-distclean debug-distclean FORCE
+make_first: debug-make_first release-make_first FORCE
+all: debug-all release-all FORCE
+clean: debug-clean release-clean FORCE
+distclean: debug-distclean release-distclean FORCE
-$(DEL_FILE) Makefile
-$(DEL_FILE) .qmake.stash
-release-mocclean:
- $(MAKE) -f $(MAKEFILE).Release mocclean
debug-mocclean:
$(MAKE) -f $(MAKEFILE).Debug mocclean
-mocclean: release-mocclean debug-mocclean
+release-mocclean:
+ $(MAKE) -f $(MAKEFILE).Release mocclean
+mocclean: debug-mocclean release-mocclean
-release-mocables:
- $(MAKE) -f $(MAKEFILE).Release mocables
debug-mocables:
$(MAKE) -f $(MAKEFILE).Debug mocables
-mocables: release-mocables debug-mocables
+release-mocables:
+ $(MAKE) -f $(MAKEFILE).Release mocables
+mocables: debug-mocables release-mocables
check: first
benchmark: first
FORCE:
-$(MAKEFILE).Release: Makefile
$(MAKEFILE).Debug: Makefile
+$(MAKEFILE).Release: Makefile
diff --git a/Source/MapEditor/Makefile.Debug b/Source/MapEditor/Makefile.Debug index 4159242..f58c42c 100644 --- a/Source/MapEditor/Makefile.Debug +++ b/Source/MapEditor/Makefile.Debug @@ -49,7 +49,7 @@ OBJECTS = debug/main.o \ debug/mainwindow.o \
debug/moc_mainwindow.o
-DIST = mainwindow.h main.cpp \
+DIST = ../../Sprites/Tileset1.bmp mainwindow.h main.cpp \
mainwindow.cpp
QMAKE_TARGET = MapEditor
DESTDIR = debug\ #avoid trailing-slash linebreak
@@ -65,7 +65,7 @@ $(DESTDIR_TARGET): ui_mainwindow.h $(OBJECTS) $(LINKER) $(LFLAGS) -o $(DESTDIR_TARGET) $(OBJECTS) $(LIBS)
qmake: FORCE
- @$(QMAKE) -spec win32-g++ "CONFIG+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile.Debug MapEditor.pro
+ @$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile.Debug MapEditor.pro
qmake_all: FORCE
@@ -195,6 +195,72 @@ debug/moc_mainwindow.cpp: C:/Qt/5.7/mingw53_32/include/QtWidgets/QMainWindow \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget \
mainwindow.h \
C:/Qt/5.7/mingw53_32/bin/moc.exe
C:\Qt\5.7\mingw53_32\bin\moc.exe $(DEFINES) -D__GNUC__ -DWIN32 -IC:/Qt/5.7/mingw53_32/mkspecs/win32-g++ -IC:/cygwin/home/Xavier/Airport/Source/MapEditor -IC:/Qt/5.7/mingw53_32/include -IC:/Qt/5.7/mingw53_32/include/QtWidgets -IC:/Qt/5.7/mingw53_32/include/QtGui -IC:/Qt/5.7/mingw53_32/include/QtANGLE -IC:/Qt/5.7/mingw53_32/include/QtCore -IC:/Qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include -IC:/Qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include-fixed -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++ -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/i686-w64-mingw32 -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/backward mainwindow.h -o debug\moc_mainwindow.cpp
@@ -321,13 +387,72 @@ debug/main.o: main.cpp mainwindow.h \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
- C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\main.o main.cpp
debug/mainwindow.o: mainwindow.cpp mainwindow.h \
@@ -431,7 +556,74 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
- ui_mainwindow.h
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget \
+ C:/Qt/5.7/mingw53_32/include/QtGui/QPainter \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsScene
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\mainwindow.o mainwindow.cpp
debug/moc_mainwindow.o: debug/moc_mainwindow.cpp
diff --git a/Source/MapEditor/Makefile.Release b/Source/MapEditor/Makefile.Release index 9b37a2b..22abb00 100644 --- a/Source/MapEditor/Makefile.Release +++ b/Source/MapEditor/Makefile.Release @@ -12,11 +12,11 @@ MAKEFILE = Makefile.Release CC = gcc
CXX = g++
DEFINES = -DUNICODE -DQT_QML_DEBUG -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_NEEDS_QMAIN
-CFLAGS = -pipe -fno-keep-inline-dllexport -O2 -g -Wall -Wextra $(DEFINES)
-CXXFLAGS = -pipe -fno-keep-inline-dllexport -std=gnu++11 -frtti -Wall -Wextra -fexceptions -mthreads $(DEFINES)
+CFLAGS = -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra $(DEFINES)
+CXXFLAGS = -pipe -fno-keep-inline-dllexport -O2 -std=gnu++11 -frtti -Wall -Wextra -fexceptions -mthreads $(DEFINES)
INCPATH = -I. -IC:\Qt\5.7\mingw53_32\include -IC:\Qt\5.7\mingw53_32\include\QtWidgets -IC:\Qt\5.7\mingw53_32\include\QtGui -IC:\Qt\5.7\mingw53_32\include\QtANGLE -IC:\Qt\5.7\mingw53_32\include\QtCore -Irelease -I. -IC:\Qt\5.7\mingw53_32\mkspecs\win32-g++
LINKER = g++
-LFLAGS = -Wl,-subsystem,windows -mthreads
+LFLAGS = -Wl,-s -Wl,-subsystem,windows -mthreads
LIBS = -lmingw32 -LC:\Qt\5.7\mingw53_32\lib C:\Qt\5.7\mingw53_32\lib\libqtmain.a -LC:\utils\postgresql\pgsql\lib -LC:\utils\my_sql\my_sql\lib -lshell32 C:\Qt\5.7\mingw53_32\lib\libQt5Widgets.a C:\Qt\5.7\mingw53_32\lib\libQt5Gui.a C:\Qt\5.7\mingw53_32\lib\libQt5Core.a
QMAKE = C:\Qt\5.7\mingw53_32\bin\qmake.exe
IDC = idc
@@ -49,7 +49,7 @@ OBJECTS = release/main.o \ release/mainwindow.o \
release/moc_mainwindow.o
-DIST = mainwindow.h main.cpp \
+DIST = ../../Sprites/Tileset1.bmp mainwindow.h main.cpp \
mainwindow.cpp
QMAKE_TARGET = MapEditor
DESTDIR = release\ #avoid trailing-slash linebreak
@@ -65,7 +65,7 @@ $(DESTDIR_TARGET): ui_mainwindow.h $(OBJECTS) $(LINKER) $(LFLAGS) -o $(DESTDIR_TARGET) $(OBJECTS) $(LIBS)
qmake: FORCE
- @$(QMAKE) -spec win32-g++ "CONFIG+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile.Release MapEditor.pro
+ @$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile.Release MapEditor.pro
qmake_all: FORCE
@@ -195,6 +195,72 @@ release/moc_mainwindow.cpp: C:/Qt/5.7/mingw53_32/include/QtWidgets/QMainWindow \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget \
mainwindow.h \
C:/Qt/5.7/mingw53_32/bin/moc.exe
C:\Qt\5.7\mingw53_32\bin\moc.exe $(DEFINES) -D__GNUC__ -DWIN32 -IC:/Qt/5.7/mingw53_32/mkspecs/win32-g++ -IC:/cygwin/home/Xavier/Airport/Source/MapEditor -IC:/Qt/5.7/mingw53_32/include -IC:/Qt/5.7/mingw53_32/include/QtWidgets -IC:/Qt/5.7/mingw53_32/include/QtGui -IC:/Qt/5.7/mingw53_32/include/QtANGLE -IC:/Qt/5.7/mingw53_32/include/QtCore -IC:/Qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include -IC:/Qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include-fixed -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++ -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/i686-w64-mingw32 -IC:/Qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/backward mainwindow.h -o release\moc_mainwindow.cpp
@@ -321,13 +387,72 @@ release/main.o: main.cpp mainwindow.h \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
- C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\main.o main.cpp
release/mainwindow.o: mainwindow.cpp mainwindow.h \
@@ -431,7 +556,74 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ C:/Qt/5.7/mingw53_32/include/QtGui/qtouchdevice.h \
C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabwidget.h \
C:/Qt/5.7/mingw53_32/include/QtGui/qicon.h \
- ui_mainwindow.h
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QFileDialog \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qfiledialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qdir.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qfileinfo.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdialog.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QSettings \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qsettings.h \
+ ui_mainwindow.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/QVariant \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QAction \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qaction.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qactiongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QApplication \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qcoreapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qeventloop.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qdesktopwidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qguiapplication.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qinputmethod.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QButtonGroup \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qbuttongroup.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsview.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpainter.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qtextoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qpen.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractscrollarea.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qframe.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgraphicsscene.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGridLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qgridlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qlayoutitem.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qboxlayout.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHBoxLayout \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QHeaderView \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qheaderview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemview.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qabstractitemmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qitemselectionmodel.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractitemdelegate.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyleoption.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractspinbox.h \
+ C:/Qt/5.7/mingw53_32/include/QtGui/qvalidator.h \
+ C:/Qt/5.7/mingw53_32/include/QtCore/qregularexpression.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractslider.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstyle.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtabbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qrubberband.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QMenuBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenubar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qmenu.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QPushButton \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qpushbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qabstractbutton.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QStatusBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qstatusbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QToolBar \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtoolbar.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QTreeWidget \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidget.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreeview.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/qtreewidgetitemiterator.h \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QWidget \
+ C:/Qt/5.7/mingw53_32/include/QtGui/QPainter \
+ C:/Qt/5.7/mingw53_32/include/QtWidgets/QGraphicsScene
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\mainwindow.o mainwindow.cpp
release/moc_mainwindow.o: release/moc_mainwindow.cpp
diff --git a/Source/MapEditor/MapEditor.pro b/Source/MapEditor/MapEditor.pro index 3f53ea1..8f56728 100644 --- a/Source/MapEditor/MapEditor.pro +++ b/Source/MapEditor/MapEditor.pro @@ -18,3 +18,6 @@ SOURCES += main.cpp\ HEADERS += mainwindow.h
FORMS += mainwindow.ui
+
+DISTFILES += \
+ ../../Sprites/Tileset1.bmp
diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user index fff8c7f..c9d463f 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.0.3, 2017-06-06T07:08:57. -->
+<!-- Written by QtCreator 4.0.3, 2017-06-11T04:34:23. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -62,7 +62,7 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 MinGW 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 MinGW 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.win32_mingw53_kit</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">2</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</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">
diff --git a/Source/MapEditor/mainwindow.cpp b/Source/MapEditor/mainwindow.cpp index 58c37f6..2632429 100644 --- a/Source/MapEditor/mainwindow.cpp +++ b/Source/MapEditor/mainwindow.cpp @@ -1,4 +1,6 @@ #include "mainwindow.h"
+#include <QPainter>
+#include <QGraphicsScene>
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -8,8 +10,6 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->LoadMap_Btn, SIGNAL(released()), this, SLOT(onLoadMap()));
- ui->openGLWidget->
-
appSettings();
}
@@ -34,7 +34,6 @@ void MainWindow::onLoadMap(void) QDataStream txt(&f);
-
}
bool MainWindow::checkFile(QFile& f)
@@ -55,6 +54,21 @@ bool MainWindow::checkFile(QFile& f) _last_dir = d.absolutePath();
+ QPixmap pix;
+
+ if(pix.load("C:\\cygwin\\home\\Xavier\\Airport\\Sprites\\Tileset1.bmp") == false)
+ {
+ qDebug() << "Error loading bitmap.";
+ }
+
+ QPainter p;
+
+ p.begin(&pix);
+
+ p.setWindow(ui->widget->geometry());
+
+ p.drawPixmap(ui->widget->x(), ui->widget->y(), pix);
+
return true;
}
diff --git a/Source/MapEditor/mainwindow.h b/Source/MapEditor/mainwindow.h index e8f80d6..b05c6f5 100644 --- a/Source/MapEditor/mainwindow.h +++ b/Source/MapEditor/mainwindow.h @@ -4,6 +4,7 @@ #include <QMainWindow>
#include <QFileDialog>
#include <QSettings>
+#include <QDebug>
#include "ui_mainwindow.h"
diff --git a/Source/MapEditor/mainwindow.ui b/Source/MapEditor/mainwindow.ui index 59d85a2..a23ee45 100644 --- a/Source/MapEditor/mainwindow.ui +++ b/Source/MapEditor/mainwindow.ui @@ -24,16 +24,6 @@ <bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="2" column="1">
- <widget class="QOpenGLWidget" name="openGLWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -79,6 +69,9 @@ </column>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QWidget" name="widget" native="true"/>
+ </item>
</layout>
</widget>
<widget class="QMenuBar" name="menuBar">
diff --git a/Source/MapEditor/ui_mainwindow.h b/Source/MapEditor/ui_mainwindow.h index 0e9c8f1..47ec5ac 100644 --- a/Source/MapEditor/ui_mainwindow.h +++ b/Source/MapEditor/ui_mainwindow.h @@ -18,7 +18,6 @@ #include <QtWidgets/QHeaderView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QOpenGLWidget>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QStatusBar>
#include <QtWidgets/QToolBar>
@@ -32,11 +31,11 @@ class Ui_MainWindow public:
QWidget *centralWidget;
QGridLayout *gridLayout;
- QOpenGLWidget *openGLWidget;
QHBoxLayout *horizontalLayout;
QPushButton *LoadMap_Btn;
QPushButton *SaveMap_Btn;
QTreeWidget *treeWidget;
+ QWidget *widget;
QMenuBar *menuBar;
QToolBar *mainToolBar;
QStatusBar *statusBar;
@@ -58,13 +57,6 @@ public: gridLayout->setSpacing(6);
gridLayout->setContentsMargins(11, 11, 11, 11);
gridLayout->setObjectName(QStringLiteral("gridLayout"));
- openGLWidget = new QOpenGLWidget(centralWidget);
- openGLWidget->setObjectName(QStringLiteral("openGLWidget"));
- sizePolicy.setHeightForWidth(openGLWidget->sizePolicy().hasHeightForWidth());
- openGLWidget->setSizePolicy(sizePolicy);
-
- gridLayout->addWidget(openGLWidget, 2, 1, 1, 1);
-
horizontalLayout = new QHBoxLayout();
horizontalLayout->setSpacing(6);
horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
@@ -94,6 +86,11 @@ public: gridLayout->addWidget(treeWidget, 2, 0, 1, 1);
+ widget = new QWidget(centralWidget);
+ widget->setObjectName(QStringLiteral("widget"));
+
+ gridLayout->addWidget(widget, 2, 1, 1, 1);
+
MainWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QStringLiteral("menuBar"));
diff --git a/Source/Menu.c b/Source/Menu.c index 5e6ac72..d83b92f 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -244,8 +244,6 @@ void MainMenuInit(void) PadAddCheat(&StackCheckCheat); - GfxSetGlobalLuminance(NORMAL_LUMINANCE); - LoadMenuEnd(); } @@ -258,6 +256,8 @@ void MainMenu(void) #ifndef NO_INTRO PSXSDKIntro(); #endif //PSXSDK_DEBUG + + GfxSetGlobalLuminance(NORMAL_LUMINANCE); while(1) { diff --git a/Source/PltParser.c b/Source/PltParser.c index 41e2da0..922dd36 100644 --- a/Source/PltParser.c +++ b/Source/PltParser.c @@ -224,7 +224,6 @@ bool PltParserLoadFile(char* strPath, TYPE_FLIGHT_DATA* ptrFlightData) } ptrFlightData->State[aircraftIndex] = STATE_IDLE; - ptrFlightData->NotificationRequest[aircraftIndex] = false; aircraftIndex++; } @@ -253,7 +252,6 @@ void PltParserResetBuffers(TYPE_FLIGHT_DATA* ptrFlightData) memset(ptrFlightData->Hours,0,GAME_MAX_AIRCRAFT); memset(ptrFlightData->Minutes,0,GAME_MAX_AIRCRAFT); memset(ptrFlightData->State,STATE_IDLE,GAME_MAX_AIRCRAFT); - memset(ptrFlightData->NotificationRequest,0,GAME_MAX_AIRCRAFT); memset(ptrFlightData->Parking,0,GAME_MAX_AIRCRAFT); memset(ptrFlightData->Finished,0,GAME_MAX_AIRCRAFT); } diff --git a/Source/System.c b/Source/System.c index 6645682..bd3c0c0 100644 --- a/Source/System.c +++ b/Source/System.c @@ -701,13 +701,6 @@ void SystemUserTimersHandler(void) { timer_array[i].time = timer_array[i].orig_time; } - else - { - // Clean timer data - timer_array[i].busy = false; - timer_array[i].orig_time = 0; - timer_array[i].Timeout_Callback = NULL; - } } } } @@ -729,6 +722,7 @@ void SystemUserTimersHandler(void) void SystemTimerRestart(TYPE_TIMER* timer) { timer->time = timer->orig_time; + dprintf("Time set to %d seconds, timer 0x%08X\n", timer->time, timer); } void SystemTimerRemove(TYPE_TIMER* timer) |