aboutsummaryrefslogtreecommitdiff
path: root/Source/Aircraft.c
diff options
context:
space:
mode:
authorXavier ASUS <xavi92psx@gmail.com>2018-11-30 01:34:40 +0100
committerXavier ASUS <xavi92psx@gmail.com>2018-11-30 01:34:40 +0100
commit8fcf5bf1f74873f49b792d3e3f661a2e7feda673 (patch)
treed134d1c9d50aefcd00f973d34d14c519b0526c77 /Source/Aircraft.c
parentc33fcca6d44264834baf42de65fe9d19c0f62ff4 (diff)
downloadairport-8fcf5bf1f74873f49b792d3e3f661a2e7feda673.tar.gz
Removed SIO interrupt (it caused VBlank ISR not to be triggered).
Added Gfx wait on LoadMenuEnd(). Otherwise, some levels would not start after loading all required files. Also, added GPU wait on Menu.c before entering the main loop. An invalid index inside sound table was being accessed when creating an arrival flight. This made the game crash only under real hardware. Other minor changes and fixes.
Diffstat (limited to 'Source/Aircraft.c')
-rw-r--r--Source/Aircraft.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Aircraft.c b/Source/Aircraft.c
index 8e6e3ce..debec42 100644
--- a/Source/Aircraft.c
+++ b/Source/Aircraft.c
@@ -138,7 +138,7 @@ bool AircraftAddNew( TYPE_FLIGHT_DATA* const ptrFlightData,
{
TYPE_AIRCRAFT_DATA* const ptrAircraft = &AircraftData[aircraftIndex];
- memcpy(ptrAircraft->Target, targets, sizeof (uint16_t) * AIRCRAFT_MAX_TARGETS);
+ memmove(ptrAircraft->Target, targets, sizeof (uint16_t) * AIRCRAFT_MAX_TARGETS);
ptrAircraft->TargetIdx = 0;
ptrAircraft->Livery = AircraftLiveryFromFlightNumber(ptrFlightData->strFlightNumber[FlightDataIndex]);
@@ -820,7 +820,7 @@ TYPE_ISOMETRIC_POS AircraftGetIsoPos(const uint8_t FlightDataIdx)
void AircraftAddTargets(TYPE_AIRCRAFT_DATA* const ptrAircraft, const uint16_t* const targets)
{
- memcpy(ptrAircraft->Target, targets, sizeof (uint16_t) * AIRCRAFT_MAX_TARGETS);
+ memmove(ptrAircraft->Target, targets, sizeof (uint16_t) * AIRCRAFT_MAX_TARGETS);
ptrAircraft->TargetIdx = 0;
}