diff options
| author | Xavier ASUS <xavi92psx@gmail.com> | 2018-11-23 13:57:38 +0100 |
|---|---|---|
| committer | Xavier ASUS <xavi92psx@gmail.com> | 2018-11-23 13:57:38 +0100 |
| commit | 3b80f74ce10cfd7e55199dcb9a8c4b80598227d2 (patch) | |
| tree | 43d267ff02ef9c04b60305adead701de8c5a1fa5 | |
| parent | a923f153f906144de599024148fc868e234d06cd (diff) | |
Optimization flag changed from -Os to -O3 (seems to perform better FPS-wise).
Improved const-correctness and scope for some variables.
35 files changed, 3051 insertions, 672 deletions
diff --git a/Source/Aircraft.c b/Source/Aircraft.c index ac45555..6d7f45b 100644 --- a/Source/Aircraft.c +++ b/Source/Aircraft.c @@ -77,11 +77,11 @@ static const fix16_t AircraftSpeedsTable[] = { [AIRCRAFT_SPEED_IDLE] = 0, * Local prototypes
* *************************************/
-static void AircraftDirection(TYPE_AIRCRAFT_DATA* ptrAircraft);
+static void AircraftDirection(TYPE_AIRCRAFT_DATA* const ptrAircraft);
static AIRCRAFT_LIVERY AircraftLiveryFromFlightNumber(char* strFlightNumber);
-static void AircraftAttitude(TYPE_AIRCRAFT_DATA* ptrAircraft);
-static void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* ptrAircraft);
-static void AircraftSpeed(TYPE_AIRCRAFT_DATA* ptrAircraft);
+static void AircraftAttitude(TYPE_AIRCRAFT_DATA* const ptrAircraft);
+static void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* const ptrAircraft);
+static void AircraftSpeed(TYPE_AIRCRAFT_DATA* const ptrAircraft);
static bool AircraftCheckCollision(TYPE_AIRCRAFT_DATA* ptrRefAircraft, TYPE_AIRCRAFT_DATA* ptrOtherAircraft);
static bool AircraftCheckPath(TYPE_AIRCRAFT_DATA* ptrAicraft, TYPE_AIRCRAFT_DATA* ptrOtherAircraft);
@@ -115,7 +115,7 @@ void AircraftInit(void) AIRCRAFT_INVALID_IDX,
sizeof (AircraftFlightDataIdx_HashTable) );
- if (firstLoad != false)
+ if (firstLoad)
{
firstLoad = false;
@@ -126,12 +126,12 @@ void AircraftInit(void) }
}
-bool AircraftAddNew( TYPE_FLIGHT_DATA* ptrFlightData,
+bool AircraftAddNew( TYPE_FLIGHT_DATA* const ptrFlightData,
uint8_t FlightDataIndex,
uint16_t* targets,
DIRECTION direction )
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = &AircraftData[AircraftIndex];
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = &AircraftData[AircraftIndex];
uint8_t level_columns = GameGetLevelColumns();
uint8_t i;
@@ -253,7 +253,7 @@ AIRCRAFT_LIVERY AircraftLiveryFromFlightNumber(char* strFlightNumber) bool AircraftRemove(uint8_t aircraftIdx)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = AircraftFromFlightDataIndex(aircraftIdx);
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = AircraftFromFlightDataIndex(aircraftIdx);
if (ptrAircraft->State != STATE_IDLE)
{
@@ -274,71 +274,70 @@ void AircraftHandler(void) for (i = 0; i < GAME_MAX_AIRCRAFT; i++)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = &AircraftData[i];
- uint8_t j;
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = &AircraftData[i];
bool collision_warning = false;
- if (ptrAircraft->State == STATE_IDLE)
+ if (ptrAircraft->State != STATE_IDLE)
{
- continue;
- }
-
- AircraftDirection(ptrAircraft);
- AircraftAttitude(ptrAircraft);
- AircraftSpeed(ptrAircraft);
+ uint8_t j;
- // Check collision against all other aircraft.
- for (j = 0; j < GAME_MAX_AIRCRAFT; j++)
- {
- TYPE_AIRCRAFT_DATA* ptrOtherAircraft = &AircraftData[j];
+ AircraftDirection(ptrAircraft);
+ AircraftAttitude(ptrAircraft);
+ AircraftSpeed(ptrAircraft);
- if (ptrOtherAircraft->State == STATE_IDLE)
+ // Check collision against all other aircraft.
+ for (j = 0; j < GAME_MAX_AIRCRAFT; j++)
{
- continue;
- }
+ TYPE_AIRCRAFT_DATA* ptrOtherAircraft = &AircraftData[j];
- if (i == j)
- {
- continue;
- }
- else
- {
- // Check whether aircraft should stop in order to avoid collision against
- // other aircraft.
- // WARNING: only STATE_TAXIING can be used to automatically stop an aircraft
- // when calling GameStopFlight() or GameResumeFlightFromAutoStop().
- collision_warning |= AircraftCheckPath(ptrAircraft, ptrOtherAircraft);
- }
+ if (ptrOtherAircraft->State == STATE_IDLE)
+ {
+ continue;
+ }
- if (j > i)
- {
- if (AircraftCheckCollision(ptrAircraft, ptrOtherAircraft) != false)
+ if (i == j)
+ {
+ continue;
+ }
+ else
+ {
+ // Check whether aircraft should stop in order to avoid collision against
+ // other aircraft.
+ // WARNING: only STATE_TAXIING can be used to automatically stop an aircraft
+ // when calling GameStopFlight() or GameResumeFlightFromAutoStop().
+ collision_warning |= AircraftCheckPath(ptrAircraft, ptrOtherAircraft);
+ }
+
+ if (j > i)
+ {
+ if (AircraftCheckCollision(ptrAircraft, ptrOtherAircraft))
+ {
+ GameAircraftCollision(ptrAircraft->FlightDataIdx);
+ break;
+ }
+ }
+ else
{
- GameAircraftCollision(ptrAircraft->FlightDataIdx);
- break;
+ // Collision already calculated.
}
+
+ }
+
+ if (collision_warning)
+ {
+ GameStopFlight(ptrAircraft->FlightDataIdx);
}
else
{
- // Collision already calculated.
+ GameResumeFlightFromAutoStop(ptrAircraft->FlightDataIdx);
}
+ ptrAircraft->State = GameGetFlightDataStateFromIdx(ptrAircraft->FlightDataIdx);
}
-
- if (collision_warning != false)
- {
- GameStopFlight(ptrAircraft->FlightDataIdx);
- }
- else
- {
- GameResumeFlightFromAutoStop(ptrAircraft->FlightDataIdx);
- }
-
- ptrAircraft->State = GameGetFlightDataStateFromIdx(ptrAircraft->FlightDataIdx);
}
}
-bool AircraftCheckPath(TYPE_AIRCRAFT_DATA* ptrAircraft, TYPE_AIRCRAFT_DATA* ptrOtherAircraft)
+bool AircraftCheckPath(TYPE_AIRCRAFT_DATA* const ptrAircraft, TYPE_AIRCRAFT_DATA* ptrOtherAircraft)
{
uint16_t currentTile = AircraftGetTileFromFlightDataIndex(ptrAircraft->FlightDataIdx);
uint16_t nextTile = 0; // Keep compiler happy
@@ -383,7 +382,7 @@ bool AircraftCheckPath(TYPE_AIRCRAFT_DATA* ptrAircraft, TYPE_AIRCRAFT_DATA* ptrO return false;
}
-void AircraftSpeed(TYPE_AIRCRAFT_DATA* ptrAircraft)
+void AircraftSpeed(TYPE_AIRCRAFT_DATA* const ptrAircraft)
{
switch(ptrAircraft->State)
{
@@ -423,9 +422,9 @@ void AircraftSpeed(TYPE_AIRCRAFT_DATA* ptrAircraft) }
}
-void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx)
+void AircraftRender(TYPE_PLAYER* const ptrPlayer, uint8_t aircraftIdx)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = AircraftFromFlightDataIndex(aircraftIdx);
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = AircraftFromFlightDataIndex(aircraftIdx);
TYPE_CARTESIAN_POS cartPos;
TYPE_ISOMETRIC_FIX16_POS shadowIsoPos;
TYPE_CARTESIAN_POS shadowCartPos;
@@ -479,7 +478,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx) if ( (ptrPlayer->FlightDataSelectedAircraft == aircraftIdx)
&&
- (ptrPlayer->ShowAircraftData != false) )
+ (ptrPlayer->ShowAircraftData) )
{
static uint8_t aircraft_sine;
static bool aircraft_sine_decrease;
@@ -543,7 +542,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx) showUPDNArrow = true;
}
- if (showLRArrow != false)
+ if (showLRArrow)
{
LeftRightArrowSpr.y = AircraftSpr.y;
@@ -559,7 +558,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx) GfxSortSprite(&LeftRightArrowSpr);
}
- else if (showUPDNArrow != false)
+ else if (showUPDNArrow)
{
UpDownArrowSpr.x = AircraftSpr.x;
@@ -588,7 +587,7 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx) GfxSortSprite(&AircraftSpr);
}
-void AircraftDirection(TYPE_AIRCRAFT_DATA* ptrAircraft)
+void AircraftDirection(TYPE_AIRCRAFT_DATA* const ptrAircraft)
{
TYPE_ISOMETRIC_FIX16_POS targetPos;
@@ -668,7 +667,7 @@ void AircraftDirection(TYPE_AIRCRAFT_DATA* ptrAircraft) }
}
- if (ptrAircraft->TargetReached != false)
+ if (ptrAircraft->TargetReached)
{
ptrAircraft->IsoPos.x = targetPos.x;
ptrAircraft->IsoPos.y = targetPos.y;
@@ -720,7 +719,7 @@ void AircraftDirection(TYPE_AIRCRAFT_DATA* ptrAircraft) }
}
-void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* ptrAircraft)
+void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* const ptrAircraft)
{
switch(ptrAircraft->Livery)
{
@@ -768,7 +767,7 @@ void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* ptrAircraft) }
}
-void AircraftAttitude(TYPE_AIRCRAFT_DATA* ptrAircraft)
+void AircraftAttitude(TYPE_AIRCRAFT_DATA* const ptrAircraft)
{
if (ptrAircraft->State == STATE_FINAL)
{
@@ -793,7 +792,7 @@ TYPE_ISOMETRIC_POS AircraftGetIsoPos(uint8_t FlightDataIdx) return retIsoPos;
}
-void AircraftAddTargets(TYPE_AIRCRAFT_DATA* ptrAircraft, uint16_t* targets)
+void AircraftAddTargets(TYPE_AIRCRAFT_DATA* const ptrAircraft, uint16_t* targets)
{
memcpy(ptrAircraft->Target, targets, sizeof (uint16_t) * AIRCRAFT_MAX_TARGETS);
ptrAircraft->TargetIdx = 0;
@@ -837,30 +836,45 @@ void AircraftFromFlightDataIndexAddTargets(uint8_t index, uint16_t* targets) AircraftAddTargets(AircraftFromFlightDataIndex(index), targets);
}
-DIRECTION AircraftGetDirection(TYPE_AIRCRAFT_DATA* ptrAircraft)
+DIRECTION AircraftGetDirection(TYPE_AIRCRAFT_DATA* const ptrAircraft)
{
return ptrAircraft->Direction;
}
uint16_t* AircraftGetTargets(uint8_t index)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = AircraftFromFlightDataIndex(index);
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = AircraftFromFlightDataIndex(index);
- return ptrAircraft->Target;
+ if (ptrAircraft != NULL)
+ {
+ return ptrAircraft->Target;
+ }
+
+ return NULL;
}
uint8_t AircraftGetTargetIdx(uint8_t index)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = AircraftFromFlightDataIndex(index);
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = AircraftFromFlightDataIndex(index);
+
+ if (ptrAircraft != NULL)
+ {
+ return ptrAircraft->TargetIdx;
+ }
- return ptrAircraft->TargetIdx;
+ return 0;
}
bool AircraftMoving(uint8_t index)
{
- TYPE_AIRCRAFT_DATA* ptrAircraft = AircraftFromFlightDataIndex(index);
+ TYPE_AIRCRAFT_DATA* const ptrAircraft = AircraftFromFlightDataIndex(index);
- return (bool)ptrAircraft->Speed;
+ if (ptrAircraft != NULL)
+ {
+ return (bool)ptrAircraft->Speed;
+ }
+
+ return false;
}
bool AircraftCheckCollision(TYPE_AIRCRAFT_DATA* ptrRefAircraft, TYPE_AIRCRAFT_DATA* ptrOtherAircraft)
diff --git a/Source/Aircraft.h b/Source/Aircraft.h index c9add38..a4a4be5 100644 --- a/Source/Aircraft.h +++ b/Source/Aircraft.h @@ -14,18 +14,18 @@ void AircraftInit(void);
void AircraftHandler(void);
-void AircraftRender(TYPE_PLAYER* ptrPlayer, uint8_t aircraftIdx);
+void AircraftRender(TYPE_PLAYER* const ptrPlayer, uint8_t aircraftIdx);
TYPE_AIRCRAFT_DATA* AircraftFromFlightDataIndex(uint8_t index);
void AircraftFromFlightDataIndexAddTargets(uint8_t index, uint16_t* targets);
-void AircraftAddTargets(TYPE_AIRCRAFT_DATA* ptrAircraft, uint16_t* targets);
+void AircraftAddTargets(TYPE_AIRCRAFT_DATA* const ptrAircraft, uint16_t* targets);
TYPE_ISOMETRIC_POS AircraftGetIsoPos(uint8_t FlightDataIdx);
uint16_t AircraftGetTileFromFlightDataIndex(uint8_t index);
bool AircraftRemove(uint8_t aircraftIdx);
uint16_t* AircraftGetTargets(uint8_t index);
bool AircraftMoving(uint8_t index);
uint8_t AircraftGetTargetIdx(uint8_t index);
-DIRECTION AircraftGetDirection(TYPE_AIRCRAFT_DATA* ptrAircraft);
-bool AircraftAddNew( TYPE_FLIGHT_DATA* ptrFlightData,
+DIRECTION AircraftGetDirection(TYPE_AIRCRAFT_DATA* const ptrAircraft);
+bool AircraftAddNew( TYPE_FLIGHT_DATA* const ptrFlightData,
uint8_t FlightDataIndex,
uint16_t* targets,
DIRECTION direction );
diff --git a/Source/Airport.geany b/Source/Airport.geany index 3ed4f91..b54567e 100644 --- a/Source/Airport.geany +++ b/Source/Airport.geany @@ -28,49 +28,49 @@ long_line_behaviour=1 long_line_column=120 [files] -current_page=7 -FILE_NAME_0=27415;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4 -FILE_NAME_1=5668;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4 -FILE_NAME_2=4610;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.c;0;4 +current_page=41 +FILE_NAME_0=4282;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4 +FILE_NAME_1=5298;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4 +FILE_NAME_2=4018;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.c;0;4 FILE_NAME_3=6782;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.c;0;4 -FILE_NAME_4=130127;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4 -FILE_NAME_5=44772;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4 -FILE_NAME_6=19837;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.c;0;4 -FILE_NAME_7=11503;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.c;0;4 +FILE_NAME_4=9763;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4 +FILE_NAME_5=32887;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4 +FILE_NAME_6=17638;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.c;0;4 +FILE_NAME_7=9154;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.c;0;4 FILE_NAME_8=746;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2Fmain.c;0;4 FILE_NAME_9=745;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMainMenuBtnAni.c;0;4 -FILE_NAME_10=30731;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMemCard.c;0;4 -FILE_NAME_11=23479;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMenu.c;0;4 -FILE_NAME_12=3922;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMessage.c;0;4 -FILE_NAME_13=11301;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPad.c;0;4 -FILE_NAME_14=11644;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.c;0;4 -FILE_NAME_15=10080;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPSXSDKIntro.c;0;4 -FILE_NAME_16=2238;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial.c;0;4 -FILE_NAME_17=2666;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.c;0;4 -FILE_NAME_18=32729;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.c;0;4 -FILE_NAME_19=3755;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.c;0;4 -FILE_NAME_20=1198;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.h;0;4 -FILE_NAME_21=871;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.h;0;4 +FILE_NAME_10=26018;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMemCard.c;0;4 +FILE_NAME_11=22534;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMenu.c;0;4 +FILE_NAME_12=1486;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMessage.c;0;4 +FILE_NAME_13=9847;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPad.c;0;4 +FILE_NAME_14=10669;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.c;0;4 +FILE_NAME_15=8394;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPSXSDKIntro.c;0;4 +FILE_NAME_16=1758;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial.c;0;4 +FILE_NAME_17=1221;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.c;0;4 +FILE_NAME_18=16275;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.c;0;4 +FILE_NAME_19=2698;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.c;0;4 +FILE_NAME_20=1055;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.h;0;4 +FILE_NAME_21=848;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.h;0;4 FILE_NAME_22=529;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.h;0;4 FILE_NAME_23=1133;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.h;0;4 -FILE_NAME_24=1598;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.h;0;4 -FILE_NAME_25=1830;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4 -FILE_NAME_26=7294;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4 +FILE_NAME_24=1633;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.h;0;4 +FILE_NAME_25=936;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4 +FILE_NAME_26=2185;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4 FILE_NAME_27=3564;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.h;0;4 -FILE_NAME_28=787;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGlobal_Inc.h;0;4 +FILE_NAME_28=406;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGlobal_Inc.h;0;4 FILE_NAME_29=514;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.h;0;4 FILE_NAME_30=559;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMainMenuBtnAni.h;0;4 FILE_NAME_31=4622;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMemCard.h;0;4 FILE_NAME_32=387;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMenu.h;0;4 FILE_NAME_33=439;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMessage.h;0;4 -FILE_NAME_34=1720;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPad.h;0;4 -FILE_NAME_35=750;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.h;0;4 +FILE_NAME_34=1550;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPad.h;0;4 +FILE_NAME_35=548;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.h;0;4 FILE_NAME_36=684;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPSXSDKIntro.h;0;4 FILE_NAME_37=752;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial.h;0;4 FILE_NAME_38=831;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.h;0;4 -FILE_NAME_39=3993;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.h;0;4 +FILE_NAME_39=421;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.h;0;4 FILE_NAME_40=1066;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.h;0;4 -FILE_NAME_41=3584;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4 +FILE_NAME_41=283;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4 [VTE] last_dir=/home/xavier/Airport/Bin diff --git a/Source/Camera.c b/Source/Camera.c index d9cd26e..984d856 100644 --- a/Source/Camera.c +++ b/Source/Camera.c @@ -24,10 +24,10 @@ static int32_t Camera_Max_Y_Offset; /* ************************************* * Local Prototypes * *************************************/ -static void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer); -static bool CameraSpecialConditions(TYPE_PLAYER* ptrPlayer); +static void CameraUpdateSpeed(TYPE_PLAYER* const ptrPlayer); +static bool CameraSpecialConditions(TYPE_PLAYER* const ptrPlayer); -void CameraInit(TYPE_PLAYER* ptrPlayer) +void CameraInit(TYPE_PLAYER* const ptrPlayer) { // Center camera on screen ptrPlayer->Camera.X_Offset = CAMERA_INITIAL_X_OFFSET; @@ -40,29 +40,29 @@ void CameraInit(TYPE_PLAYER* ptrPlayer) Camera_Max_Y_Offset = GameGetLevelColumns() * TILE_SIZE_H; } -void CameraApplyCoordinatesToSprite(TYPE_PLAYER* ptrPlayer, GsSprite* spr) +void CameraApplyCoordinatesToSprite(TYPE_PLAYER* const ptrPlayer, GsSprite* spr) { spr->x += (short)ptrPlayer->Camera.X_Offset; spr->y += (short)ptrPlayer->Camera.Y_Offset; } -void CameraApplyCoordinatesToRectangle(TYPE_PLAYER* ptrPlayer, GsRectangle* rect) +void CameraApplyCoordinatesToRectangle(TYPE_PLAYER* const ptrPlayer, GsRectangle* rect) { rect->x += (short)ptrPlayer->Camera.X_Offset; rect->y += (short)ptrPlayer->Camera.Y_Offset; } -void CameraApplyCoordinatesToCartesianPos(TYPE_PLAYER* ptrPlayer, TYPE_CARTESIAN_POS* pos) +void CameraApplyCoordinatesToCartesianPos(TYPE_PLAYER* const ptrPlayer, TYPE_CARTESIAN_POS* pos) { pos->x += (short)ptrPlayer->Camera.X_Offset; pos->y += (short)ptrPlayer->Camera.Y_Offset; } -void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer) +void CameraUpdateSpeed(TYPE_PLAYER* const ptrPlayer) { - if (ptrPlayer->PadDirectionKeyPressed_Callback() != false) + if (ptrPlayer->PadDirectionKeyPressed_Callback()) { - if (ptrPlayer->PadKeyPressed_Callback(PAD_LEFT) != false) + if (ptrPlayer->PadKeyPressed_Callback(PAD_LEFT)) { if (ptrPlayer->Camera.X_Speed < 0) { @@ -74,7 +74,7 @@ void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer) } } - if (ptrPlayer->PadKeyPressed_Callback(PAD_UP) != false) + if (ptrPlayer->PadKeyPressed_Callback(PAD_UP)) { if (ptrPlayer->Camera.Y_Speed < 0) { @@ -86,7 +86,7 @@ void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer) } } - if (ptrPlayer->PadKeyPressed_Callback(PAD_DOWN) != false) + if (ptrPlayer->PadKeyPressed_Callback(PAD_DOWN)) { if (ptrPlayer->Camera.Y_Speed > 0) { @@ -98,7 +98,7 @@ void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer) } } - if (ptrPlayer->PadKeyPressed_Callback(PAD_RIGHT) != false) + if (ptrPlayer->PadKeyPressed_Callback(PAD_RIGHT)) { if (ptrPlayer->Camera.X_Speed > 0) { @@ -140,9 +140,9 @@ void CameraUpdateSpeed(TYPE_PLAYER* ptrPlayer) } } -void CameraHandler(TYPE_PLAYER* ptrPlayer) +void CameraHandler(TYPE_PLAYER* const ptrPlayer) { - if (CameraSpecialConditions(ptrPlayer) != false) + if (CameraSpecialConditions(ptrPlayer)) { ptrPlayer->Camera.X_Speed = 0; ptrPlayer->Camera.Y_Speed = 0; @@ -166,11 +166,11 @@ void CameraHandler(TYPE_PLAYER* ptrPlayer) //DEBUG_PRINT_VAR(ptrPlayer->Camera.Y_Offset); } -bool CameraSpecialConditions(TYPE_PLAYER* ptrPlayer) +bool CameraSpecialConditions(TYPE_PLAYER* const ptrPlayer) { - if ( (ptrPlayer->ShowAircraftData != false) + if ( (ptrPlayer->ShowAircraftData) || - (ptrPlayer->SelectRunway != false) ) + (ptrPlayer->SelectRunway) ) { // Camera cannot be handled when these states are activated @@ -180,12 +180,12 @@ bool CameraSpecialConditions(TYPE_PLAYER* ptrPlayer) return false; } -TYPE_ISOMETRIC_POS CameraGetIsoPos(TYPE_PLAYER* ptrPlayer) +TYPE_ISOMETRIC_POS CameraGetIsoPos(TYPE_PLAYER* const ptrPlayer) { TYPE_ISOMETRIC_POS IsoPos; TYPE_CARTESIAN_POS CartPos; - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { CartPos.x = CAMERA_INITIAL_X_OFFSET_2PLAYER - ptrPlayer->Camera.X_Offset; CartPos.y = (Y_SCREEN_RESOLUTION >> 1) - ptrPlayer->Camera.Y_Offset; @@ -203,7 +203,7 @@ TYPE_ISOMETRIC_POS CameraGetIsoPos(TYPE_PLAYER* ptrPlayer) return IsoPos; } -void CameraMoveToIsoPos(TYPE_PLAYER* ptrPlayer, TYPE_ISOMETRIC_POS IsoPos) +void CameraMoveToIsoPos(TYPE_PLAYER* const ptrPlayer, TYPE_ISOMETRIC_POS IsoPos) { TYPE_CARTESIAN_POS CartPos = GfxIsometricToCartesian(&IsoPos); @@ -215,7 +215,7 @@ void CameraMoveToIsoPos(TYPE_PLAYER* ptrPlayer, TYPE_ISOMETRIC_POS IsoPos) CartPos.x, CartPos.y );*/ - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { ptrPlayer->Camera.X_Offset = CAMERA_INITIAL_X_OFFSET_2PLAYER - CartPos.x; ptrPlayer->Camera.Y_Offset = (Y_SCREEN_RESOLUTION >> 1) - CartPos.y; diff --git a/Source/Camera.h b/Source/Camera.h index d1b4d29..4f7d54b 100644 --- a/Source/Camera.h +++ b/Source/Camera.h @@ -13,12 +13,12 @@ /* ************************************* * Global prototypes * *************************************/ -void CameraInit(TYPE_PLAYER* ptrPlayer); -void CameraHandler(TYPE_PLAYER* ptrPlayer); -void CameraApplyCoordinatesToSprite(TYPE_PLAYER* ptrPlayer, GsSprite* spr); -void CameraApplyCoordinatesToRectangle(TYPE_PLAYER* ptrPlayer, GsRectangle* rect); -void CameraApplyCoordinatesToCartesianPos(TYPE_PLAYER* ptrPlayer, TYPE_CARTESIAN_POS* pos); -TYPE_ISOMETRIC_POS CameraGetIsoPos(TYPE_PLAYER* ptrPlayer); -void CameraMoveToIsoPos(TYPE_PLAYER* ptrPlayer, TYPE_ISOMETRIC_POS IsoPos); +void CameraInit(TYPE_PLAYER* const ptrPlayer); +void CameraHandler(TYPE_PLAYER* const ptrPlayer); +void CameraApplyCoordinatesToSprite(TYPE_PLAYER* const ptrPlayer, GsSprite* spr); +void CameraApplyCoordinatesToRectangle(TYPE_PLAYER* const ptrPlayer, GsRectangle* rect); +void CameraApplyCoordinatesToCartesianPos(TYPE_PLAYER* const ptrPlayer, TYPE_CARTESIAN_POS* pos); +TYPE_ISOMETRIC_POS CameraGetIsoPos(TYPE_PLAYER* const ptrPlayer); +void CameraMoveToIsoPos(TYPE_PLAYER* const ptrPlayer, TYPE_ISOMETRIC_POS IsoPos); #endif //CAM_HEADER__ diff --git a/Source/EndAnimation.c b/Source/EndAnimation.c index 21d23e3..640c6e3 100644 --- a/Source/EndAnimation.c +++ b/Source/EndAnimation.c @@ -141,7 +141,7 @@ void EndAnimationLine(void) rectIndex += END_ANIMATION_LINE_STEP; - }while (rectIndex <= (X_SCREEN_RESOLUTION >> 1) ); + } while (rectIndex <= (X_SCREEN_RESOLUTION >> 1) ); } @@ -177,7 +177,7 @@ void EndAnimationSquares(void) sqPos[randInd] = true; sqCounter--; - while (sqPos[maxIndex] != false) + while (sqPos[maxIndex]) { // Lower maximum value for rand() so that it's // easier to spot new empty index on next iteration. @@ -193,7 +193,7 @@ void EndAnimationSquares(void) break; } } - }while (1); + } while (1); GfxSortSprite(&EndAnimationDisplay); @@ -201,7 +201,7 @@ void EndAnimationSquares(void) { for (j = 0; j < END_ANIMATION_SQUARES_TOTAL ; j++) { - if (sqPos[j] != false) + if (sqPos[j]) { EndAnimationRect.x = ((j) << END_ANIMATION_SQUARES_SIZE_BITSHIFT) - (short)( (j / END_ANIMATION_SQUARES_PER_ROW) * diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf Binary files differindex fd31424..5ab6b0f 100755 --- a/Source/Exe/AIRPORT.elf +++ b/Source/Exe/AIRPORT.elf diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso Binary files differindex 501f9b2..a60294c 100644 --- a/Source/Exe/AIRPORT.iso +++ b/Source/Exe/AIRPORT.iso diff --git a/Source/Game.c b/Source/Game.c index 2a7f53b..beb4b89 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -31,7 +31,7 @@ #define LEVEL_MAGIC_NUMBER_SIZE 3 #define LEVEL_MAGIC_NUMBER_STRING "ATC" #define LEVEL_TITLE_SIZE 24 -#define TILE_MIRROR_FLAG ( (uint8_t)0x80 ) +#define TILE_MIRROR_FLAG (0x80) #define GAME_INVALID_TILE_SELECTION ( (uint16_t)0xFFFF ) @@ -156,49 +156,49 @@ enum * Local Prototypes * *************************************/ -static void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg); +static void GameInit(const TYPE_GAME_CONFIGURATION* const pGameCfg); static void GameInitTileUVTable(void); static bool GameExit(void); static void GameLoadLevel(const char* path); static bool GamePause(void); -static void GameFinished(uint8_t i); +static void GameFinished(const uint8_t i); static void GameEmergencyMode(void); static void GameCalculations(void); -static void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GamePlayerAddWaypoint(TYPE_PLAYER* ptrPlayer); -static void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* ptrPlayer, uint16_t tile); +static void GamePlayerHandler(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GamePlayerAddWaypoint(TYPE_PLAYER* const ptrPlayer); +static void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* const ptrPlayer, uint16_t tile); static void GameGraphics(void); -static void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer); -static void GameRenderTerrain(TYPE_PLAYER* ptrPlayer); +static void GameRenderTerrainPrecalculations(TYPE_PLAYER* const ptrPlayer); +static void GameRenderTerrain(TYPE_PLAYER* const ptrPlayer); static void GameClock(void); -static void GameClockFlights(uint8_t i); -static void GameAircraftState(uint8_t i); -static void GameActiveAircraft(uint8_t i); -static void GameStateShowAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameSelectAircraftFromList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* ptrPlayer); -static void GameSelectAircraftWaypoint(TYPE_PLAYER* ptrPlayer); +static void GameClockFlights(const uint8_t i); +static void GameAircraftState(const uint8_t i); +static void GameActiveAircraft(const uint8_t i); +static void GameStateShowAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameSelectAircraftFromList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameStateSelectRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameStateSelectTaxiwayRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameStateSelectTaxiwayParking(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameStateLockTarget(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* const ptrPlayer); +static void GameSelectAircraftWaypoint(TYPE_PLAYER* const ptrPlayer); static void GameGetRunwayArray(void); static void GameGetSelectedRunwayArray(uint16_t rwyHeader, uint16_t* rwyArray, size_t sz); -static void GameAssignRunwaytoAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameDrawMouse(TYPE_PLAYER* ptrPlayer); -static void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameGenerateUnboardingSequence(TYPE_PLAYER* ptrPlayer); -static void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData, uint8_t aircraftIdx); +static void GameAssignRunwaytoAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static bool GamePathToTile(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameDrawMouse(TYPE_PLAYER* const ptrPlayer); +static void GameStateUnboarding(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameGenerateUnboardingSequence(TYPE_PLAYER* const ptrPlayer); +static void GameCreateTakeoffWaypoints(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData, uint8_t aircraftIdx); static void GameGetRunwayEntryTile(uint8_t aircraftIdx, TYPE_RWY_ENTRY_DATA* ptrRwyEntry); -static void GameActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); -static void GameRemainingAircraft(uint8_t i); +static void GameActiveAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); +static void GameRemainingAircraft(const uint8_t i); static void GameMinimumSpawnTimeout(void); -static void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer); +static void GameRenderBuildingAircraft(TYPE_PLAYER* const ptrPlayer); static void GameBuildingsInit(void); -static void GameGetAircraftTilemap(uint8_t i); -static bool GameWaypointCheckExisting(TYPE_PLAYER* ptrPlayer, uint16_t temp_tile); -static void GameDrawBackground(TYPE_PLAYER* ptrPlayer); +static void GameGetAircraftTilemap(const uint8_t i); +static bool GameWaypointCheckExisting(TYPE_PLAYER* const ptrPlayer, uint16_t temp_tile); +static void GameDrawBackground(TYPE_PLAYER* const ptrPlayer); static DIRECTION GameGetRunwayDirection(uint16_t rwyHeader); static DIRECTION GameGetParkingDirection(uint16_t parkingTile); @@ -227,7 +227,7 @@ static uint16_t GameUsedRwy[GAME_MAX_RUNWAYS]; static uint16_t GameSelectedTile; static TYPE_TIMER* GameSpawnMinTime; static bool spawnMinTimeFlag; -static bool GameAircraftCreatedFlag; +static bool aircraftCreated; static bool GameAircraftCollisionFlag; static uint8_t GameAircraftCollisionIdx; static TYPE_BUILDING_DATA GameBuildingData[MAX_BUILDING_ID]; @@ -248,33 +248,39 @@ static SsVag BeepSnd; // Instances for player-specific data static TYPE_PLAYER PlayerData[MAX_PLAYERS]; -static const char* GameFileList[] = { "DATA\\SPRITES\\TILESET1.TIM" , - "DATA\\SPRITES\\GAMEPLN.TIM" , - "DATA\\SPRITES\\PLNBLUE.CLT" , - "DATA\\SPRITES\\MOUSE.TIM" , - "DATA\\SPRITES\\BLDNGS1.TIM" , - "DATA\\SOUNDS\\RCPW1A1.VAG" , - "DATA\\SOUNDS\\RCPM1A1.VAG" , - "DATA\\SOUNDS\\RCTM1F1.VAG" , - "DATA\\SOUNDS\\TAKEOFF1.VAG" , - "DATA\\SPRITES\\CITYBG1.TIM" , - "DATA\\SOUNDS\\BEEP.VAG" }; - -static void* GameFileDest[] = { &GameTilesetSpr , - &GamePlaneSpr , - NULL , // CLT files must use NULL pointers - &GameMouseSpr , - &GameBuildingSpr , - &ApproachSnds[SOUND_M1_INDEX] , - &ApproachSnds[SOUND_W1_INDEX] , - &TowerFinalSnds[SOUND_M1_INDEX] , - &TakeoffSnd , - &CityBg1Spr , - &BeepSnd }; +static const char* const GameFileList[] = +{ + "DATA\\SPRITES\\TILESET1.TIM", + "DATA\\SPRITES\\GAMEPLN.TIM", + "DATA\\SPRITES\\PLNBLUE.CLT", + "DATA\\SPRITES\\MOUSE.TIM", + "DATA\\SPRITES\\BLDNGS1.TIM", + "DATA\\SOUNDS\\RCPW1A1.VAG", + "DATA\\SOUNDS\\RCPM1A1.VAG", + "DATA\\SOUNDS\\RCTM1F1.VAG", + "DATA\\SOUNDS\\TAKEOFF1.VAG", + "DATA\\SPRITES\\CITYBG1.TIM", + "DATA\\SOUNDS\\BEEP.VAG" +}; + +static void* GameFileDest[] = +{ + &GameTilesetSpr, + &GamePlaneSpr, + NULL, // CLT files must use NULL pointers + &GameMouseSpr, + &GameBuildingSpr, + &ApproachSnds[SOUND_M1_INDEX], + &ApproachSnds[SOUND_W1_INDEX], + &TowerFinalSnds[SOUND_M1_INDEX], + &TakeoffSnd, + &CityBg1Spr, + &BeepSnd +}; static void* GamePltDest[] = {(TYPE_FLIGHT_DATA*)&FlightData }; -static uint16_t GameLevelBuffer[GAME_MAX_MAP_SIZE]; +static uint16_t levelBuffer[GAME_MAX_MAP_SIZE]; static uint8_t GameLevelColumns; static uint16_t GameLevelSize; @@ -286,10 +292,10 @@ static uint8_t GameHour; static uint8_t GameMinutes; //Local flag for two-player game mode. Obtained from Menu -static bool TwoPlayersActive; +static bool twoPlayers; // Determines whether game has finished or not. -bool GameFinishedFlag; +bool levelFinished; /* *************************************************************************************** * @@ -303,14 +309,14 @@ bool GameFinishedFlag; * @remarks: * * ***************************************************************************************/ -void Game(TYPE_GAME_CONFIGURATION* pGameCfg) +void Game(const TYPE_GAME_CONFIGURATION* const pGameCfg) { - TwoPlayersActive = pGameCfg->TwoPlayers; + twoPlayers = pGameCfg->TwoPlayers; GameInit(pGameCfg); while (1) { - if (GameExit() != false) + if (GameExit()) { break; } @@ -321,7 +327,7 @@ void Game(TYPE_GAME_CONFIGURATION* pGameCfg) GameGraphics(); - if (GameStartupFlag != false) + if (GameStartupFlag) { GameStartupFlag = false; } @@ -345,27 +351,24 @@ void Game(TYPE_GAME_CONFIGURATION* pGameCfg) * True if game has to be exitted, false otherwise. * * ***************************************************************************************/ -bool GameExit(void) +static bool GameExit(void) { - //Serial_printf("GameFinishedFlag...\n"); - if (GameFinishedFlag != false) + if (levelFinished) { // Exit game on level finished. - if (GameGuiFinishedDialog(&PlayerData[PLAYER_ONE]) != false) + if (GameGuiFinishedDialog(&PlayerData[PLAYER_ONE])) { return true; } } - //Serial_printf("GamePause...\n"); - if (GamePause() != false) + if (GamePause()) { // Exit game if player desires to exit. return true; } - //Serial_printf("GameAircraftCollisionFlag...\n"); - if (GameAircraftCollisionFlag != false) + if (GameAircraftCollisionFlag) { GameGuiAircraftCollision(&PlayerData[PLAYER_ONE]); return true; @@ -386,41 +389,35 @@ bool GameExit(void) * @remarks: * * ***************************************************************************************/ -bool GamePause(void) +static bool GamePause(void) { - const TYPE_PLAYER* ptrPlayer; uint8_t i; - bool pause_flag = false; - if (GameStartupFlag != false) + if (GameStartupFlag) { return false; } for (i = 0 ; i < MAX_PLAYERS ; i++) { - ptrPlayer = &PlayerData[i]; + const TYPE_PLAYER* const ptrPlayer = &PlayerData[i]; + // Run player-specific functions for each player - if (ptrPlayer->Active != false) + if (ptrPlayer->Active) { //Serial_printf("Released callback = 0x%08X\n", ptrPlayer->PadKeySinglePress_Callback); - if (ptrPlayer->PadKeySinglePress_Callback(PAD_START) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_START)) { Serial_printf("Player %d set pause_flag to true!\n",i); - pause_flag = true; - break; + + // Blocking function: + // * Returns true if player pointed to by ptrPlayer wants to exit game + // * Returns false if player pointed to by ptrPlayer wants to resume game + return GameGuiPauseDialog(ptrPlayer); } } } - if (pause_flag != false) - { - // Blocking function: - // * Returns true if player pointed to by ptrPlayer wants to exit game - // * Returns false if player pointed to by ptrPlayer wants to resume game - return GameGuiPauseDialog(ptrPlayer); - } - return false; } @@ -437,7 +434,7 @@ bool GamePause(void) * Tilesets and buildings are only loaded on first game. Then, only PLT is loaded. * * ***************************************************************************************/ -void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) +void GameInit(const TYPE_GAME_CONFIGURATION* const pGameCfg) { uint8_t i; uint32_t track; @@ -448,7 +445,7 @@ void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) // Has to be initialized before loading *.PLT files inside LoadMenu(). MessageInit(); - if (firstLoad != false) + if (firstLoad) { firstLoad = false; @@ -493,9 +490,9 @@ void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) memset(PlayerData[PLAYER_ONE].UnboardingSequence, 0, GAME_MAX_SEQUENCE_KEYS * sizeof (unsigned short) ); memset(PlayerData[PLAYER_ONE].TileData, 0, GAME_MAX_MAP_SIZE * sizeof (TYPE_TILE_DATA)); - PlayerData[PLAYER_TWO].Active = TwoPlayersActive? true : false; + PlayerData[PLAYER_TWO].Active = twoPlayers? true : false; - if (PlayerData[PLAYER_TWO].Active != false) + if (PlayerData[PLAYER_TWO].Active) { PlayerData[PLAYER_TWO].PadKeyPressed_Callback = &PadTwoKeyPressed; PlayerData[PLAYER_TWO].PadKeyReleased_Callback = &PadTwoKeyReleased; @@ -540,11 +537,11 @@ void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) PlayerData[i].LastWaypointIdx = 0; } - GameAircraftCreatedFlag = false; + aircraftCreated = false; GameAircraftCollisionFlag = false; GameAircraftCollisionIdx = 0; - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { GameMouseSpr.x = MOUSE_X_2PLAYER; GameMouseSpr.y = MOUSE_Y_2PLAYER; @@ -572,7 +569,7 @@ void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) GameSelectedTile = 0; - GameFinishedFlag = false; + levelFinished = false; GameInitTileUVTable(); @@ -601,7 +598,7 @@ void GameInit(TYPE_GAME_CONFIGURATION* pGameCfg) * * * ***************************************************************************************/ -void GameBuildingsInit(void) +static void GameBuildingsInit(void) { enum { @@ -776,7 +773,7 @@ void GameEmergencyMode(void) .g = ERROR_RECT_G, .b = ERROR_RECT_B }; - if (SystemGetEmergencyMode() != false) + if (SystemGetEmergencyMode()) { // One of the pads has been disconnected during gameplay // Show an error screen until it is disconnected again. @@ -800,9 +797,9 @@ void GameEmergencyMode(void) for (i = 0; i < MAX_PLAYERS; i++) { - TYPE_PLAYER* ptrPlayer = &PlayerData[i]; + TYPE_PLAYER* const ptrPlayer = &PlayerData[i]; - if (ptrPlayer->Active != false) + if (ptrPlayer->Active) { if (PadXConnected[i]() == false) { @@ -818,7 +815,7 @@ void GameEmergencyMode(void) SystemSetEmergencyMode(enabled); - }while (SystemGetEmergencyMode() != false); + } while (SystemGetEmergencyMode()); } /* *************************************************************************************** @@ -838,33 +835,29 @@ void GameEmergencyMode(void) * @remarks: * * ***************************************************************************************/ -void GameGetAircraftTilemap(uint8_t i) +static void GameGetAircraftTilemap(const uint8_t i) { - uint16_t tileNr; - uint8_t j; - if (i == 0) { memset(GameAircraftTilemap, FLIGHT_DATA_INVALID_IDX, sizeof (GameAircraftTilemap) ); } - if (FlightData.State[i] == STATE_IDLE) + if (FlightData.State[i] != STATE_IDLE) { - return; - } + const uint16_t tileNr = AircraftGetTileFromFlightDataIndex(i); - tileNr = AircraftGetTileFromFlightDataIndex(i); + uint8_t j; - for (j = 0; j < GAME_MAX_AIRCRAFT_PER_TILE; j++) - { - //DEBUG_PRINT_VAR(GameAircraftTilemap[tileNr][j]); - if (GameAircraftTilemap[tileNr][j] == FLIGHT_DATA_INVALID_IDX) + for (j = 0; j < GAME_MAX_AIRCRAFT_PER_TILE; j++) { - break; + if (GameAircraftTilemap[tileNr][j] == FLIGHT_DATA_INVALID_IDX) + { + break; + } } - } - GameAircraftTilemap[tileNr][j] = i; + GameAircraftTilemap[tileNr][j] = i; + } } /* *************************************************************************************** @@ -888,7 +881,9 @@ void GameCalculations(void) GameClock(); - // FlightData handling + // Set level finished flag. It will + // reset if at least one flight is still pending. + levelFinished = true; for (i = 0; i < FlightData.nAircraft; i++) { @@ -907,7 +902,7 @@ void GameCalculations(void) for (i = 0 ; i < MAX_PLAYERS ; i++) { // Run player-specific functions for each player - if (PlayerData[i].Active != false) + if (PlayerData[i].Active) { GamePlayerHandler(&PlayerData[i], &FlightData); } @@ -916,15 +911,15 @@ void GameCalculations(void) /* *************************************************************************************** * - * @name: void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GamePlayerHandler(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -934,7 +929,7 @@ void GameCalculations(void) * @remarks: * * ***************************************************************************************/ -void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GamePlayerHandler(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { ptrPlayer->SelectedTile = 0; // Reset selected tile if no states // which use this are currently active. @@ -944,13 +939,13 @@ void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) // to a incorrect instance. GameActiveAircraftList(ptrPlayer, ptrFlightData); - if (GameAircraftCollisionFlag != false) + if (GameAircraftCollisionFlag) { TYPE_ISOMETRIC_POS IsoPos = AircraftGetIsoPos(GameAircraftCollisionIdx); CameraMoveToIsoPos(ptrPlayer, IsoPos); } - if (System1SecondTick() != false) + if (System1SecondTick()) { GameGuiCalculateNextAircraftTime(ptrPlayer, ptrFlightData); } @@ -982,7 +977,7 @@ void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) void GameClock(void) { - if (System1SecondTick() != false) + if (System1SecondTick()) { GameMinutes++; @@ -1016,9 +1011,9 @@ void GameClock(void) * * *******************************************************************/ -void GameClockFlights(uint8_t i) +static void GameClockFlights(const uint8_t i) { - if (System1SecondTick() != false) + if (System1SecondTick()) { if ( (FlightData.Minutes[i] == 0) && @@ -1068,7 +1063,7 @@ void GameGraphics(void) // Caution: blocking function! MessageRender(); - if (TwoPlayersActive != false) + if (twoPlayers) { split_screen = true; } @@ -1081,11 +1076,11 @@ void GameGraphics(void) for (i = 0; i < MAX_PLAYERS ; i++) { - TYPE_PLAYER* ptrPlayer = &PlayerData[i]; + TYPE_PLAYER* const ptrPlayer = &PlayerData[i]; - if (ptrPlayer->Active != false) + if (ptrPlayer->Active) { - if (split_screen != false) + if (split_screen) { GfxSetSplitScreen(i); } @@ -1115,17 +1110,17 @@ void GameGraphics(void) GameGuiDrawUnboardingSequence(ptrPlayer); - if (split_screen != false) + if (split_screen) { //~ GfxDrawScene_NoSwap(); - //~ while (GsIsDrawing() != false); + //~ while (GsIsDrawing()); } } } // Avoid changing drawing environment twice on 1-player mode // as it doesn't make any sense. - if (split_screen != false) + if (split_screen) { GfxDisableSplitScreen(); } @@ -1138,7 +1133,7 @@ void GameGraphics(void) GameGuiShowScore(); - if (split_screen != false) + if (split_screen) { //~ GfxDrawScene_NoSwap(); } @@ -1160,7 +1155,7 @@ void GameGraphics(void) * * *******************************************************************/ -void GameDrawBackground(TYPE_PLAYER* ptrPlayer) +void GameDrawBackground(TYPE_PLAYER* const ptrPlayer) { enum { @@ -1245,12 +1240,12 @@ void GameDrawBackground(TYPE_PLAYER* ptrPlayer) /* ******************************************************************* * - * @name: void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) + * @name: void GameRenderBuildingAircraft(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to player data structure. * * @brief: @@ -1261,7 +1256,7 @@ void GameDrawBackground(TYPE_PLAYER* ptrPlayer) * * *******************************************************************/ -void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) +void GameRenderBuildingAircraft(TYPE_PLAYER* const ptrPlayer) { uint16_t tileNr; uint8_t rows = 0; @@ -1269,8 +1264,8 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) for (tileNr = 0; tileNr < GameLevelSize; tileNr++) { - // Building data is stored in GameLevelBuffer MSB. LSB is dedicated to tile data. - uint8_t CurrentBuilding = (uint8_t)(GameLevelBuffer[tileNr] >> 8); + // Building data is stored in levelBuffer MSB. LSB is dedicated to tile data. + uint8_t CurrentBuilding = (uint8_t)(levelBuffer[tileNr] >> 8); uint8_t j; uint8_t k; uint8_t AircraftRenderOrder[GAME_MAX_AIRCRAFT_PER_TILE]; @@ -1420,14 +1415,14 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) * * *******************************************************************/ -void GameLoadLevel(const char* path) +static void GameLoadLevel(const char* path) { uint8_t i = 0; uint8_t* ptrBuffer; char LevelHeader[LEVEL_MAGIC_NUMBER_SIZE + 1]; /* TODO - Very important */ - // Map contents (that means, without header) should be copied to GameLevelBuffer + // Map contents (that means, without header) should be copied to levelBuffer // Header treatment (magic number, map size, map title...) should be done // using System's file buffer. @@ -1438,7 +1433,7 @@ void GameLoadLevel(const char* path) ptrBuffer = SystemGetBufferAddress(); - //SystemLoadFileToBuffer(GameLevelList[0],GameLevelBuffer,GAME_MAX_MAP_SIZE); + //SystemLoadFileToBuffer(GameLevelList[0],levelBuffer,GAME_MAX_MAP_SIZE); memset(LevelHeader,0, LEVEL_MAGIC_NUMBER_SIZE + 1); @@ -1480,11 +1475,11 @@ void GameLoadLevel(const char* path) i += LEVEL_TITLE_SIZE; - memset(GameLevelBuffer, 0, GAME_MAX_MAP_SIZE); + memset(levelBuffer, 0, GAME_MAX_MAP_SIZE); i = LEVEL_HEADER_SIZE; - memcpy(GameLevelBuffer, &ptrBuffer[i], GameLevelSize * sizeof (uint16_t)); // 2 bytes per tile + memcpy(levelBuffer, &ptrBuffer[i], GameLevelSize * sizeof (uint16_t)); // 2 bytes per tile } /* ****************************************************************************************** @@ -1505,7 +1500,7 @@ void GameLoadLevel(const char* path) * * ******************************************************************************************/ -void GameAircraftState(uint8_t i) +static void GameAircraftState(const uint8_t i) { uint16_t target[2] = {0}; // Arrays are copied to AircraftAddNew, so we create a first and only @@ -1515,7 +1510,7 @@ void GameAircraftState(uint8_t i) if (FlightData.Finished[i] == false) { - if ( (FlightData.Hours[i] == 0) + if ((FlightData.Hours[i] == 0) && (FlightData.Minutes[i] == 0) && @@ -1523,7 +1518,7 @@ void GameAircraftState(uint8_t i) && (FlightData.RemainingTime[i] > 0) && - (spawnMinTimeFlag == false) ) + (spawnMinTimeFlag == false)) { if ( (FlightData.FlightDirection[i] == DEPARTURE) && @@ -1536,17 +1531,20 @@ void GameAircraftState(uint8_t i) { if (AircraftFromFlightDataIndex(j)->State != STATE_IDLE) { - uint16_t tile = AircraftGetTileFromFlightDataIndex(j); uint16_t* targets = AircraftGetTargets(j); - if (tile == FlightData.Parking[i]) + if (targets != NULL) { - bParkingBusy = true; - } + const uint16_t tile = AircraftGetTileFromFlightDataIndex(j); - if (SystemContains_u16(FlightData.Parking[i], targets, AIRCRAFT_MAX_TARGETS) != false) - { - bParkingBusy = true; + if (tile == FlightData.Parking[i]) + { + bParkingBusy = true; + } + else if (SystemContains_u16(FlightData.Parking[i], targets, AIRCRAFT_MAX_TARGETS)) + { + bParkingBusy = true; + } } } } @@ -1555,7 +1553,7 @@ void GameAircraftState(uint8_t i) { FlightData.State[i] = STATE_PARKED; - GameAircraftCreatedFlag = true; + aircraftCreated = true; // Create notification request for incoming aircraft GameGuiBubbleShow(); @@ -1564,7 +1562,7 @@ void GameAircraftState(uint8_t i) Serial_printf("Target assigned = %d\n", target[0]); - if (AircraftAddNew(&FlightData, i, target, GameGetParkingDirection(GameLevelBuffer[target[0]])) == false) + if (AircraftAddNew(&FlightData, i, target, GameGetParkingDirection(levelBuffer[target[0]])) == false) { Serial_printf("Exceeded maximum aircraft number!\n"); return; @@ -1575,27 +1573,28 @@ void GameAircraftState(uint8_t i) { Serial_printf("Flight %d set to STATE_APPROACH.\n", i); FlightData.State[i] = STATE_APPROACH; - GameAircraftCreatedFlag = true; + aircraftCreated = true; + + const uint32_t idx = SystemRand(SOUND_M1_INDEX, ARRAY_SIZE(ApproachSnds)); - SfxPlaySound(&ApproachSnds[SystemRand(SOUND_M1_INDEX, MAX_RADIO_CHATTER_SOUNDS - 1)]); + // Play chatter sound. + SfxPlaySound(&ApproachSnds[idx]); // Create notification request for incoming aircraft GameGuiBubbleShow(); } } - - if ( (FlightData.State[i] != STATE_IDLE) + else if ( (FlightData.State[i] != STATE_IDLE) && (FlightData.RemainingTime[i] == 0) ) { // Player(s) lost a flight! GameRemoveFlight(i, false); - dprintf("Flight %d lost\n", i); } } } -void GameInitTileUVTable(void) +static void GameInitTileUVTable(void) { uint16_t i; @@ -1603,8 +1602,8 @@ void GameInitTileUVTable(void) for (i = 0 ; i < GameLevelSize; i++) { - uint8_t CurrentTile = (uint8_t)(GameLevelBuffer[i] & 0x007F); // Remove building data - // and mirror flag. + uint8_t CurrentTile = (uint8_t)(levelBuffer[i] & 0x007F); // Remove building data + // and mirror flag. GameLevelBuffer_UVData[i].u = (short)(CurrentTile % COLUMNS_PER_TILESET) << TILE_SIZE_BIT_SHIFT; GameLevelBuffer_UVData[i].v = (short)(CurrentTile / COLUMNS_PER_TILESET) * TILE_SIZE_H; @@ -1613,12 +1612,12 @@ void GameInitTileUVTable(void) /* ****************************************************************************************** * - * @name: void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) + * @name: void GameRenderTerrainPrecalculations(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -1627,10 +1626,10 @@ void GameInitTileUVTable(void) * * @remarks: * Tiles are usually rendered with normal RGB values unless parking/runway is busy - * or ptrPlayer->InvalidPath != false. + * or ptrPlayer->InvalidPath. * * ******************************************************************************************/ -void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) +void GameRenderTerrainPrecalculations(TYPE_PLAYER* const ptrPlayer) { uint16_t i; uint8_t rows = 0; @@ -1642,7 +1641,7 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) { TYPE_ISOMETRIC_POS tileIsoPos; - // GameLevelBuffer bits explanation: + // levelBuffer bits explanation: // X X X X X X X X X X X X X X X X // | | | | | | | | | | | | | | | | // | | | | | | | | | | | | | | | V @@ -1663,7 +1662,7 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) // | V Building, bit 5 // V Building, bit 6 // Building, bit 7 - uint8_t CurrentTile = (uint8_t)(GameLevelBuffer[i] & 0x007F); // Remove building data + uint8_t CurrentTile = (uint8_t)(levelBuffer[i] & 0x007F); // Remove building data // and mirror flag. // Isometric -> Cartesian conversion @@ -1704,11 +1703,11 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) if (i != 0) { - if (ptrPlayer->SelectRunway != false) + if (ptrPlayer->SelectRunway) { - if (SystemContains_u16(i, ptrPlayer->RwyArray, GAME_MAX_RWY_LENGTH) != false) + if (SystemContains_u16(i, ptrPlayer->RwyArray, GAME_MAX_RWY_LENGTH)) { - if (used_rwy != false) + if (used_rwy) { ptrPlayer->TileData[i].r = rwy_sine; ptrPlayer->TileData[i].b = NORMAL_LUMINANCE >> 2; @@ -1722,17 +1721,17 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) } } } - else if ( (ptrPlayer->SelectTaxiwayParking != false) + else if ( (ptrPlayer->SelectTaxiwayParking) || - (ptrPlayer->SelectTaxiwayRunway != false) ) + (ptrPlayer->SelectTaxiwayRunway) ) { - if (( (SystemContains_u16(i, ptrPlayer->Waypoints, ptrPlayer->WaypointIdx) != false) + if (( (SystemContains_u16(i, ptrPlayer->Waypoints, ptrPlayer->WaypointIdx)) || (i == ptrPlayer->SelectedTile) ) && (ptrPlayer->SelectedTile != GAME_INVALID_TILE_SELECTION) ) { - if (ptrPlayer->InvalidPath != false) + if (ptrPlayer->InvalidPath) { ptrPlayer->TileData[i].r = rwy_sine; ptrPlayer->TileData[i].b = NORMAL_LUMINANCE >> 2; @@ -1745,7 +1744,7 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) ptrPlayer->TileData[i].b = rwy_sine; } } - else if ( (ptrPlayer->SelectTaxiwayRunway != false) + else if ( (ptrPlayer->SelectTaxiwayRunway) && ( (CurrentTile == TILE_RWY_HOLDING_POINT) || @@ -1755,7 +1754,7 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) ptrPlayer->TileData[i].g = rwy_sine; ptrPlayer->TileData[i].b = NORMAL_LUMINANCE >> 2; } - else if ( (ptrPlayer->SelectTaxiwayParking != false) + else if ( (ptrPlayer->SelectTaxiwayParking) && ( (CurrentTile == TILE_PARKING) || @@ -1772,36 +1771,36 @@ void GameRenderTerrainPrecalculations(TYPE_PLAYER* ptrPlayer) /* ****************************************************************************************** * - * @name: void GameRenderTerrain(TYPE_PLAYER* ptrPlayer) + * @name: void GameRenderTerrain(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * * @brief: - * Draws all tiles depending on GameLevelBuffer configuration. + * Draws all tiles depending on levelBuffer configuration. * * @remarks: * Tiles are usually rendered with normal RGB values unless parking/runway is busy - * or ptrPlayer->InvalidPath != false. + * or ptrPlayer->InvalidPath. * * ******************************************************************************************/ -void GameRenderTerrain(TYPE_PLAYER* ptrPlayer) +void GameRenderTerrain(TYPE_PLAYER* const ptrPlayer) { uint16_t i; uint8_t aux_id; for (i = 0 ; i < GameLevelSize; i++) { - if (ptrPlayer->TileData[i].ShowTile != false) + if (ptrPlayer->TileData[i].ShowTile) { bool flip_id; GsSprite* ptrTileset; - uint8_t CurrentTile = (uint8_t)(GameLevelBuffer[i] & 0x00FF); + uint8_t CurrentTile = (uint8_t)(levelBuffer[i] & 0x00FF); // Flipped tiles have bit 7 set. if (CurrentTile & TILE_MIRROR_FLAG) @@ -1842,7 +1841,7 @@ void GameRenderTerrain(TYPE_PLAYER* ptrPlayer) ptrTileset->g = ptrPlayer->TileData[i].g; ptrTileset->b = ptrPlayer->TileData[i].b; - if (flip_id != false) + if (flip_id) { ptrTileset->attribute |= H_FLIP; } @@ -1856,7 +1855,7 @@ void GameRenderTerrain(TYPE_PLAYER* ptrPlayer) ptrTileset->mx = ptrTileset->u + (TILE_SIZE >> 1); ptrTileset->my = ptrTileset->v + (TILE_SIZE_H >> 1); - if (flip_id != false) + if (flip_id) { flip_id = false; CurrentTile = aux_id; @@ -1911,7 +1910,7 @@ void GameSetTime(uint8_t hour, uint8_t minutes) * executed GAME_MAX_AIRCRAFT times on each cycle. * * *******************************************************************/ -void GameActiveAircraft(uint8_t i) +static void GameActiveAircraft(const uint8_t i) { // Reset iterator when i == 0. @@ -1928,15 +1927,15 @@ void GameActiveAircraft(uint8_t i) /* ****************************************************************************************** * - * @name: void GameStateShowAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateShowAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -1949,17 +1948,17 @@ void GameActiveAircraft(uint8_t i) * * ******************************************************************************************/ -void GameStateShowAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameStateShowAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { - if (ptrPlayer->ShowAircraftData != false) + if (ptrPlayer->ShowAircraftData) { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE)) { ptrPlayer->ShowAircraftData = false; } } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_CIRCLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_CIRCLE)) { if (GameGuiShowAircraftDataSpecialConditions(ptrPlayer) == false) { @@ -1971,15 +1970,15 @@ void GameStateShowAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa /* ****************************************************************************************** * - * @name: void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateLockTarget(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -1992,11 +1991,11 @@ void GameStateShowAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa * ******************************************************************************************/ -void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameStateLockTarget(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t AircraftIdx = ptrPlayer->FlightDataSelectedAircraft; - if (ptrPlayer->LockTarget != false) + if (ptrPlayer->LockTarget) { if (ptrPlayer->LockedAircraft != FLIGHT_DATA_INVALID_IDX) { @@ -2004,11 +2003,11 @@ void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData } } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_SQUARE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_SQUARE)) { if (ptrPlayer->LockTarget == false) { - if (ptrPlayer->ShowAircraftData != false) + if (ptrPlayer->ShowAircraftData) { if ( (ptrFlightData->State[AircraftIdx] != STATE_IDLE) && @@ -2025,9 +2024,9 @@ void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData ptrPlayer->LockedAircraft = FLIGHT_DATA_INVALID_IDX; } } - else if (ptrPlayer->PadDirectionKeyPressed_Callback() != false) + else if (ptrPlayer->PadDirectionKeyPressed_Callback()) { - if ( (ptrPlayer->LockTarget != false) + if ( (ptrPlayer->LockTarget) && (ptrPlayer->ShowAircraftData == false) ) { @@ -2039,15 +2038,15 @@ void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData /* ****************************************************************************************** * - * @name: void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateSelectTaxiwayRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -2060,7 +2059,7 @@ void GameStateLockTarget(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData * * ******************************************************************************************/ -void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameStateSelectTaxiwayRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { TYPE_ISOMETRIC_POS IsoPos = CameraGetIsoPos(ptrPlayer); uint8_t i; @@ -2068,7 +2067,7 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF /*Serial_printf("Camera is pointing to {%d,%d}\n",IsoPos.x, IsoPos.y);*/ - if (ptrPlayer->SelectTaxiwayRunway != false) + if (ptrPlayer->SelectTaxiwayRunway) { // Under this mode, always reset locking target. ptrPlayer->LockTarget = false; @@ -2081,7 +2080,7 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF ptrPlayer->InvalidPath = true; } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE)) { // State exit. ptrPlayer->SelectTaxiwayRunway = false; @@ -2090,7 +2089,7 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF ptrPlayer->WaypointIdx = 0; ptrPlayer->LastWaypointIdx = 0; } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { if (ptrPlayer->InvalidPath == false) { @@ -2104,7 +2103,7 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF ptrPlayer->LastWaypointIdx = i; } - target_tile = GameLevelBuffer[ptrPlayer->Waypoints[ptrPlayer->LastWaypointIdx]]; + target_tile = levelBuffer[ptrPlayer->Waypoints[ptrPlayer->LastWaypointIdx]]; SfxPlaySound(&BeepSnd); @@ -2151,15 +2150,15 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF /* ************************************************************************************************** * - * @name: void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateSelectTaxiwayParking(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -2169,13 +2168,13 @@ void GameStateSelectTaxiwayRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrF * @remarks: * * **************************************************************************************************/ -void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameStateSelectTaxiwayParking(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { TYPE_ISOMETRIC_POS IsoPos = CameraGetIsoPos(ptrPlayer); uint8_t i; uint16_t target_tile; - if (ptrPlayer->SelectTaxiwayParking != false) + if (ptrPlayer->SelectTaxiwayParking) { // Under this mode, always reset locking target. ptrPlayer->LockTarget = false; @@ -2188,7 +2187,7 @@ void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptr ptrPlayer->InvalidPath = true; } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE)) { // State exit. ptrPlayer->SelectTaxiwayParking = false; @@ -2197,7 +2196,7 @@ void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptr ptrPlayer->WaypointIdx = 0; ptrPlayer->LastWaypointIdx = 0; } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { if (ptrPlayer->InvalidPath == false) { @@ -2211,7 +2210,7 @@ void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptr ptrPlayer->LastWaypointIdx = i; } - target_tile = GameLevelBuffer[ptrPlayer->Waypoints[ptrPlayer->LastWaypointIdx]] & ~(TILE_MIRROR_FLAG); + target_tile = levelBuffer[ptrPlayer->Waypoints[ptrPlayer->LastWaypointIdx]] & ~(TILE_MIRROR_FLAG); Serial_printf("ptrPlayer->LastWaypointIdx = %d\n", ptrPlayer->LastWaypointIdx); @@ -2258,15 +2257,15 @@ void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptr /* ************************************************************************************************** * - * @name: void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateSelectRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -2276,7 +2275,7 @@ void GameStateSelectTaxiwayParking(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptr * @remarks: * * **************************************************************************************************/ -void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameStateSelectRunway(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t i; bool success; @@ -2284,7 +2283,7 @@ void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa GameGetYFromTile_short(GameRwy[ptrPlayer->SelectedRunway]), 0 }; - if (ptrPlayer->SelectRunway != false) + if (ptrPlayer->SelectRunway) { // Under this mode, always reset locking target. ptrPlayer->LockTarget = false; @@ -2294,11 +2293,11 @@ void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa CameraMoveToIsoPos(ptrPlayer, IsoPos); - if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_TRIANGLE)) { ptrPlayer->SelectRunway = false; } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { ptrPlayer->SelectRunway = false; @@ -2326,7 +2325,7 @@ void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa } } } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_LEFT) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_LEFT)) { if (ptrFlightData->State[ptrPlayer->FlightDataSelectedAircraft] == STATE_APPROACH) { @@ -2336,7 +2335,7 @@ void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa } } } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_RIGHT) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_RIGHT)) { if (ptrFlightData->State[ptrPlayer->FlightDataSelectedAircraft] == STATE_APPROACH) { @@ -2360,7 +2359,7 @@ void GameStateSelectRunway(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightDa * * * @brief: - * On startup, an array of runway headers is created from GameLevelBuffer once *.LVL is parsed. + * On startup, an array of runway headers is created from levelBuffer once *.LVL is parsed. * * @remarks: * Do not confuse GameRwy with GameRwyArray, which are used for completely different purposes. @@ -2373,11 +2372,11 @@ void GameGetRunwayArray(void) for (i = 0; i < GameLevelSize; i++) { - uint8_t tileNr = GameLevelBuffer[i] & ~TILE_MIRROR_FLAG; + uint8_t tileNr = levelBuffer[i] & ~TILE_MIRROR_FLAG; if (tileNr == TILE_RWY_START_1) { - if (SystemContains_u16(i, GameLevelBuffer, GAME_MAX_RUNWAYS) == false) + if (SystemContains_u16(i, levelBuffer, GAME_MAX_RUNWAYS) == false) { GameRwy[j++] = i; } @@ -2401,15 +2400,15 @@ void GameGetRunwayArray(void) /* ************************************************************************************************** * - * @name: void GameSelectAircraftFromList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameSelectAircraftFromList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -2420,14 +2419,14 @@ void GameGetRunwayArray(void) * * **************************************************************************************************/ -void GameSelectAircraftFromList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +static void GameSelectAircraftFromList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t AircraftIdx = ptrPlayer->FlightDataSelectedAircraft; FL_STATE aircraftState = ptrFlightData->State[AircraftIdx]; - if (ptrPlayer->ShowAircraftData != false) + if (ptrPlayer->ShowAircraftData) { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { if (ptrPlayer->ActiveAircraft != 0) { @@ -2496,7 +2495,7 @@ void GameSelectAircraftFromList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli } } } - else if (ptrPlayer->PadKeySinglePress_Callback(PAD_L1) != false) + else if (ptrPlayer->PadKeySinglePress_Callback(PAD_L1)) { FL_STATE* ptrAircraftState = &FlightData.State[ptrPlayer->FlightDataSelectedAircraft]; @@ -2559,7 +2558,7 @@ DIRECTION GameGetParkingDirection(uint16_t parkingTile) * **************************************************************************************************/ DIRECTION GameGetRunwayDirection(uint16_t rwyHeader) { - switch(GameLevelBuffer[rwyHeader]) + switch(levelBuffer[rwyHeader]) { case TILE_RWY_START_1: return DIR_EAST; @@ -2589,7 +2588,7 @@ DIRECTION GameGetRunwayDirection(uint16_t rwyHeader) * * @param: * uint16_t rwyHeader: - * Level tile number (located inside GameLevelBuffer) pointing to runway header. + * Level tile number (located inside levelBuffer) pointing to runway header. * Only TILE_RWY_START_1 and TILE_RWY_START_2 (with or without TILE_MIRROR_FLAG) * can be used for runway headers! * @@ -2601,7 +2600,7 @@ DIRECTION GameGetRunwayDirection(uint16_t rwyHeader) * Maximum size of the array. * * @brief: - * Fills rwyArray with all the tile numbers (included in GameLevelBuffer) belonging to a + * Fills rwyArray with all the tile numbers (included in levelBuffer) belonging to a * runway with header pointed to by rwyHeader. * * @remarks: @@ -2647,13 +2646,13 @@ void GameGetSelectedRunwayArray(uint16_t rwyHeader, uint16_t* rwyArray, size_t s { // Part two: append tiles to array until runway end is found. - if ( (GameLevelBuffer[last_tile] == TILE_RWY_START_1) + if ( (levelBuffer[last_tile] == TILE_RWY_START_1) || - (GameLevelBuffer[last_tile] == TILE_RWY_START_2) + (levelBuffer[last_tile] == TILE_RWY_START_2) || - (GameLevelBuffer[last_tile] == (TILE_RWY_START_1 | TILE_MIRROR_FLAG) ) + (levelBuffer[last_tile] == (TILE_RWY_START_1 | TILE_MIRROR_FLAG) ) || - (GameLevelBuffer[last_tile] == (TILE_RWY_START_2 | TILE_MIRROR_FLAG) ) ) + (levelBuffer[last_tile] == (TILE_RWY_START_2 | TILE_MIRROR_FLAG) ) ) { // Runway end found rwyArray[i++] = last_tile; @@ -2698,15 +2697,15 @@ void GameGetSelectedRunwayArray(uint16_t rwyHeader, uint16_t* rwyArray, size_t s /* ************************************************************************************************** * - * @name: void GameAssignRunwaytoAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameAssignRunwaytoAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -2718,7 +2717,7 @@ void GameGetSelectedRunwayArray(uint16_t rwyHeader, uint16_t* rwyArray, size_t s * * **************************************************************************************************/ -void GameAssignRunwaytoAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameAssignRunwaytoAircraft(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint16_t assignedRwy = GameRwy[ptrPlayer->SelectedRunway]; uint8_t aircraftIndex = ptrPlayer->FlightDataSelectedAircraft; @@ -2751,7 +2750,7 @@ void GameAssignRunwaytoAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli for (i = 0; i < GAME_MAX_RWY_LENGTH; i++) { - rwyTiles[i] = GameLevelBuffer[rwyArray[i]]; + rwyTiles[i] = levelBuffer[rwyArray[i]]; } for (i = 0; (i < GAME_MAX_RWY_LENGTH) && (rwyExit == 0); i++) @@ -2818,11 +2817,11 @@ void GameAssignRunwaytoAircraft(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli * * @param: * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @return: * Returns relative X position (no fixed-point arithmetic) given - * a tile number from GameLevelBuffer. + * a tile number from levelBuffer. * * @remarks: * @@ -2850,11 +2849,11 @@ short GameGetXFromTile_short(uint16_t tile) * * @param: * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @return: * Returns relative Y position (no fixed-point arithmetic) given - * a tile number from GameLevelBuffer. + * a tile number from levelBuffer. * * @remarks: * @@ -2882,11 +2881,11 @@ short GameGetYFromTile_short(uint16_t tile) * * @param: * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @return: * Returns relative X position in 16.16 (fix16_t) fixed-point format - * given a tile number from GameLevelBuffer. + * given a tile number from levelBuffer. * * @remarks: * @@ -2905,11 +2904,11 @@ fix16_t GameGetXFromTile(uint16_t tile) * * @param: * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @return: * Returns relative Y position in 16.16 (fix16_t) fixed-point format - * given a tile number from GameLevelBuffer. + * given a tile number from levelBuffer. * * @remarks: * @@ -3002,7 +3001,7 @@ FL_STATE GameTargetsReached(uint16_t firstTarget, uint8_t index) * Calculates new state for aircraft once all waypoints have been reached. * * @return: - * Tile number to be used against GameLevelBuffer. + * Tile number to be used against levelBuffer. * * @remarks: * GameLevelColumns is used to determine tile number. @@ -3054,12 +3053,12 @@ uint8_t GameGetLevelColumns(void) /* **************************************************************************** * - * @name: void GamePlayerAddWaypoint(TYPE_PLAYER* ptrPlayer) + * @name: void GamePlayerAddWaypoint(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -3067,23 +3066,23 @@ uint8_t GameGetLevelColumns(void) * * ****************************************************************************/ -void GamePlayerAddWaypoint(TYPE_PLAYER* ptrPlayer) +void GamePlayerAddWaypoint(TYPE_PLAYER* const ptrPlayer) { GamePlayerAddWaypoint_Ex(ptrPlayer, ptrPlayer->SelectedTile); } /* **************************************************************************** * - * @name: void GamePlayerAddWaypoint(TYPE_PLAYER* ptrPlayer) + * @name: void GamePlayerAddWaypoint(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure. * * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @brief: * It allows adding a tile number to ptrPlayer. @@ -3093,7 +3092,7 @@ void GamePlayerAddWaypoint(TYPE_PLAYER* ptrPlayer) * * ****************************************************************************/ -void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* ptrPlayer, uint16_t tile) +void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* const ptrPlayer, uint16_t tile) { // "_Ex" function allow selecting a certain tile, whereas the other one // is a particulare case of "_Ex" for tile = ptrPlayer->SelectedTIle. @@ -3113,16 +3112,16 @@ void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* ptrPlayer, uint16_t tile) /* ************************************************************************************** * - * @name: bool GameWaypointCheckExisting(TYPE_PLAYER* ptrPlayer, uint16_t temp_tile) + * @name: bool GameWaypointCheckExisting(TYPE_PLAYER* const ptrPlayer, uint16_t temp_tile) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure. * * uint16_t tile: - * Tile number from GameLevelBuffer. + * Tile number from levelBuffer. * * @brief: * Checks if tile number temp_tile is already included on player's waypoint list. @@ -3132,7 +3131,7 @@ void GamePlayerAddWaypoint_Ex(TYPE_PLAYER* ptrPlayer, uint16_t tile) * * **************************************************************************************/ -bool GameWaypointCheckExisting(TYPE_PLAYER* ptrPlayer, uint16_t temp_tile) +bool GameWaypointCheckExisting(TYPE_PLAYER* const ptrPlayer, uint16_t temp_tile) { if (SystemContains_u16(temp_tile, ptrPlayer->Waypoints, PLAYER_MAX_WAYPOINTS) == false) { @@ -3160,15 +3159,15 @@ bool GameWaypointCheckExisting(TYPE_PLAYER* ptrPlayer, uint16_t temp_tile) /* **************************************************************************************** * - * @name: bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: bool GamePathToTile(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -3183,7 +3182,7 @@ bool GameWaypointCheckExisting(TYPE_PLAYER* ptrPlayer, uint16_t temp_tile) * * ****************************************************************************************/ -bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +bool GamePathToTile(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t AcceptedTiles[] = { TILE_ASPHALT_WITH_BORDERS, TILE_PARKING, @@ -3243,7 +3242,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) temp_tile--; } - if (GameWaypointCheckExisting(ptrPlayer, temp_tile) != false) + if (GameWaypointCheckExisting(ptrPlayer, temp_tile)) { return false; // Tile is already included in the list of temporary tiles? } @@ -3261,7 +3260,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) temp_tile -= GameLevelColumns; } - if (GameWaypointCheckExisting(ptrPlayer, temp_tile) != false) + if (GameWaypointCheckExisting(ptrPlayer, temp_tile)) { return false; // Tile is already included in the list of temporary tiles? } @@ -3281,7 +3280,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) temp_tile -= GameLevelColumns; } - if (GameWaypointCheckExisting(ptrPlayer, temp_tile) != false) + if (GameWaypointCheckExisting(ptrPlayer, temp_tile)) { return false; // Tile is already included in the list of temporary tiles? } @@ -3299,7 +3298,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) temp_tile--; } - if (GameWaypointCheckExisting(ptrPlayer, temp_tile) != false) + if (GameWaypointCheckExisting(ptrPlayer, temp_tile)) { return false; // Tile is already included in the list of temporary tiles? } @@ -3316,7 +3315,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) break; } - if (SystemContains_u8( GameLevelBuffer[ptrPlayer->Waypoints[i]], + if (SystemContains_u8( levelBuffer[ptrPlayer->Waypoints[i]], AcceptedTiles, sizeof (AcceptedTiles) ) == false) { @@ -3327,7 +3326,7 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) AcceptedTiles[j] |= TILE_MIRROR_FLAG; } - if (SystemContains_u8( GameLevelBuffer[ptrPlayer->Waypoints[i]], + if (SystemContains_u8( levelBuffer[ptrPlayer->Waypoints[i]], AcceptedTiles, sizeof (AcceptedTiles) ) == false) { @@ -3349,12 +3348,12 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) /* **************************************************************************************** * - * @name: TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* ptrPlayer) + * @name: TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -3365,10 +3364,10 @@ bool GamePathToTile(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) * * ****************************************************************************************/ -TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* ptrPlayer) +static TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* const ptrPlayer) { - uint8_t AircraftIdx = ptrPlayer->FlightDataSelectedAircraft; - TYPE_ISOMETRIC_POS IsoPos = AircraftGetIsoPos(AircraftIdx); + const uint8_t AircraftIdx = ptrPlayer->FlightDataSelectedAircraft; + const TYPE_ISOMETRIC_POS IsoPos = AircraftGetIsoPos(AircraftIdx); CameraMoveToIsoPos(ptrPlayer, IsoPos); @@ -3377,12 +3376,12 @@ TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* ptrPlayer) /* ******************************************************************************** * - * @name: void GameSelectAircraftWaypoint(TYPE_PLAYER* ptrPlayer) + * @name: void GameSelectAircraftWaypoint(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -3390,7 +3389,7 @@ TYPE_ISOMETRIC_POS GameSelectAircraft(TYPE_PLAYER* ptrPlayer) * * ********************************************************************************/ -void GameSelectAircraftWaypoint(TYPE_PLAYER* ptrPlayer) +void GameSelectAircraftWaypoint(TYPE_PLAYER* const ptrPlayer) { TYPE_ISOMETRIC_POS IsoPos = GameSelectAircraft(ptrPlayer); @@ -3407,23 +3406,23 @@ void GameSelectAircraftWaypoint(TYPE_PLAYER* ptrPlayer) * * @return: * Returns if a second player is active. To be used with other modules without - * declaring TwoPlayersActive as a global variable. + * declaring twoPlayers as a global variable. * * ********************************************************************************/ bool GameTwoPlayersActive(void) { - return TwoPlayersActive; + return twoPlayers; } /* ***************************************************************** * - * @name: void GameDrawMouse(TYPE_PLAYER* ptrPlayer) + * @name: void GameDrawMouse(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -3431,11 +3430,11 @@ bool GameTwoPlayersActive(void) * * *****************************************************************/ -void GameDrawMouse(TYPE_PLAYER* ptrPlayer) +void GameDrawMouse(TYPE_PLAYER* const ptrPlayer) { - if ( (ptrPlayer->SelectTaxiwayParking != false) + if ( (ptrPlayer->SelectTaxiwayParking) || - (ptrPlayer->SelectTaxiwayRunway != false) ) + (ptrPlayer->SelectTaxiwayRunway) ) { GfxSortSprite(&GameMouseSpr); } @@ -3484,15 +3483,15 @@ uint32_t GameGetScore(void) /* ******************************************************************************************* * - * @name: void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateUnboarding(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -3501,11 +3500,11 @@ uint32_t GameGetScore(void) * * *******************************************************************************************/ -void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameStateUnboarding(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { - if (ptrPlayer->Unboarding != false) + if (ptrPlayer->Unboarding) { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_CIRCLE) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_CIRCLE)) { ptrPlayer->Unboarding = false; ptrPlayer->UnboardingSequenceIdx = 0; // Player will need to repeat sequence @@ -3553,12 +3552,12 @@ void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData /* ******************************************************************************************* * - * @name: void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameStateUnboarding(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * * @brief: @@ -3570,7 +3569,7 @@ void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData * * *******************************************************************************************/ -void GameGenerateUnboardingSequence(TYPE_PLAYER* ptrPlayer) +void GameGenerateUnboardingSequence(TYPE_PLAYER* const ptrPlayer) { uint8_t i; unsigned short keyTable[] = { PAD_CROSS, PAD_SQUARE, PAD_TRIANGLE }; @@ -3596,15 +3595,15 @@ void GameGenerateUnboardingSequence(TYPE_PLAYER* ptrPlayer) /* ********************************************************************************************************************* * - * @name: void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData, uint8_t aircraftIdx) + * @name: void GameCreateTakeoffWaypoints(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData, uint8_t aircraftIdx) * * @author: Xavier Del Campo * * @param: - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -3617,7 +3616,7 @@ void GameGenerateUnboardingSequence(TYPE_PLAYER* ptrPlayer) * * *********************************************************************************************************************/ -void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData, uint8_t aircraftIdx) +void GameCreateTakeoffWaypoints(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData, uint8_t aircraftIdx) { // Look for aircraft direction by searching TILE_RWY_EXIT //uint16_t currentTile = AircraftGetTileFromFlightDataIndex(aircraftIdx); @@ -3651,9 +3650,9 @@ void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli } for (currentTile = (AircraftGetTileFromFlightDataIndex(aircraftIdx) + rwyStep); - ((GameLevelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_START_1) + ((levelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_START_1) && - ((GameLevelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_START_2); + ((levelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_START_2); currentTile -= rwyStep ) { // Calculate new currentTile value until conditions are invalid. @@ -3669,7 +3668,7 @@ void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli } for ( currentTile = (AircraftGetTileFromFlightDataIndex(aircraftIdx) + rwyStep); - (GameLevelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_EXIT; + (levelBuffer[currentTile] & ~(TILE_MIRROR_FLAG)) != TILE_RWY_EXIT; currentTile += rwyStep ) { @@ -3710,33 +3709,33 @@ void GameGetRunwayEntryTile(uint8_t aircraftIdx, TYPE_RWY_ENTRY_DATA* ptrRwyEntr && ( (currentTile + GameLevelColumns) < GameLevelSize) ) { - if ( ((GameLevelBuffer[currentTile + 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) + if ( ((levelBuffer[currentTile + 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) || - ((GameLevelBuffer[currentTile + 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) + ((levelBuffer[currentTile + 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) { ptrRwyEntry->Direction = DIR_EAST; ptrRwyEntry->rwyStep = GameLevelColumns; step = 1; } - else if ( ((GameLevelBuffer[currentTile - 1] & ~(TILE_MIRROR_FLAG) ) == TILE_RWY_EXIT) + else if ( ((levelBuffer[currentTile - 1] & ~(TILE_MIRROR_FLAG) ) == TILE_RWY_EXIT) || - ((GameLevelBuffer[currentTile - 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) + ((levelBuffer[currentTile - 1] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) { ptrRwyEntry->Direction = DIR_WEST; ptrRwyEntry->rwyStep = GameLevelColumns; step = -1; } - else if ( ((GameLevelBuffer[currentTile + GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) + else if ( ((levelBuffer[currentTile + GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) || - ((GameLevelBuffer[currentTile + GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) + ((levelBuffer[currentTile + GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) { ptrRwyEntry->Direction = DIR_SOUTH; ptrRwyEntry->rwyStep = 1; step = GameLevelColumns; } - else if ( ((GameLevelBuffer[currentTile - GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) + else if ( ((levelBuffer[currentTile - GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT) || - ((GameLevelBuffer[currentTile - GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) + ((levelBuffer[currentTile - GameLevelColumns] & ~(TILE_MIRROR_FLAG)) == TILE_RWY_EXIT_2) ) { ptrRwyEntry->Direction = DIR_NORTH; ptrRwyEntry->rwyStep = 1; @@ -3755,9 +3754,9 @@ void GameGetRunwayEntryTile(uint8_t aircraftIdx, TYPE_RWY_ENTRY_DATA* ptrRwyEntr i = ptrRwyEntry->rwyEntryTile; - while ( ((GameLevelBuffer[i] & ~TILE_MIRROR_FLAG) != TILE_RWY_START_1) + while ( ((levelBuffer[i] & ~TILE_MIRROR_FLAG) != TILE_RWY_START_1) && - ((GameLevelBuffer[i] & ~TILE_MIRROR_FLAG) != TILE_RWY_START_2) + ((levelBuffer[i] & ~TILE_MIRROR_FLAG) != TILE_RWY_START_2) && (i > ptrRwyEntry->rwyStep) && @@ -3846,7 +3845,7 @@ void GameRemoveFlight(uint8_t idx, bool successful) for (i = PLAYER_ONE; i < MAX_PLAYERS; i++) { - TYPE_PLAYER* ptrPlayer = &PlayerData[i]; + TYPE_PLAYER* const ptrPlayer = &PlayerData[i]; uint8_t j; if (ptrPlayer->Active == false) @@ -3881,7 +3880,7 @@ void GameRemoveFlight(uint8_t idx, bool successful) uint16_t* targets = AircraftGetTargets(idx); uint16_t rwyArray[GAME_MAX_RWY_LENGTH] = {0}; - if (SystemContains_u16(GameUsedRwy[k], targets, AIRCRAFT_MAX_TARGETS) != false) + if (SystemContains_u16(GameUsedRwy[k], targets, AIRCRAFT_MAX_TARGETS)) { GameUsedRwy[k] = 0; } @@ -3892,7 +3891,7 @@ void GameRemoveFlight(uint8_t idx, bool successful) if (SystemContains_u16( AircraftGetTileFromFlightDataIndex(idx), rwyArray, - sizeof (rwyArray) / sizeof (rwyArray[0]) ) != false) + sizeof (rwyArray) / sizeof (rwyArray[0]) )) { GameUsedRwy[k] = 0; } @@ -3918,7 +3917,7 @@ void GameRemoveFlight(uint8_t idx, bool successful) ptrPlayer->LockedAircraft = FLIGHT_DATA_INVALID_IDX; } - if (successful != false) + if (successful) { GameScore += SCORE_REWARD_FINISH_FLIGHT; @@ -3958,16 +3957,16 @@ void GameRemoveFlight(uint8_t idx, bool successful) /* ******************************************************************************************* * - * @name: void GameActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameActiveAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * * @param: * - * TYPE_PLAYER* ptrPlayer: + * TYPE_PLAYER* const ptrPlayer: * Pointer to a player structure * - * TYPE_FLIGHT_DATA* ptrFlightData: + * TYPE_FLIGHT_DATA* const ptrFlightData: * In the end, pointer to FlightData data table, which contains * information about all available flights. * @@ -3976,25 +3975,22 @@ void GameRemoveFlight(uint8_t idx, bool successful) * * *******************************************************************************************/ -void GameActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameActiveAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t i; uint8_t j = 0; uint8_t currentFlightDataIdx; - uint8_t lastFlightDataIdx; + const uint8_t lastFlightDataIdx = ptrPlayer->ActiveAircraftList[ptrPlayer->SelectedAircraft]; // Clear all pointers for aircraft data first. - // Then, rebuild aircraft list for player. - - lastFlightDataIdx = ptrPlayer->ActiveAircraftList[ptrPlayer->SelectedAircraft]; - + // Then, rebuild aircraft list for current player. memset(ptrPlayer->ActiveAircraftList, 0, GAME_MAX_AIRCRAFT); ptrPlayer->ActiveAircraft = 0; for (i = 0; i < FlightData.nAircraft; i++) { - if ( (ptrFlightData->State[i] != STATE_IDLE) + if ((ptrFlightData->State[i] != STATE_IDLE) && (ptrFlightData->FlightDirection[i] & ptrPlayer->FlightDirection) ) { @@ -4005,9 +4001,9 @@ void GameActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightD currentFlightDataIdx = ptrPlayer->ActiveAircraftList[ptrPlayer->SelectedAircraft]; - if (GameAircraftCreatedFlag != false) + if (aircraftCreated) { - GameAircraftCreatedFlag = false; + aircraftCreated = false; if (ptrPlayer->ActiveAircraft > 1) { @@ -4047,17 +4043,16 @@ void GameActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightD * * *******************************************************************************************/ -void GameRemainingAircraft(uint8_t i) +static void GameRemainingAircraft(uint8_t i) { // Reset iterator when starting from first element. - if (i == 0) { FlightData.nRemainingAircraft = FlightData.nAircraft; } - if (FlightData.Finished[i] != false) + if (FlightData.Finished[i]) { FlightData.nRemainingAircraft--; } @@ -4075,7 +4070,7 @@ void GameRemainingAircraft(uint8_t i) * Index from FlightData. * * @brief: - * Sets GameFinishedFlag if there are no more active aircraft. + * Sets levelFinished if there are no more active aircraft. * * @remarks: * This function is called nActiveAircraft times. See loop inside GameCalculations() @@ -4083,16 +4078,11 @@ void GameRemainingAircraft(uint8_t i) * * *******************************************************************************************/ -void GameFinished(uint8_t i) +static void GameFinished(const uint8_t i) { - if (i == 0) - { - GameFinishedFlag = true; - } - if (FlightData.Finished[i] == false) { - GameFinishedFlag = false; + levelFinished = false; } } diff --git a/Source/Game.h b/Source/Game.h index fce2fb1..44ade47 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -38,7 +38,7 @@ extern bool GameStartupFlag; * Global prototypes * *************************************/ -void Game(TYPE_GAME_CONFIGURATION* pGameCfg); +void Game(const TYPE_GAME_CONFIGURATION* const pGameCfg); void GameSetTime(uint8_t hour, uint8_t minutes); bool GameTwoPlayersActive(void); uint8_t GameGetLevelColumns(void); diff --git a/Source/GameGui.c b/Source/GameGui.c index 8378a31..1d554af 100644 --- a/Source/GameGui.c +++ b/Source/GameGui.c @@ -14,9 +14,6 @@ * *************************************/ #define GAME_GUI_AIRCRAFT_DATA_MAX_PAGE 4 - -#define SLOW_SCORE_LOW_SPEED_MARGIN 100 -#define SLOW_SCORE_LOW_SPEED 5 #define SLOW_SCORE_HIGH_SPEED 10 /* ************************************** @@ -185,7 +182,7 @@ enum * Local prototypes * * *************************************/ -static void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData); +static void GameGuiShowAircraftData(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData); static void GameGuiClearPassengersLeft(void); static void GameGuiBubbleStop(void); static void GameGuiBubbleStopVibration(void); @@ -203,8 +200,8 @@ static GsSprite DepArrSpr; static GsSprite PageUpDownSpr; static TYPE_TIMER* ShowAircraftPassengersTimer; static bool GameGuiClearPassengersLeft_Flag; -static bool GameGuiBubbleShowFlag; -static bool GameGuiBubbleVibrationFlag; +static bool showBubble; +static bool bubbleVibration; static const char* GameFileList[] = { "DATA\\SPRITES\\BUBBLE.TIM" , "DATA\\FONTS\\FONT_1.FNT" , @@ -260,7 +257,7 @@ void GameGuiInit(void) static bool firstLoad = true; - if (firstLoad != false) + if (firstLoad) { firstLoad = false; @@ -320,7 +317,7 @@ void GameGuiInit(void) slowScore = 0; - GameGuiBubbleShowFlag = false; + showBubble = false; FontSetSpacing(&RadioFont, RADIO_FONT_SPACING); } @@ -345,13 +342,11 @@ bool GameGuiPauseDialog(const TYPE_PLAYER* const ptrPlayer) GfxSetGlobalLuminance(NORMAL_LUMINANCE); - //DrawFBRect(0, 0, X_SCREEN_RESOLUTION, VRAM_H, 0, 0, 0); - - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); do { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { return true; } @@ -362,7 +357,7 @@ bool GameGuiPauseDialog(const TYPE_PLAYER* const ptrPlayer) GfxDrawScene_Slow(); - }while (ptrPlayer->PadKeySinglePress_Callback(PAD_START) == false); + } while (ptrPlayer->PadKeySinglePress_Callback(PAD_START) == false); return false; } @@ -370,7 +365,7 @@ bool GameGuiPauseDialog(const TYPE_PLAYER* const ptrPlayer) /* ****************************************************************************************************** * - * @name: void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * @@ -378,7 +373,7 @@ bool GameGuiPauseDialog(const TYPE_PLAYER* const ptrPlayer) * Updates ptrPlayer->NextAircraftTime with next aircraft remaining time. * * ******************************************************************************************************/ -void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t i; uint16_t minRemainingTime = 0; @@ -409,7 +404,7 @@ void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* /* ********************************************************************************************** * - * @name: void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameGuiActiveAircraftPage(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * @@ -419,7 +414,7 @@ void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* * user interaction. * * **********************************************************************************************/ -void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameGuiActiveAircraftPage(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { if (ptrPlayer->ActiveAircraft != 0) { @@ -442,9 +437,9 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig ptrPlayer->FlightDataPage++; } - if (ptrPlayer->ShowAircraftData != false) + if (ptrPlayer->ShowAircraftData) { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_DOWN) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_DOWN)) { if ( ( (ptrPlayer->SelectedAircraft + 1) < ptrPlayer->ActiveAircraft) && @@ -454,7 +449,7 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig } } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_UP) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_UP)) { if (ptrPlayer->SelectedAircraft > ( (ptrPlayer->FlightDataPage) * GAME_GUI_AIRCRAFT_DATA_MAX_PAGE) ) { @@ -462,7 +457,7 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig } } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_RIGHT) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_RIGHT)) { if (ptrPlayer->ActiveAircraft > (GAME_GUI_AIRCRAFT_DATA_MAX_PAGE * (ptrPlayer->FlightDataPage + 1) ) ) { @@ -472,7 +467,7 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig } } - if (ptrPlayer->PadKeySinglePress_Callback(PAD_LEFT) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_LEFT)) { if (ptrPlayer->FlightDataPage != 0) { @@ -486,7 +481,7 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig /* ********************************************************************************************** * - * @name: void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameGuiAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * @@ -494,7 +489,7 @@ void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlig * Draws aircraft list for current player when ptrPlayer->ShowAircraftData state is active. * * **********************************************************************************************/ -void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameGuiAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { short y_offset; uint8_t page_aircraft; @@ -524,11 +519,11 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData AIRCRAFT_STOP_TEXT_Y = AIRCRAFT_STOP_Y + 4 }; - if (ptrPlayer->ShowAircraftData != false) + if (ptrPlayer->ShowAircraftData) { AircraftDataGPoly4.attribute |= ENABLE_TRANS | TRANS_MODE(0); - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { AircraftDataGPoly4.x[0] = AIRCRAFT_DATA_GSGPOLY4_X0_2PLAYER; AircraftDataGPoly4.x[1] = AIRCRAFT_DATA_GSGPOLY4_X1_2PLAYER; @@ -555,7 +550,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData GsSortGPoly4(&AircraftDataGPoly4); - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { FontPrintText( &SmallFont, GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER, @@ -603,7 +598,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData SelectedAircraftGPoly4.attribute |= ENABLE_TRANS | TRANS_MODE(0); - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { SelectedAircraftGPoly4.x[0] = AIRCRAFT_DATA_FLIGHT_GSGPOLY4_X0_2PLAYER; SelectedAircraftGPoly4.x[1] = AIRCRAFT_DATA_FLIGHT_GSGPOLY4_X1_2PLAYER; @@ -622,7 +617,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData y_offset = (short)(page_aircraft * AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H); - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { SelectedAircraftGPoly4.y[0] = AIRCRAFT_DATA_FLIGHT_GSGPOLY4_Y0_2PLAYER; SelectedAircraftGPoly4.y[1] = AIRCRAFT_DATA_FLIGHT_GSGPOLY4_Y1_2PLAYER; @@ -652,7 +647,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData PageUpDownSpr.u = orig_pageupdn_u + AIRCRAFT_DATA_FLIGHT_PAGE_UP_U; - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { PageUpDownSpr.x = AIRCRAFT_DATA_FLIGHT_PAGE_UP_X_2PLAYER; PageUpDownSpr.y = AIRCRAFT_DATA_FLIGHT_PAGE_UP_Y_2PLAYER; @@ -674,7 +669,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData PageUpDownSpr.u = orig_pageupdn_u + AIRCRAFT_DATA_FLIGHT_PAGE_DOWN_U; - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { PageUpDownSpr.x = AIRCRAFT_DATA_FLIGHT_PAGE_DOWN_X_2PLAYER; PageUpDownSpr.y = AIRCRAFT_DATA_FLIGHT_PAGE_DOWN_Y_2PLAYER; @@ -694,7 +689,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData GfxDrawButton(AIRCRAFT_LOCK_TARGET_X, AIRCRAFT_LOCK_TARGET_Y, PAD_SQUARE); - if (ptrPlayer->LockTarget != false) + if (ptrPlayer->LockTarget) { FontPrintText(&SmallFont, AIRCRAFT_LOCK_TARGET_TEXT_X, AIRCRAFT_LOCK_TARGET_TEXT_Y, "Unlock target"); } @@ -716,7 +711,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData } else { - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { FontPrintText( &SmallFont, AIRCRAFT_DATA_GSGPOLY4_X0_2PLAYER + @@ -751,11 +746,10 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData * **********************************************************************************************/ void GameGuiBubbleShow(void) { - static TYPE_TIMER* GameGuiBubbleTimer = NULL; + static TYPE_TIMER* GameGuiBubbleTimer; if (GameGuiBubbleTimer == NULL) { - Serial_printf("Started GameGuiBubbleTimer...\n"); GameGuiBubbleTimer = TimerCreate(50, false, &GameGuiBubbleStop); } else @@ -763,13 +757,13 @@ void GameGuiBubbleShow(void) TimerRestart(GameGuiBubbleTimer); } - GameGuiBubbleShowFlag = true; - GameGuiBubbleVibrationFlag = true; + showBubble = true; + bubbleVibration = true; } /* ********************************************************************************************** * - * @name: void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameGuiBubble(TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * @@ -777,11 +771,11 @@ void GameGuiBubbleShow(void) * When a new aircraft is spawned, a bubble is temporarily shown on screen to notify players. * * **********************************************************************************************/ -void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData) +void GameGuiBubble(TYPE_FLIGHT_DATA* const ptrFlightData) { static bool GameGuiBubbleShowFlagOld; - if (GameGuiBubbleShowFlag != false) + if (showBubble) { static TYPE_TIMER* GameGuiBubbleVibrationTimer = NULL; @@ -801,7 +795,7 @@ void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData) BubbleSpr.x = BUBBLE_SPRITE_X; BubbleSpr.y = BUBBLE_SPRITE_Y; - if (GameGuiBubbleVibrationFlag != false) + if (bubbleVibration) { BubbleSpr.x += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX); BubbleSpr.y += SystemRand(BUBBLE_SPRITE_RAND_MIN,BUBBLE_SPRITE_RAND_MAX); @@ -814,7 +808,7 @@ void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData) GfxDrawButton(NOTIFICATION_BUTTON_X, NOTIFICATION_BUTTON_Y, PAD_CIRCLE); } - GameGuiBubbleShowFlagOld = GameGuiBubbleShowFlag; + GameGuiBubbleShowFlagOld = showBubble; } /* ********************************************************************************************** @@ -837,7 +831,7 @@ void GameGuiClock(uint8_t hour, uint8_t min) static char strClock[6]; // HH:MM + \0 (6 characters needed) - if (GameStartupFlag || System1SecondTick() != false) + if (GameStartupFlag || System1SecondTick()) { memset(strClock, 0, 6); snprintf(strClock,6,"%02d:%02d",hour, min); @@ -850,7 +844,7 @@ void GameGuiClock(uint8_t hour, uint8_t min) /* ********************************************************************************************** * - * @name: void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) + * @name: void GameGuiShowPassengersLeft(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * @@ -858,9 +852,9 @@ void GameGuiClock(uint8_t hour, uint8_t min) * TODO * * **********************************************************************************************/ -void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) +void GameGuiShowPassengersLeft(TYPE_PLAYER* const ptrPlayer) { - if (GameGuiClearPassengersLeft_Flag != false) + if (GameGuiClearPassengersLeft_Flag) { // Reset flag GameGuiClearPassengersLeft_Flag = false; @@ -869,7 +863,7 @@ void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) if (ptrPlayer->PassengersLeftSelectedAircraft != 0) { - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { FontPrintText(&SmallFont, 48, Y_SCREEN_RESOLUTION - 64, "%d passengers left", ptrPlayer->PassengersLeftSelectedAircraft); } @@ -882,7 +876,7 @@ void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) /* ********************************************************************************************** * - * @name: void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) + * @name: void GameGuiShowAircraftData(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) * * @author: Xavier Del Campo * @@ -891,7 +885,7 @@ void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) * TYPE_FLIGHT_DATA instances. * * **********************************************************************************************/ -void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData) +void GameGuiShowAircraftData(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t init_flight = ptrPlayer->FlightDataPage * GAME_GUI_AIRCRAFT_DATA_MAX_PAGE; uint8_t i; @@ -907,7 +901,7 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight short AircraftDataRemainingTime_Y; short orig_DepArr_u = DepArrSpr.u; - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { AircraftDataDirection_X = AIRCRAFT_DATA_DIRECTION_X_2PLAYER; AircraftDataDirection_Y = AIRCRAFT_DATA_DIRECTION_Y_2PLAYER; @@ -1007,7 +1001,7 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight /* ********************************************************************************************** * - * @name: bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* ptrPlayer) + * @name: bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * @@ -1019,15 +1013,15 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight * false otherwise. * * **********************************************************************************************/ -bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* ptrPlayer) +bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* const ptrPlayer) { // Aircraft list data cannot be shown under these conditions. - if ( (ptrPlayer->SelectRunway != false) + if ( (ptrPlayer->SelectRunway) || - (ptrPlayer->SelectTaxiwayParking != false) + (ptrPlayer->SelectTaxiwayParking) || - (ptrPlayer->SelectTaxiwayRunway != false) ) + (ptrPlayer->SelectTaxiwayRunway) ) { return true; } @@ -1052,8 +1046,18 @@ void GameGuiCalculateSlowScore(void) uint32_t currentScore = GameGetScore(); uint32_t scoreSpeed; + enum + { + SLOW_SCORE_LOW_SPEED_MARGIN = 100 + }; + if (abs(slowScore - currentScore) < SLOW_SCORE_LOW_SPEED_MARGIN) { + enum + { + SLOW_SCORE_LOW_SPEED = 5 + }; + scoreSpeed = SLOW_SCORE_LOW_SPEED; if (abs(slowScore - currentScore) < SLOW_SCORE_LOW_SPEED) @@ -1099,7 +1103,7 @@ void GameGuiShowScore(void) /* ********************************************************************************************** * - * @name: void GameGuiDrawUnboardingSequence(TYPE_PLAYER* ptrPlayer) + * @name: void GameGuiDrawUnboardingSequence(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * @@ -1108,11 +1112,11 @@ void GameGuiShowScore(void) * button sequence on screen. * * **********************************************************************************************/ -void GameGuiDrawUnboardingSequence(TYPE_PLAYER* ptrPlayer) +void GameGuiDrawUnboardingSequence(TYPE_PLAYER* const ptrPlayer) { uint8_t i; - if (ptrPlayer->Unboarding != false) + if (ptrPlayer->Unboarding) { for (i = ptrPlayer->UnboardingSequenceIdx; i < GAME_MAX_SEQUENCE_KEYS; i++) { @@ -1122,7 +1126,7 @@ void GameGuiDrawUnboardingSequence(TYPE_PLAYER* ptrPlayer) } // TODO: Draw above the plane - if (GameTwoPlayersActive() != false) + if (GameTwoPlayersActive()) { GfxDrawButton(48 + (16*i), Y_SCREEN_RESOLUTION - 32, ptrPlayer->UnboardingSequence[i]); } @@ -1141,7 +1145,7 @@ void GameGuiClearPassengersLeft(void) /* ********************************************************************************************** * - * @name: bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer) + * @name: bool GameGuiFinishedDialog(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * @@ -1152,7 +1156,7 @@ void GameGuiClearPassengersLeft(void) * true if player has pressed PAD_CROSS so gameplay is exited. * * **********************************************************************************************/ -bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer) +bool GameGuiFinishedDialog(TYPE_PLAYER* const ptrPlayer) { GfxSaveDisplayData(&SecondDisplay); @@ -1160,7 +1164,7 @@ bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer) do { - if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) != false) + if (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS)) { return true; } @@ -1178,14 +1182,14 @@ bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer) GfxDrawScene_Slow(); - }while (ptrPlayer->PadKeySinglePress_Callback(PAD_START) == false); + } while (ptrPlayer->PadKeySinglePress_Callback(PAD_START) == false); return false; } /* ********************************************************************************************** * - * @name: void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer) + * @name: void GameGuiAircraftCollision(TYPE_PLAYER* const ptrPlayer) * * @author: Xavier Del Campo * @@ -1197,7 +1201,7 @@ bool GameGuiFinishedDialog(TYPE_PLAYER* ptrPlayer) * Blocking function. * * **********************************************************************************************/ -void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer) +void GameGuiAircraftCollision(TYPE_PLAYER* const ptrPlayer) { GfxSaveDisplayData(&SecondDisplay); @@ -1210,14 +1214,14 @@ void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer) GsSortGPoly4(&PauseRect); FontPrintText( &SmallFont, - AIRCRAFT_DATA_GSGPOLY4_X0 + 8, - AIRCRAFT_DATA_GSGPOLY4_Y0 + - ( (AIRCRAFT_DATA_GSGPOLY4_Y2 - AIRCRAFT_DATA_GSGPOLY4_Y0) >> 1), - "Collision between aircraft!" ); + AIRCRAFT_DATA_GSGPOLY4_X0 + 8, + AIRCRAFT_DATA_GSGPOLY4_Y0 + + ( (AIRCRAFT_DATA_GSGPOLY4_Y2 - AIRCRAFT_DATA_GSGPOLY4_Y0) >> 1), + "Collision between aircraft!" ); GfxDrawScene_Slow(); - }while (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) == false); + } while (ptrPlayer->PadKeySinglePress_Callback(PAD_CROSS) == false); } /* ********************************************************************************************** @@ -1232,8 +1236,7 @@ void GameGuiAircraftCollision(TYPE_PLAYER* ptrPlayer) * **********************************************************************************************/ void GameGuiBubbleStop(void) { - Serial_printf("GameGuiBubbleStop\n"); - GameGuiBubbleShowFlag = false; + showBubble = false; } /* ********************************************************************************************** @@ -1248,6 +1251,5 @@ void GameGuiBubbleStop(void) * **********************************************************************************************/ void GameGuiBubbleStopVibration(void) { - Serial_printf("GameGuiBubbleStopVibration\n"); - GameGuiBubbleVibrationFlag = false; + bubbleVibration = false; } diff --git a/Source/GameGui.h b/Source/GameGui.h index 1fd42e0..36b84ae 100644 --- a/Source/GameGui.h +++ b/Source/GameGui.h @@ -26,19 +26,19 @@ void GameGuiInit(void);
bool GameGuiPauseDialog(const TYPE_PLAYER* const ptrPlayer);
-bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* ptrPlayer);
-void GameGuiBubble(TYPE_FLIGHT_DATA* ptrFlightData);
+bool GameGuiShowAircraftDataSpecialConditions(TYPE_PLAYER* const ptrPlayer);
+void GameGuiBubble(TYPE_FLIGHT_DATA* const ptrFlightData);
void GameGuiClock(uint8_t hour, uint8_t min);
-void GameGuiActiveAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData);
-void GameGuiActiveAircraftPage(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData);
+void GameGuiActiveAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData);
+void GameGuiActiveAircraftPage(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData);
void GameGuiCalculateSlowScore(void);
void GameGuiShowScore(void);
-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 GameGuiDrawUnboardingSequence(TYPE_PLAYER* const ptrPlayer);
+void GameGuiAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData);
+bool GameGuiFinishedDialog(TYPE_PLAYER* const ptrPlayer);
+void GameGuiAircraftCollision(TYPE_PLAYER* const ptrPlayer);
void GameGuiBubbleShow(void);
-void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer);
-void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData);
+void GameGuiShowPassengersLeft(TYPE_PLAYER* const ptrPlayer);
+void GameGuiCalculateNextAircraftTime(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const ptrFlightData);
#endif //GAME_GUI_HEADER__
diff --git a/Source/Gfx.c b/Source/Gfx.c index a0bf282..67fd3ed 100644 --- a/Source/Gfx.c +++ b/Source/Gfx.c @@ -242,12 +242,12 @@ void GfxDrawScene_Fast(void) FontSetFlags(&SmallFont, FONT_NOFLAGS); - if (System1SecondTick() != false) + if (System1SecondTick()) { one_second_show = one_second_show? false:true; } - if (System500msTick() != false) + if (System500msTick()) { five_hundred_ms_show = five_hundred_ms_show? false:true; } @@ -290,7 +290,7 @@ void GfxDrawScene(void) while ( (SystemRefreshNeeded() == false) || - (GfxIsGPUBusy() != false) ); + (GfxIsGPUBusy()) ); GfxDrawScene_Fast(); @@ -316,7 +316,7 @@ void GfxDrawScene(void) void GfxDrawScene_Slow(void) { GfxDrawScene(); - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); } /* ********************************************************************** @@ -395,7 +395,7 @@ void GfxSortSprite(GsSprite* spr) } } - if (has_1hz_flash != false) + if (has_1hz_flash) { spr->attribute &= ~(GFX_1HZ_FLASH); } @@ -423,7 +423,7 @@ void GfxSortSprite(GsSprite* spr) GsSortSprite(spr); } - if (has_1hz_flash != false) + if (has_1hz_flash) { spr->attribute |= GFX_1HZ_FLASH; } @@ -545,7 +545,7 @@ bool GfxSpriteFromFile(const char* fname, GsSprite* spr) return false; } - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); gfx_busy = true; @@ -581,7 +581,7 @@ bool GfxCLUTFromFile(const char* fname) return false; } - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); gfx_busy = true; @@ -658,7 +658,7 @@ void GfxDrawButton(short x, short y, unsigned short btn) static short orig_u; static short orig_v; - if (first_entered != false) + if (first_entered) { first_entered = false; orig_u = PSXButtons.u; @@ -787,7 +787,7 @@ void GfxDrawButton(short x, short y, unsigned short btn) void GfxSaveDisplayData(GsSprite *spr) { - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); MoveImage( DispEnv.x, DispEnv.y, @@ -808,7 +808,7 @@ void GfxSaveDisplayData(GsSprite *spr) spr->g = NORMAL_LUMINANCE; spr->b = NORMAL_LUMINANCE; - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); } bool Gfx1HzFlash(void) diff --git a/Source/Global_Inc.h b/Source/Global_Inc.h index a9034cc..be2bd43 100644 --- a/Source/Global_Inc.h +++ b/Source/Global_Inc.h @@ -19,7 +19,7 @@ #ifndef SERIAL_INTERFACE -#define Serial_printf printf +#define Serial_printf dprintf #endif // SERIAL_INTERFACE diff --git a/Source/LoadMenu.c b/Source/LoadMenu.c index f983030..e5e67bc 100644 --- a/Source/LoadMenu.c +++ b/Source/LoadMenu.c @@ -262,21 +262,16 @@ void ISR_LoadMenuVBlank(void) SystemIncreaseGlobalTimer(); - if ( (SystemIsBusy() != false) + if ( (SystemIsBusy()) || - (GfxIsGPUBusy() != false) + (GfxIsGPUBusy()) || - (SerialIsBusy() != false) ) + (SerialIsBusy()) ) { return; } - /*if ( (SystemIsBusy() != false) || (GfxIsGPUBusy() != false) || (SerialIsBusy() != false) ) - { - return; - }*/ - - if (startup_flag != false) + if (startup_flag) { // "Loading..." text if (LoadMenuTitleSpr.r < LOADING_TITLE_LUMINANCE_TARGET) @@ -334,7 +329,7 @@ void ISR_LoadMenuVBlank(void) } } - else if (end_flag != false) + else if (end_flag) { LoadMenuTitleSpr.r -= LOADING_TITLE_LUMINANCE_STEP; LoadMenuTitleSpr.g -= LOADING_TITLE_LUMINANCE_STEP; diff --git a/Source/Makefile b/Source/Makefile index 865d17d..5b43f78 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -11,13 +11,13 @@ GNU_SIZE = mipsel-unknown-elf-size # Custom define flags for GCC DEFINE= -DFIXMATH_FAST_SIN -D_PAL_MODE_ -#DEFINE += -DPSXSDK_DEBUG +DEFINE += -DPSXSDK_DEBUG DEFINE += -DNO_CDDA DEFINE += -DNO_INTRO # Compiler flags LIBS= -lfixmath -CC_FLAGS = -Wall -Werror -c -Os -Wfatal-errors +CC_FLAGS = -Wall -Werror -c -O3 -Wfatal-errors # Path definitions PSXSDK_PATH = /usr/local/psxsdk diff --git a/Source/MemCard.c b/Source/MemCard.c index fdfabb1..e1c4c7e 100644 --- a/Source/MemCard.c +++ b/Source/MemCard.c @@ -181,7 +181,7 @@ void ISR_MemCardDataHandling(void) uint8_t i;
- if ( (GfxIsGPUBusy() != false) || (SystemIsBusy() != false) )
+ if ( (GfxIsGPUBusy()) || (SystemIsBusy()) )
{
return;
}
@@ -712,7 +712,7 @@ bool MemCardReadSector(TYPE_BLOCK_DATA * ptrBlockData, int sector) return false;
}
- while (GfxIsGPUBusy() != false);
+ while (GfxIsGPUBusy());
result = McReadSector(ptrBlockData->Slot, sector, DataBuffer);
@@ -817,7 +817,7 @@ void MemCardIconIndexHandler(void) {
static uint8_t iconTimer = 0;
- if (System100msTick() != false)
+ if (System100msTick())
{
if (++iconTimer >= MEMCARD_ICON_INDEX_TIME)
{
@@ -872,7 +872,7 @@ void MemCardDrawIcon(TYPE_BLOCK_DATA * ptrBlockData, short x, short y) }
- if (first_access != false)
+ if (first_access)
{
if (IconIndex == 0)
{
@@ -966,36 +966,36 @@ TYPE_BLOCK_DATA * MemCardShowMap(void) while (1)
{
- if (PadOneKeyReleased(PAD_TRIANGLE) != false)
+ if (PadOneKeyReleased(PAD_TRIANGLE))
{
break;
}
- else if (PadOneKeyReleased(PAD_CROSS) != false)
+ else if (PadOneKeyReleased(PAD_CROSS))
{
return &MemCardData[selectedBlock - BLOCK_1][selectedSlot];
}
- else if (PadOneKeyReleased(PAD_LEFT) != false)
+ else if (PadOneKeyReleased(PAD_LEFT))
{
if (selectedSlot == SLOT_TWO)
{
selectedSlot = SLOT_ONE;
}
}
- else if (PadOneKeyReleased(PAD_RIGHT) != false)
+ else if (PadOneKeyReleased(PAD_RIGHT))
{
if (selectedSlot == SLOT_ONE)
{
selectedSlot = SLOT_TWO;
}
}
- else if (PadOneKeyReleased(PAD_UP) != false)
+ else if (PadOneKeyReleased(PAD_UP))
{
if (selectedBlock > BLOCK_1)
{
selectedBlock--;
}
}
- else if (PadOneKeyReleased(PAD_DOWN) != false)
+ else if (PadOneKeyReleased(PAD_DOWN))
{
if (selectedBlock < BLOCK_15)
{
diff --git a/Source/Menu.c b/Source/Menu.c index 2097600..8ade191 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -557,7 +557,7 @@ static void MainMenuRenderLevelList(void) } } - if (isLevelSelected != false) + if (isLevelSelected) { levelListSelectionRect.y[0] = LEVEL_LIST_PLT_TEXT_Y + (short)(SelectedPlt << 3); levelListSelectionRect.y[1] = levelListSelectionRect.y[0]; @@ -612,7 +612,7 @@ static void MainMenuButtonHandler(void) static uint8_t previous_btn_selected = 0; uint8_t max_buttons = 0; - if (PadOneAnyKeyPressed() != false) + if (PadOneAnyKeyPressed()) { if (SystemIsRandSeedSet() == false) { @@ -620,9 +620,9 @@ static void MainMenuButtonHandler(void) } } - if ( (PadOneKeySinglePress(PAD_CROSS) != false) + if ( (PadOneKeySinglePress(PAD_CROSS)) || - (PadOneKeySinglePress(PAD_TRIANGLE) != false) ) + (PadOneKeySinglePress(PAD_TRIANGLE)) ) { SfxPlaySound(&AcceptSnd); } @@ -646,7 +646,7 @@ static void MainMenuButtonHandler(void) max_buttons = MAIN_MENU_ONE_TWO_PLAYERS_LEVEL_BUTTONS; } - if (PadOneKeySinglePress(PAD_TRIANGLE) != false) + if (PadOneKeySinglePress(PAD_TRIANGLE)) { menuLevel = PLAY_OPTIONS_LEVEL; MainMenuMinimumBtn = PLAY_BUTTON_INDEX; @@ -656,7 +656,7 @@ static void MainMenuButtonHandler(void) break; case LEVEL_LIST_LEVEL: - if (PadOneKeySinglePress(PAD_UP) != false) + if (PadOneKeySinglePress(PAD_UP)) { if (isLevelSelected == false) { @@ -674,7 +674,7 @@ static void MainMenuButtonHandler(void) } } } - else if (PadOneKeySinglePress(PAD_DOWN) != false) + else if (PadOneKeySinglePress(PAD_DOWN)) { if (isLevelSelected == false) { @@ -692,7 +692,7 @@ static void MainMenuButtonHandler(void) } } } - else if (PadOneKeySinglePress(PAD_TRIANGLE) != false) + else if (PadOneKeySinglePress(PAD_TRIANGLE)) { if (isLevelSelected == true) { @@ -787,7 +787,7 @@ static void MainMenuDrawButton(TYPE_MMBtn* btn) btn->timer++; } - if (btn->selected != false) + if (btn->selected) { if (btn->was_selected == false) { diff --git a/Source/Message.c b/Source/Message.c index 026bcc9..df2f8ee 100644 --- a/Source/Message.c +++ b/Source/Message.c @@ -62,13 +62,13 @@ void MessageHandler(void) { uint8_t i; - if (System1SecondTick() != false) + if (System1SecondTick()) { for (i = 0; i < MESSAGE_FIFO_SIZE; i++) { TYPE_MESSAGE_DATA* ptrMessage = &tMessageFIFO[i]; - if (ptrMessage->used != false) + if (ptrMessage->used) { if (ptrMessage->Timeout == 0) { diff --git a/Source/PSXSDKIntro.c b/Source/PSXSDKIntro.c index 8949fd2..af25487 100644 --- a/Source/PSXSDKIntro.c +++ b/Source/PSXSDKIntro.c @@ -177,18 +177,18 @@ void PSXSDKIntro(void) while (1) { - while (GfxIsGPUBusy() != false); + while (GfxIsGPUBusy()); if ( ( (GfxGetGlobalLuminance() - BG_LUMINANCE_STEP) > 0) && - (PSXSDKIntroClose != false) ) + (PSXSDKIntroClose) ) { GfxIncreaseGlobalLuminance(-BG_LUMINANCE_STEP); } if ( (GfxGetGlobalLuminance() <= BG_LUMINANCE_STEP) && - (PSXSDKIntroClose != false) ) + (PSXSDKIntroClose) ) { break; } @@ -197,7 +197,7 @@ void PSXSDKIntro(void) for (i = 0; i < strlen(strPSXSDKIntro) ; i++) { - if ( (PSXSDKIntroRandTextEvent != false) + if ( (PSXSDKIntroRandTextEvent) && (PSXSDKIntroStringEvent == false) ) { @@ -217,13 +217,13 @@ void PSXSDKIntro(void) OpenSource_Logo.g = 0; OpenSource_Logo.b = 0; } - else if ( (PSXSDKIntroRandTextEvent != false) + else if ( (PSXSDKIntroRandTextEvent) && - (PSXSDKIntroStringEvent != false) ) + (PSXSDKIntroStringEvent) ) { PSXSDKIntroDrawChar(FONT_X + (i << FONT_SIZE_BITSHIFT),FONT_Y,strPSXSDKIntro[i]); - if (System100msTick() != false) + if (System100msTick()) { if (GPL_Logo.r < GPL_LOGO_LUMINANCE_TARGET) { @@ -253,15 +253,15 @@ void PSXSDKIntro(void) for (i = 0; i < strlen(strPSXSDKIntroAuthor) ; i++) { - if ( (PSXSDKIntroRandTextEvent != false) + if ( (PSXSDKIntroRandTextEvent) && (PSXSDKIntroStringEvent == false) ) { PSXSDKIntroDrawChar(FONT_X2 + (i << FONT_SIZE_BITSHIFT),FONT_Y2,SystemRand('A','Z')); } - else if ( (PSXSDKIntroRandTextEvent != false) + else if ( (PSXSDKIntroRandTextEvent) && - (PSXSDKIntroStringEvent != false) ) + (PSXSDKIntroStringEvent) ) { PSXSDKIntroDrawChar(FONT_X2 + (i << FONT_SIZE_BITSHIFT),FONT_Y2,strPSXSDKIntroAuthor[i]); } @@ -271,7 +271,7 @@ void PSXSDKIntro(void) PSXSDKIntroDrawDisk(); - if (PSXSDKIntroCloseShellEvent != false) + if (PSXSDKIntroCloseShellEvent) { if (PSXSDKIntroCloseShellEventReminder == false) { @@ -329,7 +329,7 @@ void PSXSDKIntroRunTimers(void) if ( (intro_timer >= DISK_SPIN_EV_TIM) && - (PSXSDKIntroCloseShellEvent != false) + (PSXSDKIntroCloseShellEvent) && (PSXSDKIntroSpinDiskEvent == false) ) { @@ -339,9 +339,9 @@ void PSXSDKIntroRunTimers(void) if ( (intro_timer >= TEXT_APPEAR_RANDOM_TIM) && - (PSXSDKIntroCloseShellEvent != false) + (PSXSDKIntroCloseShellEvent) && - (PSXSDKIntroSpinDiskEvent != false) + (PSXSDKIntroSpinDiskEvent) && (PSXSDKIntroRandTextEvent == false) ) { @@ -351,11 +351,11 @@ void PSXSDKIntroRunTimers(void) if ( (intro_timer >= TEXT_APPEAR_STRING_TIM) && - (PSXSDKIntroCloseShellEvent != false) + (PSXSDKIntroCloseShellEvent) && - (PSXSDKIntroSpinDiskEvent != false) + (PSXSDKIntroSpinDiskEvent) && - (PSXSDKIntroRandTextEvent != false) + (PSXSDKIntroRandTextEvent) && (PSXSDKIntroStringEvent == false) ) { @@ -366,13 +366,13 @@ void PSXSDKIntroRunTimers(void) if ( (intro_timer >= INTRO_CLOSE_TIM) && - (PSXSDKIntroCloseShellEvent != false) + (PSXSDKIntroCloseShellEvent) && - (PSXSDKIntroSpinDiskEvent != false) + (PSXSDKIntroSpinDiskEvent) && - (PSXSDKIntroRandTextEvent != false) + (PSXSDKIntroRandTextEvent) && - (PSXSDKIntroStringEvent != false) ) + (PSXSDKIntroStringEvent) ) { PSXSDKIntroClose = true; intro_timer = 0; @@ -396,7 +396,7 @@ void PSXSDKIntroDrawDisk(void) PsxDisk.u = DISK_U; PsxDisk.v = DISK_V; - if (PSXSDKIntroSpinDiskEvent != false) + if (PSXSDKIntroSpinDiskEvent) { if (PSXSDKIntroSpinDiskEventReminder == false) { diff --git a/Source/Pad.c b/Source/Pad.c index 1d47371..0af5007 100644 --- a/Source/Pad.c +++ b/Source/Pad.c @@ -170,46 +170,46 @@ bool PadOneAnyKeyPressed(void) bool PadOneDirectionKeyPressed(void) { - return ( (PadOneKeyPressed(PAD_UP) != false) + return ( (PadOneKeyPressed(PAD_UP)) || - (PadOneKeyPressed(PAD_LEFT) != false) + (PadOneKeyPressed(PAD_LEFT)) || - (PadOneKeyPressed(PAD_RIGHT) != false) + (PadOneKeyPressed(PAD_RIGHT)) || - (PadOneKeyPressed(PAD_DOWN) != false) ); + (PadOneKeyPressed(PAD_DOWN)) ); } bool PadOneDirectionKeyReleased(void) { - return ( (PadOneKeyReleased(PAD_UP) != false) + return ( (PadOneKeyReleased(PAD_UP)) || - (PadOneKeyReleased(PAD_LEFT) != false) + (PadOneKeyReleased(PAD_LEFT)) || - (PadOneKeyReleased(PAD_RIGHT) != false) + (PadOneKeyReleased(PAD_RIGHT)) || - (PadOneKeyReleased(PAD_DOWN) != false) ); + (PadOneKeyReleased(PAD_DOWN)) ); } bool PadTwoDirectionKeyReleased(void) { - return ( (PadTwoKeyReleased(PAD_UP) != false) + return ( (PadTwoKeyReleased(PAD_UP)) || - (PadTwoKeyReleased(PAD_LEFT) != false) + (PadTwoKeyReleased(PAD_LEFT)) || - (PadTwoKeyReleased(PAD_RIGHT) != false) + (PadTwoKeyReleased(PAD_RIGHT)) || - (PadTwoKeyReleased(PAD_DOWN) != false) ); + (PadTwoKeyReleased(PAD_DOWN)) ); } bool PadTwoDirectionKeyPressed(void) { - return ( (PadTwoKeyPressed(PAD_UP) != false) + return ( (PadTwoKeyPressed(PAD_UP)) || - (PadTwoKeyPressed(PAD_LEFT) != false) + (PadTwoKeyPressed(PAD_LEFT)) || - (PadTwoKeyPressed(PAD_RIGHT) != false) + (PadTwoKeyPressed(PAD_RIGHT)) || - (PadTwoKeyPressed(PAD_DOWN) != false) ); + (PadTwoKeyPressed(PAD_DOWN)) ); } bool PadTwoAnyKeyPressed(void) @@ -279,7 +279,7 @@ bool PadTwoKeyRepeat(unsigned short key, uint8_t time) void PadOneVibrationHandler(void) { - if (PadOneIsVibrationEnabled() != false) + if (PadOneIsVibrationEnabled()) { pad_enable_vibration(PAD_ONE); pad_set_vibration(PAD_ONE,pad1_small_vibration_force,pad1_big_vibration_force); @@ -289,7 +289,7 @@ void PadOneVibrationHandler(void) void PadTwoVibrationHandler(void) { - if (PadTwoIsVibrationEnabled() != false) + if (PadTwoIsVibrationEnabled()) { pad_enable_vibration(PAD_TWO); pad_set_vibration(PAD_TWO,pad2_small_vibration_force,pad2_big_vibration_force); @@ -503,7 +503,7 @@ void PadCheatHandler(uint8_t n_pad) { if (cheatsArray[i] != NULL) { - if (SystemArrayCompare(cheat_array, cheatsArray[i]->Combination, CHEAT_ARRAY_SIZE) != false) + if (SystemArrayCompare(cheat_array, cheatsArray[i]->Combination, CHEAT_ARRAY_SIZE)) { if (cheatsArray[i]->Callback != NULL) { @@ -522,7 +522,7 @@ void PadCheatHandler(uint8_t n_pad) for (i = 0; i < sizeof (available_keys) / sizeof (unsigned short); i++) { - if (pressed_callback(available_keys[i]) != false) + if (pressed_callback(available_keys[i])) { TimerRestart(timer); key = available_keys[i]; diff --git a/Source/PltParser.c b/Source/PltParser.c index 56737fc..4d01135 100644 --- a/Source/PltParser.c +++ b/Source/PltParser.c @@ -26,9 +26,9 @@ * Local Prototypes * *************************************/ -static void PltParserResetBuffers(TYPE_FLIGHT_DATA* ptrFlightData); +static void PltParserResetBuffers(TYPE_FLIGHT_DATA* const ptrFlightData); -bool PltParserLoadFile(const char* strPath, TYPE_FLIGHT_DATA* ptrFlightData) +bool PltParserLoadFile(const char* strPath, TYPE_FLIGHT_DATA* const ptrFlightData) { enum { @@ -314,7 +314,7 @@ bool PltParserLoadFile(const char* strPath, TYPE_FLIGHT_DATA* ptrFlightData) return true; } -void PltParserResetBuffers(TYPE_FLIGHT_DATA* ptrFlightData) +void PltParserResetBuffers(TYPE_FLIGHT_DATA* const ptrFlightData) { uint8_t i; diff --git a/Source/PltParser.h b/Source/PltParser.h index 1515a9a..2cce6da 100644 --- a/Source/PltParser.h +++ b/Source/PltParser.h @@ -16,7 +16,7 @@ /* ************************************* * Global prototypes * *************************************/ -bool PltParserLoadFile(const char* strPath, TYPE_FLIGHT_DATA* ptrFlightData); +bool PltParserLoadFile(const char* strPath, TYPE_FLIGHT_DATA* const ptrFlightData); uint8_t* PltParserGenerateFile(TYPE_PLT_CONFIG* ptrPltConfig); /* ************************************* diff --git a/Source/Serial.c b/Source/Serial.c index 528e97b..57d9bb4 100644 --- a/Source/Serial.c +++ b/Source/Serial.c @@ -56,7 +56,7 @@ bool SerialRead(uint8_t* ptrArray, size_t nBytes) while ( (SIOCheckInBuffer() == SERIAL_RX_FIFO_EMPTY)); // Wait for RX FIFO not empty *(ptrArray++) = SIOReadByte(); - }while (--nBytes); + } while (--nBytes); return true; } @@ -79,7 +79,7 @@ bool SerialWrite(void* ptrArray, size_t nBytes) SIOSendByte(*(uint8_t*)ptrArray++); - }while (--nBytes); + } while (--nBytes); serial_busy = false; diff --git a/Source/Sfx.c b/Source/Sfx.c index ded505e..9cb0c94 100644 --- a/Source/Sfx.c +++ b/Source/Sfx.c @@ -46,7 +46,7 @@ bool SfxUploadSound_Ex(const char* file_path, SsVag* vag, uint8_t voiceIndex) return false; } - if (usedVoices[voiceIndex] != false) + if (usedVoices[voiceIndex]) { Serial_printf("Voice number %d is already being used.\n", voiceIndex); return false; diff --git a/Source/System.c b/Source/System.c index d17a704..5295e46 100644 --- a/Source/System.c +++ b/Source/System.c @@ -234,7 +234,7 @@ bool SystemRefreshNeeded(void) * *******************************************************************/ void ISR_SystemDefaultVBlank(void) { - if (System1SecondTick() != false) + if (System1SecondTick()) { fps = temp_fps; temp_fps = 0; @@ -454,7 +454,7 @@ void SystemRunTimers(void) * *******************************************************************************/ void SystemCheckTimer(bool* timer, uint64_t* last_timer, uint8_t step) { - if (*timer != false) + if (*timer) { *timer = false; } @@ -489,7 +489,7 @@ bool SystemLoadFileToBuffer(const char* fname, uint8_t* buffer, uint32_t szBuffe int32_t size = 0; // Wait for possible previous operation from the GPU before entering this section. - while ( (SystemIsBusy() != false) || (GfxIsGPUBusy() != false) ); + while ( (SystemIsBusy()) || (GfxIsGPUBusy()) ); SystemDisableRCnt2Interrupt(); @@ -1127,7 +1127,7 @@ void SystemDevMenu(void) DEVMENU_ROOTCNT2_TEXT_Y = DEVMENU_PAD2_RAW_DATA_TEXT_Y + DEVMENU_TEXT_GAP, }; - if (devmenu_flag != false) + if (devmenu_flag) { GsRectangle devMenuBg = { .x = DEVMENU_BG_X, .y = DEVMENU_BG_Y, diff --git a/Source/System.h b/Source/System.h index a5417b1..12c0079 100644 --- a/Source/System.h +++ b/Source/System.h @@ -13,6 +13,8 @@ #define TIMER_PRESCALER_1_SECOND 10 #define TIMER_PRESCALER_1_MINUTE (TIMER_PRESCALER_1_SECOND * 60) +#define ARRAY_SIZE(x) (sizeof ((x)) / sizeof ((x[0]))) + /* ************************************** * Global Prototypes * * **************************************/ diff --git a/Source/Timer.c b/Source/Timer.c index abbb9c7..52030ea 100644 --- a/Source/Timer.c +++ b/Source/Timer.c @@ -113,9 +113,9 @@ void TimerHandler(void) for (i = 0; i < MAX_TIMERS; i++) { - if (timer_array[i].busy != false) + if (timer_array[i].busy) { - if (System100msTick() != false) + if (System100msTick()) { timer_array[i].time--; @@ -123,7 +123,7 @@ void TimerHandler(void) { timer_array[i].Timeout_Callback(); - if (timer_array[i].repeat_flag != false) + if (timer_array[i].repeat_flag) { timer_array[i].time = timer_array[i].orig_time; } diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/.qmake.stash b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/.qmake.stash new file mode 100644 index 0000000..17a7f33 --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/.qmake.stash @@ -0,0 +1,24 @@ +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/7 \ + /usr/include/x86_64-linux-gnu/c++/7 \ + /usr/include/c++/7/backward \ + /usr/lib/gcc/x86_64-linux-gnu/7/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \ + /usr/include/x86_64-linux-gnu \ + /usr/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/7 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib +QMAKE_CXX.QT_COMPILER_STDCXX = 201402L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/Makefile b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/Makefile new file mode 100644 index 0000000..94259f2 --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/Makefile @@ -0,0 +1,1438 @@ +############################################################################# +# Makefile for building: MapEditor +# Generated by qmake (3.1) (Qt 5.12.0) +# Project: ../MapEditor/MapEditor.pro +# Template: app +# Command: /home/xavier/Qt/5.12.0/gcc_64/bin/qmake -o Makefile ../MapEditor/MapEditor.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug +############################################################################# + +MAKEFILE = Makefile + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_QML_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -funsigned-char -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) +INCPATH = -I../MapEditor -I. -I../../../Qt/5.12.0/gcc_64/include -I../../../Qt/5.12.0/gcc_64/include/QtWidgets -I../../../Qt/5.12.0/gcc_64/include/QtGui -I../../../Qt/5.12.0/gcc_64/include/QtCore -I. -isystem /usr/include/libdrm -I. -I../../../Qt/5.12.0/gcc_64/mkspecs/linux-g++ +QMAKE = /home/xavier/Qt/5.12.0/gcc_64/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = cp -f +COPY_DIR = cp -f -R +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = cp -f -R +QINSTALL = /home/xavier/Qt/5.12.0/gcc_64/bin/qmake -install qinstall +QINSTALL_PROGRAM = /home/xavier/Qt/5.12.0/gcc_64/bin/qmake -install qinstall -exe +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +TAR = tar -cf +COMPRESS = gzip -9f +DISTNAME = MapEditor1.0.0 +DISTDIR = /home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/.tmp/MapEditor1.0.0 +LINK = g++ +LFLAGS = +LIBS = $(SUBLIBS) -L/home/xavier/Qt/5.12.0/gcc_64/lib -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread +AR = ar cqs +RANLIB = +SED = sed +STRIP = strip + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = ../MapEditor/main.cpp \ + ../MapEditor/mainwindow.cpp \ + ../MapEditor/mygraphicsscene.cpp moc_mainwindow.cpp \ + moc_mygraphicsscene.cpp +OBJECTS = main.o \ + mainwindow.o \ + mygraphicsscene.o \ + moc_mainwindow.o \ + moc_mygraphicsscene.o +DIST = ../../Sprites/Tileset1.bmp \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_pre.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/linux.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/sanitize.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base-unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-base.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/qconfig.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_accessibility_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_edid_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_egl_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fb_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_glx_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_input_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_kms_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediagsttools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldebug_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickshapes_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_service_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_theme_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_functions.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_config.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/linux-g++/qmake.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_post.prf \ + ../MapEditor/.qmake.stash \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/exclusive_builds.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/toolchain.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/default_pre.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/resolve_config.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/default_post.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qml_debug.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/warn_on.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/resources.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/moc.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/opengl.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/uic.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/thread.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qmake_use.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/file_copies.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/testcase_targets.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/exceptions.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/yacc.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/lex.prf \ + ../MapEditor/MapEditor.pro ../MapEditor/mainwindow.h \ + ../MapEditor/mygraphicsscene.h ../MapEditor/main.cpp \ + ../MapEditor/mainwindow.cpp \ + ../MapEditor/mygraphicsscene.cpp +QMAKE_TARGET = MapEditor +DESTDIR = +TARGET = MapEditor + + +first: all +####### Build rules + +MapEditor: ui_mainwindow.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: ../MapEditor/MapEditor.pro ../../../Qt/5.12.0/gcc_64/mkspecs/linux-g++/qmake.conf ../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_pre.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/linux.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/sanitize.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base-unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-base.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-unix.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/qconfig.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_accessibility_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_edid_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_egl_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fb_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_glx_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_input_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_kms_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediagsttools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldebug_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickshapes_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_service_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_theme_support_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_functions.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_config.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/linux-g++/qmake.conf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_post.prf \ + .qmake.stash \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/exclusive_builds.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/toolchain.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/default_pre.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/resolve_config.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/default_post.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qml_debug.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/warn_on.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qt.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/resources.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/moc.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/opengl.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/uic.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/thread.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/qmake_use.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/file_copies.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/testcase_targets.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/exceptions.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/yacc.prf \ + ../../../Qt/5.12.0/gcc_64/mkspecs/features/lex.prf \ + ../MapEditor/MapEditor.pro \ + ../../../Qt/5.12.0/gcc_64/lib/libQt5Widgets.prl \ + ../../../Qt/5.12.0/gcc_64/lib/libQt5Gui.prl \ + ../../../Qt/5.12.0/gcc_64/lib/libQt5Core.prl + $(QMAKE) -o Makefile ../MapEditor/MapEditor.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug +../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_pre.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/unix.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/linux.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/sanitize.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/gcc-base-unix.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-base.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/common/g++-unix.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/qconfig.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3danimation_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dextras_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dlogic_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickanimation_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickextras_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickinput_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickrender_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3dquickscene2d_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_3drender_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_accessibility_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_core_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designer_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_devicediscovery_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_edid_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_egl_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fb_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_fontdatabase_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gamepad_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_glx_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_gui_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_help_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_input_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_kms_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_location_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediagsttools_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_network_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_packetprotocol_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_platformcompositor_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_positioningquick_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qml_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldebug_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quick_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickcontrols2_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickshapes_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quicktemplates2_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_remoteobjects_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_repparser_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_scxml_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialbus_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_service_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_sql_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_svg_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_texttospeech_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_theme_support_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandclient_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_waylandcompositor_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_webview_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xml_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri: +../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_functions.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/qt_config.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/linux-g++/qmake.conf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/spec_post.prf: +.qmake.stash: +../../../Qt/5.12.0/gcc_64/mkspecs/features/exclusive_builds.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/toolchain.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/default_pre.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/resolve_config.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/default_post.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/qml_debug.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/warn_on.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/qt.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/resources.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/moc.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/opengl.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/uic.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/unix/thread.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/qmake_use.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/file_copies.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/testcase_targets.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/exceptions.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/yacc.prf: +../../../Qt/5.12.0/gcc_64/mkspecs/features/lex.prf: +../MapEditor/MapEditor.pro: +../../../Qt/5.12.0/gcc_64/lib/libQt5Widgets.prl: +../../../Qt/5.12.0/gcc_64/lib/libQt5Gui.prl: +../../../Qt/5.12.0/gcc_64/lib/libQt5Core.prl: +qmake: FORCE + @$(QMAKE) -o Makefile ../MapEditor/MapEditor.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug + +qmake_all: FORCE + + +all: Makefile MapEditor + +dist: distdir FORCE + (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) + +distdir: FORCE + @test -d $(DISTDIR) || mkdir -p $(DISTDIR) + $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ + $(COPY_FILE) --parents ../../../Qt/5.12.0/gcc_64/mkspecs/features/data/dummy.cpp $(DISTDIR)/ + $(COPY_FILE) --parents ../MapEditor/mainwindow.h ../MapEditor/mygraphicsscene.h $(DISTDIR)/ + $(COPY_FILE) --parents ../MapEditor/main.cpp ../MapEditor/mainwindow.cpp ../MapEditor/mygraphicsscene.cpp $(DISTDIR)/ + $(COPY_FILE) --parents ../MapEditor/mainwindow.ui $(DISTDIR)/ + + +clean: compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) .qmake.stash + -$(DEL_FILE) Makefile + + +####### Sub-libraries + +mocclean: compiler_moc_header_clean compiler_moc_objc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_objc_header_make_all compiler_moc_source_make_all + +check: first + +benchmark: first + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_moc_predefs_make_all: moc_predefs.h +compiler_moc_predefs_clean: + -$(DEL_FILE) moc_predefs.h +moc_predefs.h: ../../../Qt/5.12.0/gcc_64/mkspecs/features/data/dummy.cpp + g++ -pipe -funsigned-char -g -Wall -W -dM -E -o moc_predefs.h ../../../Qt/5.12.0/gcc_64/mkspecs/features/data/dummy.cpp + +compiler_moc_header_make_all: moc_mainwindow.cpp moc_mygraphicsscene.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_mainwindow.cpp moc_mygraphicsscene.cpp +moc_mainwindow.cpp: ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMainWindow \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgetsglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtguiglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtcore-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsystemdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qprocessordetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtypeinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsysinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlogging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qflags.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbasicatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qgenericatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_msvc.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobalstatic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmutex.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnumeric.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qversiontagging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtgui-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgets-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnamespace.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs_win.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstring.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qchar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrefcount.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qarraydata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringliteral.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringbuilder.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiterator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhashfunctions.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpair.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearraylist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregexp.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringmatcher.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qscopedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmetatype.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmargins.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpaintdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrect.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsize.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpoint.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpalette.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcolor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgb.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgba64.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qbrush.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvector.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qmatrix.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpolygon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qregion.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdatastream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiodevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qline.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtransform.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainterpath.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qimage.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixelformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qshareddata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhash.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfont.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontmetrics.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qsizepolicy.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qkeysequence.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvariant.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdebug.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtextstream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlocale.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qset.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontiguouscache.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurlquery.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfile.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfiledevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvector2d.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtouchdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qicon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QFileDialog \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qfiledialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdir.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfileinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QSettings \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsettings.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QDebug \ + ../MapEditor/mygraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsScene \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpen.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicssceneevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QPointF \ + ui_mainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QVariant \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QApplication \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qeventloop.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdesktopwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qguiapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qinputmethod.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QCheckBox \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qcheckbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsView \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainter.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qframe.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGridLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgridlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayoutitem.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qboxlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QHBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLabel \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlabel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLineEdit \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlineedit.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QListWidget \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qabstractitemmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qitemselectionmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyleoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractspinbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvalidator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregularexpression.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyle.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qrubberband.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMenuBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenubar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenu.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qaction.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qactiongroup.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QPushButton \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qpushbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QStatusBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstatusbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QToolBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtoolbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QVBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QWidget \ + ../MapEditor/mainwindow.h \ + moc_predefs.h \ + ../../../Qt/5.12.0/gcc_64/bin/moc + /home/xavier/Qt/5.12.0/gcc_64/bin/moc $(DEFINES) --include /home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_predefs.h -I/home/xavier/Qt/5.12.0/gcc_64/mkspecs/linux-g++ -I/home/xavier/Airport/Source/MapEditor -I/home/xavier/Qt/5.12.0/gcc_64/include -I/home/xavier/Qt/5.12.0/gcc_64/include/QtWidgets -I/home/xavier/Qt/5.12.0/gcc_64/include/QtGui -I/home/xavier/Qt/5.12.0/gcc_64/include/QtCore -I. -I/usr/include/c++/7 -I/usr/include/x86_64-linux-gnu/c++/7 -I/usr/include/c++/7/backward -I/usr/lib/gcc/x86_64-linux-gnu/7/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include ../MapEditor/mainwindow.h -o moc_mainwindow.cpp + +moc_mygraphicsscene.cpp: ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsScene \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgetsglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtguiglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtcore-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsystemdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qprocessordetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtypeinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsysinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlogging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qflags.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbasicatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qgenericatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_msvc.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobalstatic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmutex.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnumeric.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qversiontagging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtgui-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgets-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnamespace.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstring.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qchar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrefcount.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qarraydata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringliteral.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringbuilder.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiterator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhashfunctions.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpair.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearraylist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregexp.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringmatcher.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qscopedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmetatype.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpoint.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrect.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmargins.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsize.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qbrush.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvector.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcolor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgb.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgba64.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qmatrix.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpolygon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qregion.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs_win.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdatastream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiodevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qline.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtransform.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainterpath.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qimage.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpaintdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixelformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qshareddata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhash.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfont.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpen.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicssceneevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qset.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QPointF \ + ../MapEditor/mygraphicsscene.h \ + moc_predefs.h \ + ../../../Qt/5.12.0/gcc_64/bin/moc + /home/xavier/Qt/5.12.0/gcc_64/bin/moc $(DEFINES) --include /home/xavier/Airport/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_predefs.h -I/home/xavier/Qt/5.12.0/gcc_64/mkspecs/linux-g++ -I/home/xavier/Airport/Source/MapEditor -I/home/xavier/Qt/5.12.0/gcc_64/include -I/home/xavier/Qt/5.12.0/gcc_64/include/QtWidgets -I/home/xavier/Qt/5.12.0/gcc_64/include/QtGui -I/home/xavier/Qt/5.12.0/gcc_64/include/QtCore -I. -I/usr/include/c++/7 -I/usr/include/x86_64-linux-gnu/c++/7 -I/usr/include/c++/7/backward -I/usr/lib/gcc/x86_64-linux-gnu/7/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include ../MapEditor/mygraphicsscene.h -o moc_mygraphicsscene.cpp + +compiler_moc_objc_header_make_all: +compiler_moc_objc_header_clean: +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_mainwindow.h +compiler_uic_clean: + -$(DEL_FILE) ui_mainwindow.h +ui_mainwindow.h: ../MapEditor/mainwindow.ui \ + ../../../Qt/5.12.0/gcc_64/bin/uic + /home/xavier/Qt/5.12.0/gcc_64/bin/uic ../MapEditor/mainwindow.ui -o ui_mainwindow.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean compiler_uic_clean + +####### Compile + +main.o: ../MapEditor/main.cpp ../MapEditor/mainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMainWindow \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgetsglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtguiglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtcore-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsystemdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qprocessordetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtypeinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsysinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlogging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qflags.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbasicatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qgenericatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_msvc.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobalstatic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmutex.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnumeric.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qversiontagging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtgui-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgets-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnamespace.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs_win.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstring.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qchar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrefcount.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qarraydata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringliteral.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringbuilder.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiterator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhashfunctions.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpair.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearraylist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregexp.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringmatcher.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qscopedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmetatype.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmargins.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpaintdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrect.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsize.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpoint.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpalette.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcolor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgb.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgba64.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qbrush.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvector.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qmatrix.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpolygon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qregion.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdatastream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiodevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qline.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtransform.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainterpath.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qimage.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixelformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qshareddata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhash.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfont.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontmetrics.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qsizepolicy.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qkeysequence.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvariant.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdebug.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtextstream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlocale.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qset.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontiguouscache.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurlquery.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfile.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfiledevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvector2d.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtouchdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qicon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QFileDialog \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qfiledialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdir.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfileinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QSettings \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsettings.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QDebug \ + ../MapEditor/mygraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsScene \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpen.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicssceneevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QPointF \ + ui_mainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QVariant \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QApplication \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qeventloop.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdesktopwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qguiapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qinputmethod.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QCheckBox \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qcheckbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsView \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainter.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qframe.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGridLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgridlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayoutitem.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qboxlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QHBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLabel \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlabel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLineEdit \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlineedit.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QListWidget \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qabstractitemmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qitemselectionmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyleoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractspinbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvalidator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregularexpression.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyle.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qrubberband.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMenuBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenubar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenu.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qaction.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qactiongroup.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QPushButton \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qpushbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QStatusBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstatusbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QToolBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtoolbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QVBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QWidget + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../MapEditor/main.cpp + +mainwindow.o: ../MapEditor/mainwindow.cpp ../MapEditor/mainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMainWindow \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgetsglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtguiglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtcore-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsystemdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qprocessordetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtypeinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsysinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlogging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qflags.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbasicatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qgenericatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_msvc.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobalstatic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmutex.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnumeric.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qversiontagging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtgui-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgets-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnamespace.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs_win.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstring.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qchar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrefcount.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qarraydata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringliteral.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringbuilder.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiterator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhashfunctions.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpair.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearraylist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregexp.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringmatcher.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qscopedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmetatype.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmargins.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpaintdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrect.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsize.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpoint.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpalette.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcolor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgb.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgba64.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qbrush.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvector.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qmatrix.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpolygon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qregion.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdatastream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiodevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qline.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtransform.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainterpath.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qimage.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixelformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qshareddata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhash.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfont.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontmetrics.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfontinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qsizepolicy.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qkeysequence.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvariant.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdebug.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtextstream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlocale.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qset.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontiguouscache.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qurlquery.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfile.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfiledevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvector2d.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtouchdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qicon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QFileDialog \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qfiledialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdir.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qfileinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QSettings \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsettings.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QDebug \ + ../MapEditor/mygraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsScene \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpen.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicssceneevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QPointF \ + ui_mainwindow.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QVariant \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QApplication \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qeventloop.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qdesktopwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qguiapplication.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qinputmethod.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QCheckBox \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qcheckbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsView \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainter.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractscrollarea.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qframe.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGridLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgridlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlayoutitem.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qboxlayout.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QHBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLabel \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlabel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QLineEdit \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlineedit.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextcursor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtextformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QListWidget \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistwidget.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qlistview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qabstractitemmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qitemselectionmodel.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyleoption.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractspinbox.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qvalidator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregularexpression.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qabstractslider.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstyle.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtabbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qrubberband.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMenuBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenubar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmenu.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qaction.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qactiongroup.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QPushButton \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qpushbutton.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QStatusBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qstatusbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QToolBar \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtoolbar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QVBoxLayout \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QWidget \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/QPainter \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsPixmapItem \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsitem.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QInputDialog \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qinputdialog.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QMessageBox \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qmessagebox.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o ../MapEditor/mainwindow.cpp + +mygraphicsscene.o: ../MapEditor/mygraphicsscene.cpp ../MapEditor/mygraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsScene \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicsscene.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgetsglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtguiglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobal.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qconfig.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtcore-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsystemdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qprocessordetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtypeinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsysinfo.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlogging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qflags.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbasicatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qgenericatomic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qatomic_msvc.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qglobalstatic.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmutex.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnumeric.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qversiontagging.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtgui-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qtwidgets-config.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qnamespace.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstring.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qchar.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrefcount.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qarraydata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringliteral.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringview.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringbuilder.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qalgorithms.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiterator.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhashfunctions.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpair.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qbytearraylist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringlist.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qregexp.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qstringmatcher.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcoreevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qscopedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmetatype.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qobject_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qpoint.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qrect.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmargins.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsize.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qbrush.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvector.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qcolor.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgb.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qrgba64.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qmatrix.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpolygon.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qregion.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qwindowdefs_win.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdatastream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qiodevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qline.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qtransform.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpainterpath.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qimage.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpaintdevice.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixelformat.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpixmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qshareddata.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qhash.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qfont.h \ + ../../../Qt/5.12.0/gcc_64/include/QtGui/qpen.h \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \ + ../../../Qt/5.12.0/gcc_64/include/QtWidgets/qgraphicssceneevent.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qset.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QPointF \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/QDebug \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qdebug.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qmap.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qtextstream.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qlocale.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qvariant.h \ + ../../../Qt/5.12.0/gcc_64/include/QtCore/qcontiguouscache.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygraphicsscene.o ../MapEditor/mygraphicsscene.cpp + +moc_mainwindow.o: moc_mainwindow.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp + +moc_mygraphicsscene.o: moc_mygraphicsscene.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mygraphicsscene.o moc_mygraphicsscene.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/MapEditor b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/MapEditor Binary files differnew file mode 100755 index 0000000..aee24bb --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/MapEditor diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mainwindow.cpp b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mainwindow.cpp new file mode 100644 index 0000000..f785e3b --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mainwindow.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'mainwindow.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "../MapEditor/mainwindow.h" +#include <QtCore/qbytearray.h> +#include <QtCore/qmetatype.h> +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'mainwindow.h' doesn't include <QObject>." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.0. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_MainWindow_t { + QByteArrayData data[13]; + char stringdata0[162]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { + { +QT_MOC_LITERAL(0, 0, 10), // "MainWindow" +QT_MOC_LITERAL(1, 11, 7), // "loadMap" +QT_MOC_LITERAL(2, 19, 0), // "" +QT_MOC_LITERAL(3, 20, 11), // "onCreateMap" +QT_MOC_LITERAL(4, 32, 14), // "processMapFile" +QT_MOC_LITERAL(5, 47, 16), // "onMapItemClicked" +QT_MOC_LITERAL(6, 64, 16), // "onNoItemSelected" +QT_MOC_LITERAL(7, 81, 18), // "onListItemSelected" +QT_MOC_LITERAL(8, 100, 9), // "onSaveMap" +QT_MOC_LITERAL(9, 110, 13), // "onShowNumbers" +QT_MOC_LITERAL(10, 124, 21), // "onAirportNameModified" +QT_MOC_LITERAL(11, 146, 9), // "showError" +QT_MOC_LITERAL(12, 156, 5) // "error" + + }, + "MainWindow\0loadMap\0\0onCreateMap\0" + "processMapFile\0onMapItemClicked\0" + "onNoItemSelected\0onListItemSelected\0" + "onSaveMap\0onShowNumbers\0onAirportNameModified\0" + "showError\0error" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_MainWindow[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 10, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: name, argc, parameters, tag, flags + 1, 0, 64, 2, 0x08 /* Private */, + 3, 0, 65, 2, 0x08 /* Private */, + 4, 1, 66, 2, 0x08 /* Private */, + 5, 1, 69, 2, 0x08 /* Private */, + 6, 0, 72, 2, 0x08 /* Private */, + 7, 0, 73, 2, 0x08 /* Private */, + 8, 0, 74, 2, 0x08 /* Private */, + 9, 1, 75, 2, 0x08 /* Private */, + 10, 1, 78, 2, 0x08 /* Private */, + 11, 1, 81, 2, 0x08 /* Private */, + + // slots: parameters + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, QMetaType::QByteArray, 2, + QMetaType::Void, QMetaType::QPointF, 2, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, QMetaType::Int, 2, + QMetaType::Void, QMetaType::QString, 2, + QMetaType::Void, QMetaType::QString, 12, + + 0 // eod +}; + +void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + MainWindow *_t = static_cast<MainWindow *>(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->loadMap(); break; + case 1: _t->onCreateMap(); break; + case 2: _t->processMapFile((*reinterpret_cast< const QByteArray(*)>(_a[1]))); break; + case 3: _t->onMapItemClicked((*reinterpret_cast< QPointF(*)>(_a[1]))); break; + case 4: _t->onNoItemSelected(); break; + case 5: _t->onListItemSelected(); break; + case 6: _t->onSaveMap(); break; + case 7: _t->onShowNumbers((*reinterpret_cast< int(*)>(_a[1]))); break; + case 8: _t->onAirportNameModified((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 9: _t->showError((*reinterpret_cast< const QString(*)>(_a[1]))); break; + default: ; + } + } +} + +QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { { + &QMainWindow::staticMetaObject, + qt_meta_stringdata_MainWindow.data, + qt_meta_data_MainWindow, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *MainWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *MainWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_MainWindow.stringdata0)) + return static_cast<void*>(this); + return QMainWindow::qt_metacast(_clname); +} + +int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 10) + qt_static_metacall(this, _c, _id, _a); + _id -= 10; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 10) + *reinterpret_cast<int*>(_a[0]) = -1; + _id -= 10; + } + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mygraphicsscene.cpp b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mygraphicsscene.cpp new file mode 100644 index 0000000..81db8f9 --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_mygraphicsscene.cpp @@ -0,0 +1,168 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'mygraphicsscene.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "../MapEditor/mygraphicsscene.h" +#include <QtCore/qbytearray.h> +#include <QtCore/qmetatype.h> +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'mygraphicsscene.h' doesn't include <QObject>." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.0. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_MyGraphicsScene_t { + QByteArrayData data[5]; + char stringdata0[67]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_MyGraphicsScene_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_MyGraphicsScene_t qt_meta_stringdata_MyGraphicsScene = { + { +QT_MOC_LITERAL(0, 0, 15), // "MyGraphicsScene" +QT_MOC_LITERAL(1, 16, 15), // "positionClicked" +QT_MOC_LITERAL(2, 32, 0), // "" +QT_MOC_LITERAL(3, 33, 14), // "noItemSelected" +QT_MOC_LITERAL(4, 48, 18) // "updateSelectedItem" + + }, + "MyGraphicsScene\0positionClicked\0\0" + "noItemSelected\0updateSelectedItem" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_MyGraphicsScene[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 3, // signalCount + + // signals: name, argc, parameters, tag, flags + 1, 1, 29, 2, 0x06 /* Public */, + 3, 0, 32, 2, 0x06 /* Public */, + 4, 0, 33, 2, 0x06 /* Public */, + + // signals: parameters + QMetaType::Void, QMetaType::QPointF, 2, + QMetaType::Void, + QMetaType::Void, + + 0 // eod +}; + +void MyGraphicsScene::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + MyGraphicsScene *_t = static_cast<MyGraphicsScene *>(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->positionClicked((*reinterpret_cast< QPointF(*)>(_a[1]))); break; + case 1: _t->noItemSelected(); break; + case 2: _t->updateSelectedItem(); break; + default: ; + } + } else if (_c == QMetaObject::IndexOfMethod) { + int *result = reinterpret_cast<int *>(_a[0]); + { + using _t = void (MyGraphicsScene::*)(QPointF ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MyGraphicsScene::positionClicked)) { + *result = 0; + return; + } + } + { + using _t = void (MyGraphicsScene::*)(); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MyGraphicsScene::noItemSelected)) { + *result = 1; + return; + } + } + { + using _t = void (MyGraphicsScene::*)(); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MyGraphicsScene::updateSelectedItem)) { + *result = 2; + return; + } + } + } +} + +QT_INIT_METAOBJECT const QMetaObject MyGraphicsScene::staticMetaObject = { { + &QGraphicsScene::staticMetaObject, + qt_meta_stringdata_MyGraphicsScene.data, + qt_meta_data_MyGraphicsScene, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *MyGraphicsScene::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *MyGraphicsScene::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_MyGraphicsScene.stringdata0)) + return static_cast<void*>(this); + return QGraphicsScene::qt_metacast(_clname); +} + +int MyGraphicsScene::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QGraphicsScene::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 3) + *reinterpret_cast<int*>(_a[0]) = -1; + _id -= 3; + } + return _id; +} + +// SIGNAL 0 +void MyGraphicsScene::positionClicked(QPointF _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void MyGraphicsScene::noItemSelected() +{ + QMetaObject::activate(this, &staticMetaObject, 1, nullptr); +} + +// SIGNAL 2 +void MyGraphicsScene::updateSelectedItem() +{ + QMetaObject::activate(this, &staticMetaObject, 2, nullptr); +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_predefs.h b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_predefs.h new file mode 100644 index 0000000..a4ca312 --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/moc_predefs.h @@ -0,0 +1,389 @@ +#define __SSP_STRONG__ 3 +#define __DBL_MIN_EXP__ (-1021) +#define __FLT32X_MAX_EXP__ 1024 +#define __cpp_attributes 200809 +#define __UINT_LEAST16_MAX__ 0xffff +#define __ATOMIC_ACQUIRE 2 +#define __FLT128_MAX_10_EXP__ 4932 +#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F +#define __GCC_IEC_559_COMPLEX 2 +#define __cpp_aggregate_nsdmi 201304 +#define __UINT_LEAST8_TYPE__ unsigned char +#define __SIZEOF_FLOAT80__ 16 +#define __INTMAX_C(c) c ## L +#define __CHAR_BIT__ 8 +#define __UINT8_MAX__ 0xff +#define __WINT_MAX__ 0xffffffffU +#define __FLT32_MIN_EXP__ (-125) +#define __cpp_static_assert 200410 +#define __ORDER_LITTLE_ENDIAN__ 1234 +#define __SIZE_MAX__ 0xffffffffffffffffUL +#define __WCHAR_MAX__ 0x7fffffff +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 +#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 +#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 +#define __GCC_IEC_559 2 +#define __FLT32X_DECIMAL_DIG__ 17 +#define __FLT_EVAL_METHOD__ 0 +#define __unix__ 1 +#define __cpp_binary_literals 201304 +#define __FLT64_DECIMAL_DIG__ 17 +#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 +#define __x86_64 1 +#define __cpp_variadic_templates 200704 +#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL +#define __SIG_ATOMIC_TYPE__ int +#define __DBL_MIN_10_EXP__ (-307) +#define __FINITE_MATH_ONLY__ 0 +#define __cpp_variable_templates 201304 +#define __GNUC_PATCHLEVEL__ 0 +#define __FLT32_HAS_DENORM__ 1 +#define __UINT_FAST8_MAX__ 0xff +#define __has_include(STR) __has_include__(STR) +#define __DEC64_MAX_EXP__ 385 +#define __INT8_C(c) c +#define __INT_LEAST8_WIDTH__ 8 +#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL +#define __SHRT_MAX__ 0x7fff +#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L +#define __FLT64X_MAX_10_EXP__ 4932 +#define __UINT_LEAST8_MAX__ 0xff +#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 +#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 +#define __UINTMAX_TYPE__ long unsigned int +#define __linux 1 +#define __DEC32_EPSILON__ 1E-6DF +#define __FLT_EVAL_METHOD_TS_18661_3__ 0 +#define __unix 1 +#define __UINT32_MAX__ 0xffffffffU +#define __GXX_EXPERIMENTAL_CXX0X__ 1 +#define __LDBL_MAX_EXP__ 16384 +#define __FLT128_MIN_EXP__ (-16381) +#define __WINT_MIN__ 0U +#define __linux__ 1 +#define __FLT128_MIN_10_EXP__ (-4931) +#define __INT_LEAST16_WIDTH__ 16 +#define __SCHAR_MAX__ 0x7f +#define __FLT128_MANT_DIG__ 113 +#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) +#define __INT64_C(c) c ## L +#define __DBL_DIG__ 15 +#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 +#define __FLT64X_MANT_DIG__ 64 +#define __SIZEOF_INT__ 4 +#define __SIZEOF_POINTER__ 8 +#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 +#define __USER_LABEL_PREFIX__ +#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x +#define __STDC_HOSTED__ 1 +#define __LDBL_HAS_INFINITY__ 1 +#define __FLT32_DIG__ 6 +#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F +#define __GXX_WEAK__ 1 +#define __SHRT_WIDTH__ 16 +#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L +#define __DEC32_MAX__ 9.999999E96DF +#define __cpp_threadsafe_static_init 200806 +#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x +#define __FLT32X_HAS_INFINITY__ 1 +#define __INT32_MAX__ 0x7fffffff +#define __INT_WIDTH__ 32 +#define __SIZEOF_LONG__ 8 +#define __STDC_IEC_559__ 1 +#define __STDC_ISO_10646__ 201706L +#define __UINT16_C(c) c +#define __PTRDIFF_WIDTH__ 64 +#define __DECIMAL_DIG__ 21 +#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 +#define __gnu_linux__ 1 +#define __INTMAX_WIDTH__ 64 +#define __FLT64_MIN_EXP__ (-1021) +#define __has_include_next(STR) __has_include_next__(STR) +#define __FLT64X_MIN_10_EXP__ (-4931) +#define __LDBL_HAS_QUIET_NAN__ 1 +#define __FLT64_MANT_DIG__ 53 +#define __GNUC__ 7 +#define __GXX_RTTI 1 +#define __pie__ 2 +#define __MMX__ 1 +#define __cpp_delegating_constructors 200604 +#define __FLT_HAS_DENORM__ 1 +#define __SIZEOF_LONG_DOUBLE__ 16 +#define __BIGGEST_ALIGNMENT__ 16 +#define __STDC_UTF_16__ 1 +#define __FLT64_MAX_10_EXP__ 308 +#define __FLT32_HAS_INFINITY__ 1 +#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) +#define __cpp_raw_strings 200710 +#define __INT_FAST32_MAX__ 0x7fffffffffffffffL +#define __DBL_HAS_INFINITY__ 1 +#define __INT64_MAX__ 0x7fffffffffffffffL +#define __DEC32_MIN_EXP__ (-94) +#define __INTPTR_WIDTH__ 64 +#define __FLT32X_HAS_DENORM__ 1 +#define __INT_FAST16_TYPE__ long int +#define __LDBL_HAS_DENORM__ 1 +#define __cplusplus 201402L +#define __cpp_ref_qualifiers 200710 +#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL +#define __INT_LEAST32_MAX__ 0x7fffffff +#define __DEC32_MIN__ 1E-95DF +#define __DEPRECATED 1 +#define __cpp_rvalue_references 200610 +#define __DBL_MAX_EXP__ 1024 +#define __WCHAR_WIDTH__ 32 +#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 +#define __DEC128_EPSILON__ 1E-33DL +#define __SSE2_MATH__ 1 +#define __ATOMIC_HLE_RELEASE 131072 +#define __PTRDIFF_MAX__ 0x7fffffffffffffffL +#define __amd64 1 +#define __STDC_NO_THREADS__ 1 +#define __ATOMIC_HLE_ACQUIRE 65536 +#define __FLT32_HAS_QUIET_NAN__ 1 +#define __GNUG__ 7 +#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL +#define __SIZEOF_SIZE_T__ 8 +#define __cpp_rvalue_reference 200610 +#define __cpp_nsdmi 200809 +#define __FLT64X_MIN_EXP__ (-16381) +#define __SIZEOF_WINT_T__ 4 +#define __LONG_LONG_WIDTH__ 64 +#define __cpp_initializer_lists 200806 +#define __FLT32_MAX_EXP__ 128 +#define __cpp_hex_float 201603 +#define __GCC_HAVE_DWARF2_CFI_ASM 1 +#define __GXX_ABI_VERSION 1011 +#define __FLT128_HAS_INFINITY__ 1 +#define __FLT_MIN_EXP__ (-125) +#define __cpp_lambdas 200907 +#define __FLT64X_HAS_QUIET_NAN__ 1 +#define __INT_FAST64_TYPE__ long int +#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 +#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) +#define __PIE__ 2 +#define __LP64__ 1 +#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x +#define __DECIMAL_BID_FORMAT__ 1 +#define __FLT64_MIN_10_EXP__ (-307) +#define __FLT64X_DECIMAL_DIG__ 21 +#define __DEC128_MIN__ 1E-6143DL +#define __REGISTER_PREFIX__ +#define __UINT16_MAX__ 0xffff +#define __DBL_HAS_DENORM__ 1 +#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 +#define __UINT8_TYPE__ unsigned char +#define __NO_INLINE__ 1 +#define __FLT_MANT_DIG__ 24 +#define __LDBL_DECIMAL_DIG__ 21 +#define __VERSION__ "7.3.0" +#define __UINT64_C(c) c ## UL +#define __cpp_unicode_characters 200704 +#define _STDC_PREDEF_H 1 +#define __cpp_decltype_auto 201304 +#define __GCC_ATOMIC_INT_LOCK_FREE 2 +#define __FLT128_MAX_EXP__ 16384 +#define __FLT32_MANT_DIG__ 24 +#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __STDC_IEC_559_COMPLEX__ 1 +#define __FLT128_HAS_DENORM__ 1 +#define __FLT128_DIG__ 33 +#define __SCHAR_WIDTH__ 8 +#define __INT32_C(c) c +#define __DEC64_EPSILON__ 1E-15DD +#define __ORDER_PDP_ENDIAN__ 3412 +#define __DEC128_MIN_EXP__ (-6142) +#define __FLT32_MAX_10_EXP__ 38 +#define __INT_FAST32_TYPE__ long int +#define __UINT_LEAST16_TYPE__ short unsigned int +#define __FLT64X_HAS_INFINITY__ 1 +#define unix 1 +#define __INT16_MAX__ 0x7fff +#define __cpp_rtti 199711 +#define __SIZE_TYPE__ long unsigned int +#define __UINT64_MAX__ 0xffffffffffffffffUL +#define __FLT64X_DIG__ 18 +#define __INT8_TYPE__ signed char +#define __cpp_digit_separators 201309 +#define __ELF__ 1 +#define __GCC_ASM_FLAG_OUTPUTS__ 1 +#define __FLT_RADIX__ 2 +#define __INT_LEAST16_TYPE__ short int +#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L +#define __UINTMAX_C(c) c ## UL +#define __GLIBCXX_BITSIZE_INT_N_0 128 +#define __k8 1 +#define __SIG_ATOMIC_MAX__ 0x7fffffff +#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 +#define __cpp_sized_deallocation 201309 +#define __SIZEOF_PTRDIFF_T__ 8 +#define __FLT32X_MANT_DIG__ 53 +#define __x86_64__ 1 +#define __FLT32X_MIN_EXP__ (-1021) +#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF +#define __INT_FAST16_MAX__ 0x7fffffffffffffffL +#define __FLT64_DIG__ 15 +#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL +#define __UINT_LEAST64_TYPE__ long unsigned int +#define __FLT_HAS_QUIET_NAN__ 1 +#define __FLT_MAX_10_EXP__ 38 +#define __LONG_MAX__ 0x7fffffffffffffffL +#define __FLT64X_HAS_DENORM__ 1 +#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL +#define __FLT_HAS_INFINITY__ 1 +#define __cpp_unicode_literals 200710 +#define __UINT_FAST16_TYPE__ long unsigned int +#define __DEC64_MAX__ 9.999999999999999E384DD +#define __INT_FAST32_WIDTH__ 64 +#define __CHAR16_TYPE__ short unsigned int +#define __PRAGMA_REDEFINE_EXTNAME 1 +#define __SIZE_WIDTH__ 64 +#define __SEG_FS 1 +#define __INT_LEAST16_MAX__ 0x7fff +#define __DEC64_MANT_DIG__ 16 +#define __UINT_LEAST32_MAX__ 0xffffffffU +#define __SEG_GS 1 +#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 +#define __GCC_ATOMIC_LONG_LOCK_FREE 2 +#define __SIG_ATOMIC_WIDTH__ 32 +#define __INT_LEAST64_TYPE__ long int +#define __INT16_TYPE__ short int +#define __INT_LEAST8_TYPE__ signed char +#define __DEC32_MAX_EXP__ 97 +#define __INT_FAST8_MAX__ 0x7f +#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 +#define __INTPTR_MAX__ 0x7fffffffffffffffL +#define linux 1 +#define __cpp_range_based_for 200907 +#define __FLT64_HAS_QUIET_NAN__ 1 +#define __FLT32_MIN_10_EXP__ (-37) +#define __SSE2__ 1 +#define __EXCEPTIONS 1 +#define __LDBL_MANT_DIG__ 64 +#define __DBL_HAS_QUIET_NAN__ 1 +#define __FLT64_HAS_INFINITY__ 1 +#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x +#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) +#define __code_model_small__ 1 +#define __cpp_return_type_deduction 201304 +#define __k8__ 1 +#define __INTPTR_TYPE__ long int +#define __UINT16_TYPE__ short unsigned int +#define __WCHAR_TYPE__ int +#define __SIZEOF_FLOAT__ 4 +#define __pic__ 2 +#define __UINTPTR_MAX__ 0xffffffffffffffffUL +#define __INT_FAST64_WIDTH__ 64 +#define __DEC64_MIN_EXP__ (-382) +#define __cpp_decltype 200707 +#define __FLT32_DECIMAL_DIG__ 9 +#define __INT_FAST64_MAX__ 0x7fffffffffffffffL +#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 +#define __FLT_DIG__ 6 +#define __FLT64X_MAX_EXP__ 16384 +#define __UINT_FAST64_TYPE__ long unsigned int +#define __INT_MAX__ 0x7fffffff +#define __amd64__ 1 +#define __INT64_TYPE__ long int +#define __FLT_MAX_EXP__ 128 +#define __ORDER_BIG_ENDIAN__ 4321 +#define __DBL_MANT_DIG__ 53 +#define __cpp_inheriting_constructors 201511 +#define __SIZEOF_FLOAT128__ 16 +#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL +#define __DEC64_MIN__ 1E-383DD +#define __WINT_TYPE__ unsigned int +#define __UINT_LEAST32_TYPE__ unsigned int +#define __SIZEOF_SHORT__ 2 +#define __SSE__ 1 +#define __LDBL_MIN_EXP__ (-16381) +#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 +#define __WINT_WIDTH__ 32 +#define __INT_LEAST8_MAX__ 0x7f +#define __FLT32X_MAX_10_EXP__ 308 +#define __SIZEOF_INT128__ 16 +#define __LDBL_MAX_10_EXP__ 4932 +#define __ATOMIC_RELAXED 0 +#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) +#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 +#define _LP64 1 +#define __UINT8_C(c) c +#define __FLT64_MAX_EXP__ 1024 +#define __INT_LEAST32_TYPE__ int +#define __SIZEOF_WCHAR_T__ 4 +#define __FLT128_HAS_QUIET_NAN__ 1 +#define __INT_FAST8_TYPE__ signed char +#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x +#define __GNUC_STDC_INLINE__ 1 +#define __FLT64_HAS_DENORM__ 1 +#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 +#define __DBL_DECIMAL_DIG__ 17 +#define __STDC_UTF_32__ 1 +#define __INT_FAST8_WIDTH__ 8 +#define __FXSR__ 1 +#define __DEC_EVAL_METHOD__ 2 +#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x +#define __cpp_runtime_arrays 198712 +#define __UINT64_TYPE__ long unsigned int +#define __UINT32_C(c) c ## U +#define __INTMAX_MAX__ 0x7fffffffffffffffL +#define __cpp_alias_templates 200704 +#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F +#define __INT8_MAX__ 0x7f +#define __LONG_WIDTH__ 64 +#define __PIC__ 2 +#define __UINT_FAST32_TYPE__ long unsigned int +#define __CHAR32_TYPE__ unsigned int +#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F +#define __cpp_constexpr 201304 +#define __INT32_TYPE__ int +#define __SIZEOF_DOUBLE__ 8 +#define __cpp_exceptions 199711 +#define __FLT_MIN_10_EXP__ (-37) +#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 +#define __INT_LEAST32_WIDTH__ 32 +#define __INTMAX_TYPE__ long int +#define __DEC128_MAX_EXP__ 6145 +#define __FLT32X_HAS_QUIET_NAN__ 1 +#define __ATOMIC_CONSUME 1 +#define __GNUC_MINOR__ 3 +#define __GLIBCXX_TYPE_INT_N_0 __int128 +#define __INT_FAST16_WIDTH__ 64 +#define __UINTMAX_MAX__ 0xffffffffffffffffUL +#define __DEC32_MANT_DIG__ 7 +#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x +#define __DBL_MAX_10_EXP__ 308 +#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L +#define __INT16_C(c) c +#define __cpp_generic_lambdas 201304 +#define __STDC__ 1 +#define __FLT32X_DIG__ 15 +#define __PTRDIFF_TYPE__ long int +#define __ATOMIC_SEQ_CST 5 +#define __UINT32_TYPE__ unsigned int +#define __FLT32X_MIN_10_EXP__ (-307) +#define __UINTPTR_TYPE__ long unsigned int +#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD +#define __DEC128_MANT_DIG__ 34 +#define __LDBL_MIN_10_EXP__ (-4931) +#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 +#define __SSE_MATH__ 1 +#define __SIZEOF_LONG_LONG__ 8 +#define __cpp_user_defined_literals 200809 +#define __FLT128_DECIMAL_DIG__ 36 +#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 +#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x +#define __LDBL_DIG__ 18 +#define __FLT_DECIMAL_DIG__ 9 +#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL +#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 +#define __INT_LEAST64_WIDTH__ 64 +#define __UINT_FAST8_TYPE__ unsigned char +#define _GNU_SOURCE 1 +#define __cpp_init_captures 201304 +#define __ATOMIC_ACQ_REL 4 +#define __ATOMIC_RELEASE 3 diff --git a/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/ui_mainwindow.h b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/ui_mainwindow.h new file mode 100644 index 0000000..04002c0 --- /dev/null +++ b/Source/build-MapEditor-Desktop_Qt_5_12_0_GCC_64bit-Debug/ui_mainwindow.h @@ -0,0 +1,199 @@ +/******************************************************************************** +** Form generated from reading UI file 'mainwindow.ui' +** +** Created by: Qt User Interface Compiler version 5.12.0 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_MAINWINDOW_H +#define UI_MAINWINDOW_H + +#include <QtCore/QVariant> +#include <QtWidgets/QApplication> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QGraphicsView> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QWidget> + +QT_BEGIN_NAMESPACE + +class Ui_MainWindow +{ +public: + QWidget *centralWidget; + QGridLayout *gridLayout; + QGraphicsView *graphicsView; + QVBoxLayout *verticalLayout_2; + QLabel *label_2; + QListWidget *tileList; + QLabel *label_3; + QListWidget *buildingList; + QHBoxLayout *horizontalLayout_2; + QCheckBox *showNumbers_Checkbox; + QCheckBox *mirror_CheckBox; + QHBoxLayout *horizontalLayout; + QPushButton *CreateMap_Btn; + QPushButton *LoadMap_Btn; + QPushButton *saveMap_Btn; + QHBoxLayout *horizontalLayout_3; + QLabel *label; + QLineEdit *airportName_Label; + QMenuBar *menuBar; + QStatusBar *statusBar; + + void setupUi(QMainWindow *MainWindow) + { + if (MainWindow->objectName().isEmpty()) + MainWindow->setObjectName(QString::fromUtf8("MainWindow")); + MainWindow->resize(920, 648); + centralWidget = new QWidget(MainWindow); + centralWidget->setObjectName(QString::fromUtf8("centralWidget")); + QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(centralWidget->sizePolicy().hasHeightForWidth()); + centralWidget->setSizePolicy(sizePolicy); + centralWidget->setAutoFillBackground(true); + gridLayout = new QGridLayout(centralWidget); + gridLayout->setSpacing(6); + gridLayout->setContentsMargins(11, 11, 11, 11); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + graphicsView = new QGraphicsView(centralWidget); + graphicsView->setObjectName(QString::fromUtf8("graphicsView")); + QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding); + sizePolicy1.setHorizontalStretch(99); + sizePolicy1.setVerticalStretch(99); + sizePolicy1.setHeightForWidth(graphicsView->sizePolicy().hasHeightForWidth()); + graphicsView->setSizePolicy(sizePolicy1); + graphicsView->setMinimumSize(QSize(0, 0)); + + gridLayout->addWidget(graphicsView, 2, 2, 1, 1); + + verticalLayout_2 = new QVBoxLayout(); + verticalLayout_2->setSpacing(6); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); + label_2 = new QLabel(centralWidget); + label_2->setObjectName(QString::fromUtf8("label_2")); + + verticalLayout_2->addWidget(label_2); + + tileList = new QListWidget(centralWidget); + tileList->setObjectName(QString::fromUtf8("tileList")); + tileList->setMaximumSize(QSize(256, 16777215)); + + verticalLayout_2->addWidget(tileList); + + label_3 = new QLabel(centralWidget); + label_3->setObjectName(QString::fromUtf8("label_3")); + + verticalLayout_2->addWidget(label_3); + + buildingList = new QListWidget(centralWidget); + buildingList->setObjectName(QString::fromUtf8("buildingList")); + + verticalLayout_2->addWidget(buildingList); + + horizontalLayout_2 = new QHBoxLayout(); + horizontalLayout_2->setSpacing(6); + horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); + showNumbers_Checkbox = new QCheckBox(centralWidget); + showNumbers_Checkbox->setObjectName(QString::fromUtf8("showNumbers_Checkbox")); + showNumbers_Checkbox->setChecked(true); + + horizontalLayout_2->addWidget(showNumbers_Checkbox); + + mirror_CheckBox = new QCheckBox(centralWidget); + mirror_CheckBox->setObjectName(QString::fromUtf8("mirror_CheckBox")); + + horizontalLayout_2->addWidget(mirror_CheckBox); + + + verticalLayout_2->addLayout(horizontalLayout_2); + + horizontalLayout = new QHBoxLayout(); + horizontalLayout->setSpacing(6); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + CreateMap_Btn = new QPushButton(centralWidget); + CreateMap_Btn->setObjectName(QString::fromUtf8("CreateMap_Btn")); + + horizontalLayout->addWidget(CreateMap_Btn); + + LoadMap_Btn = new QPushButton(centralWidget); + LoadMap_Btn->setObjectName(QString::fromUtf8("LoadMap_Btn")); + + horizontalLayout->addWidget(LoadMap_Btn); + + saveMap_Btn = new QPushButton(centralWidget); + saveMap_Btn->setObjectName(QString::fromUtf8("saveMap_Btn")); + + horizontalLayout->addWidget(saveMap_Btn); + + + verticalLayout_2->addLayout(horizontalLayout); + + + gridLayout->addLayout(verticalLayout_2, 2, 1, 1, 1); + + horizontalLayout_3 = new QHBoxLayout(); + horizontalLayout_3->setSpacing(6); + horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); + label = new QLabel(centralWidget); + label->setObjectName(QString::fromUtf8("label")); + + horizontalLayout_3->addWidget(label); + + airportName_Label = new QLineEdit(centralWidget); + airportName_Label->setObjectName(QString::fromUtf8("airportName_Label")); + airportName_Label->setMaxLength(18); + + horizontalLayout_3->addWidget(airportName_Label); + + + gridLayout->addLayout(horizontalLayout_3, 0, 1, 1, 1); + + MainWindow->setCentralWidget(centralWidget); + menuBar = new QMenuBar(MainWindow); + menuBar->setObjectName(QString::fromUtf8("menuBar")); + menuBar->setGeometry(QRect(0, 0, 920, 20)); + MainWindow->setMenuBar(menuBar); + statusBar = new QStatusBar(MainWindow); + statusBar->setObjectName(QString::fromUtf8("statusBar")); + MainWindow->setStatusBar(statusBar); + + retranslateUi(MainWindow); + + QMetaObject::connectSlotsByName(MainWindow); + } // setupUi + + void retranslateUi(QMainWindow *MainWindow) + { + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); + label_2->setText(QApplication::translate("MainWindow", "Tile list:", nullptr)); + label_3->setText(QApplication::translate("MainWindow", "Building list:", nullptr)); + showNumbers_Checkbox->setText(QApplication::translate("MainWindow", "Show numbers on map", nullptr)); + mirror_CheckBox->setText(QApplication::translate("MainWindow", "Mirror tile", nullptr)); + CreateMap_Btn->setText(QApplication::translate("MainWindow", "Create map", nullptr)); + LoadMap_Btn->setText(QApplication::translate("MainWindow", "Load map", nullptr)); + saveMap_Btn->setText(QApplication::translate("MainWindow", "Save map", nullptr)); + label->setText(QApplication::translate("MainWindow", "Airport name:", nullptr)); + } // retranslateUi + +}; + +namespace Ui { + class MainWindow: public Ui_MainWindow {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_MAINWINDOW_H |