aboutsummaryrefslogtreecommitdiff
path: root/Source/Game.c
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2017-06-11 13:58:33 +0200
committerXaviDCR92 <xavi.dcr@gmail.com>2017-06-11 13:58:33 +0200
commitd1f55e8b45df2dfd84bdde3e2566ef14c9ba40f1 (patch)
tree1b6f25f6dfecbbd94b7b9db271dea7cde8ea6221 /Source/Game.c
parent022c72fe369da0045f9ca7dd4b8d4d7dd169c87c (diff)
downloadairport-d1f55e8b45df2dfd84bdde3e2566ef14c9ba40f1.tar.gz
* Tried to get some work done in MapEditor with no success so far.
* Timers with no repeat flag were being set to NULL, but this is not actually desired! * Reenabled transparency for aircraft shadow. * Deprecated NotificationRequest flags, and replaced by system timer handling.
Diffstat (limited to 'Source/Game.c')
-rw-r--r--Source/Game.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/Game.c b/Source/Game.c
index 4b642a6..5882c25 100644
--- a/Source/Game.c
+++ b/Source/Game.c
@@ -107,7 +107,7 @@ enum
UNBOARDING_KEY_SEQUENCE_EASY = 4,
UNBOARDING_KEY_SEQUENCE_MEDIUM = 6,
UNBOARDING_KEY_SEQUENCE_HARD = GAME_MAX_SEQUENCE_KEYS,
- UNBOARDING_PASSENGERS_PER_SEQUENCE = 50
+ UNBOARDING_PASSENGERS_PER_SEQUENCE = 100
};
/* *************************************
@@ -837,7 +837,8 @@ void GameAircraftState(void)
GameAircraftCreatedFlag = true;
// Create notification request for incoming aircraft
- FlightData.NotificationRequest[i] = true;
+ dprintf("1!!!!\n");
+ GameGuiBubbleShow();
target[0] = FlightData.Parking[i];
@@ -857,8 +858,11 @@ void GameAircraftState(void)
dprintf("Flight %d set to STATE_APPROACH.\n", i);
FlightData.State[i] = STATE_APPROACH;
GameAircraftCreatedFlag = true;
+
+ dprintf("2!!!!\n");
+
// Create notification request for incoming aircraft
- FlightData.NotificationRequest[i] = true;
+ GameGuiBubbleShow();
}
}
@@ -2269,6 +2273,7 @@ void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData
else
{
// Flight has finished. Remove aircraft and set finished flag
+ ptrPlayer->Unboarding = false;
GameRemoveFlight(ptrPlayer->FlightDataSelectedAircraft, true);
}
@@ -2498,7 +2503,6 @@ void GameRemoveFlight(uint8_t idx, bool successful)
dprintf("Player two\n");
}
- ptrPlayer->Unboarding = false;
memset(ptrPlayer->UnboardingSequence, 0, GAME_MAX_SEQUENCE_KEYS);
ptrPlayer->UnboardingSequenceIdx = 0;