From 6364d64cbca986c61b3bea76167610198fbe99bb Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Sat, 3 Feb 2018 16:05:37 +0100 Subject: * Aircraft.c: files were being loaded each time level was selected. * Game.c: score bonus is now added depending on flight remaining time. + Added second level. --- Bin/AIRPORT.bin | Bin 1700496 -> 1700496 bytes Levels/EASY.PLT | 19 +++++++++++++++++++ Levels/LEVEL2.LVL | Bin 0 -> 576 bytes Levels/LEVEL2.PLT | 17 +++++++++++++++++ Source/Aircraft.c | 11 +++++++++-- Source/Exe/AIRPORT.elf | Bin 330500 -> 330656 bytes Source/Exe/AIRPORT.iso | Bin 1480704 -> 1480704 bytes Source/Game.c | 3 +++ Source/Makefile | 2 +- Sprites/LFRARROW.bmp | Bin 0 -> 822 bytes Sprites/LFRARROW.flags | 1 + Sprites/UDNARROW.bmp | Bin 0 -> 822 bytes Sprites/UDNARROW.flags | 1 + cdimg/DATA/LEVELS/EASY.PLT | 19 +++++++++++++++++++ cdimg/DATA/LEVELS/LEVEL2.LVL | Bin 0 -> 576 bytes cdimg/DATA/LEVELS/LEVEL2.PLT | 17 +++++++++++++++++ cdimg/DATA/SPRITES/BCNGW.TIM | Bin 0 -> 8212 bytes cdimg/DATA/SPRITES/CITYBG1.TIM | Bin 0 -> 16404 bytes cdimg/DATA/SPRITES/LFRARROW.TIM | Bin 0 -> 532 bytes cdimg/DATA/SPRITES/UDNARROW.TIM | Bin 0 -> 532 bytes 20 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 Levels/EASY.PLT create mode 100644 Levels/LEVEL2.LVL create mode 100644 Levels/LEVEL2.PLT create mode 100644 Sprites/LFRARROW.bmp create mode 100644 Sprites/LFRARROW.flags create mode 100644 Sprites/UDNARROW.bmp create mode 100644 Sprites/UDNARROW.flags create mode 100644 cdimg/DATA/LEVELS/EASY.PLT create mode 100644 cdimg/DATA/LEVELS/LEVEL2.LVL create mode 100644 cdimg/DATA/LEVELS/LEVEL2.PLT create mode 100644 cdimg/DATA/SPRITES/BCNGW.TIM create mode 100644 cdimg/DATA/SPRITES/CITYBG1.TIM create mode 100644 cdimg/DATA/SPRITES/LFRARROW.TIM create mode 100644 cdimg/DATA/SPRITES/UDNARROW.TIM diff --git a/Bin/AIRPORT.bin b/Bin/AIRPORT.bin index a6bf9ed..f87964b 100644 Binary files a/Bin/AIRPORT.bin and b/Bin/AIRPORT.bin differ diff --git a/Levels/EASY.PLT b/Levels/EASY.PLT new file mode 100644 index 0000000..f3209b0 --- /dev/null +++ b/Levels/EASY.PLT @@ -0,0 +1,19 @@ +#DEPARTURE/ARRIVAL;Flight number;Passengers;HH:MM;Parking (departure only);Remaining time +#This is a comment example. +#If DEPARTURE, parking must be set +#If ARRIVAL, set parking to zero +#First line must set initial time +#For example: +14:55 +#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format. +ARRIVAL;PHX1802;150;00:10;0;360 +ARRIVAL;PHX1803;250;00:30;0;360 +ARRIVAL;PHX1804;250;01:10;0;360 +ARRIVAL;PHX1805;100;01:30;0;360 +ARRIVAL;PHX1806;40;02:30;0;360 +DEPARTURE;PHX1000;100;00:05;19;240 +DEPARTURE;PHX1001;100;00:25;21;240 +DEPARTURE;PHX1002;200;01:00;19;240 +DEPARTURE;PHX1003;200;01:30;21;240 +DEPARTURE;PHX1004;200;02:00;19;240 +DEPARTURE;PHX1004;200;03:00;21;240 \ No newline at end of file diff --git a/Levels/LEVEL2.LVL b/Levels/LEVEL2.LVL new file mode 100644 index 0000000..bc93219 Binary files /dev/null and b/Levels/LEVEL2.LVL differ diff --git a/Levels/LEVEL2.PLT b/Levels/LEVEL2.PLT new file mode 100644 index 0000000..816c81f --- /dev/null +++ b/Levels/LEVEL2.PLT @@ -0,0 +1,17 @@ +#DEPARTURE/ARRIVAL;Flight number;Passengers;HH:MM;Parking (departure only);Remaining time +#This is a comment example. +#If DEPARTURE, parking must be set +#If ARRIVAL, set parking to zero +#First line must set initial time +#For example: +14:55 +#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format. +ARRIVAL;PHX1802;100;00:10;0;360 +ARRIVAL;PHX1805;125;00:10;0;360 +ARRIVAL;PHX1806;125;00:30;0;360 +ARRIVAL;PHX1807;125;00:50;0;360 +ARRIVAL;PHX1808;125;01:30;0;360 +DEPARTURE;PHX1000;53;00:05;177;360 +DEPARTURE;PHX1001;53;00:15;145;360 +DEPARTURE;PHX1002;53;00:30;227;360 +DEPARTURE;PHX1003;53;00:45;135;360 diff --git a/Source/Aircraft.c b/Source/Aircraft.c index 8af8ad8..54db446 100644 --- a/Source/Aircraft.c +++ b/Source/Aircraft.c @@ -87,6 +87,8 @@ static bool AircraftCheckPath(TYPE_AIRCRAFT_DATA* ptrAicraft, TYPE_AIRCRAFT_DATA void AircraftInit(void) { + static bool firstLoad = true; + bzero(AircraftData, GAME_MAX_AIRCRAFT * sizeof(TYPE_AIRCRAFT_DATA)); AircraftIndex = 0; @@ -113,10 +115,15 @@ void AircraftInit(void) AIRCRAFT_INVALID_IDX, sizeof(AircraftFlightDataIdx_HashTable) ); - LoadMenu( GameFileList, + if (firstLoad != false) + { + firstLoad = false; + + LoadMenu( GameFileList, GameFileDest, sizeof(GameFileList) / sizeof(GameFileList[0]), - sizeof(GameFileDest) / sizeof(GameFileDest[0]) ); + sizeof(GameFileDest) / sizeof(GameFileDest[0]) ); + } } bool AircraftAddNew( TYPE_FLIGHT_DATA* ptrFlightData, diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf index 33a2f5e..074d649 100644 Binary files a/Source/Exe/AIRPORT.elf and b/Source/Exe/AIRPORT.elf differ diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso index 34ceefa..77a91f2 100644 Binary files a/Source/Exe/AIRPORT.iso and b/Source/Exe/AIRPORT.iso differ diff --git a/Source/Game.c b/Source/Game.c index 2670dc0..f3fd11a 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -3968,6 +3968,9 @@ void GameRemoveFlight(uint8_t idx, bool successful) if (successful != false) { GameScore += SCORE_REWARD_FINISH_FLIGHT; + + // Add punctuation + GameScore += FlightData.RemainingTime[idx] << 1; } else { diff --git a/Source/Makefile b/Source/Makefile index 7de5746..e47a3da 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -27,7 +27,7 @@ CDROM_ROOT=$(PROJECT_DIR)/cdimg BIN_TARGET_PATH = $(PROJECT_DIR)/Bin #Uncomment this DEFINE below to use Airport together with OpenSend + QPSXSerial toolchain. -#DEFINE += -DSERIAL_INTERFACE +DEFINE += -DSERIAL_INTERFACE # PSXSDK tools definitions # ELF2EXE: diff --git a/Sprites/LFRARROW.bmp b/Sprites/LFRARROW.bmp new file mode 100644 index 0000000..43c2861 Binary files /dev/null and b/Sprites/LFRARROW.bmp differ diff --git a/Sprites/LFRARROW.flags b/Sprites/LFRARROW.flags new file mode 100644 index 0000000..8dd3f2b --- /dev/null +++ b/Sprites/LFRARROW.flags @@ -0,0 +1 @@ +16 -org=620,240 -mpink diff --git a/Sprites/UDNARROW.bmp b/Sprites/UDNARROW.bmp new file mode 100644 index 0000000..ba862bb Binary files /dev/null and b/Sprites/UDNARROW.bmp differ diff --git a/Sprites/UDNARROW.flags b/Sprites/UDNARROW.flags new file mode 100644 index 0000000..7653ca0 --- /dev/null +++ b/Sprites/UDNARROW.flags @@ -0,0 +1 @@ +16 -org=604,240 -mpink diff --git a/cdimg/DATA/LEVELS/EASY.PLT b/cdimg/DATA/LEVELS/EASY.PLT new file mode 100644 index 0000000..f3209b0 --- /dev/null +++ b/cdimg/DATA/LEVELS/EASY.PLT @@ -0,0 +1,19 @@ +#DEPARTURE/ARRIVAL;Flight number;Passengers;HH:MM;Parking (departure only);Remaining time +#This is a comment example. +#If DEPARTURE, parking must be set +#If ARRIVAL, set parking to zero +#First line must set initial time +#For example: +14:55 +#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format. +ARRIVAL;PHX1802;150;00:10;0;360 +ARRIVAL;PHX1803;250;00:30;0;360 +ARRIVAL;PHX1804;250;01:10;0;360 +ARRIVAL;PHX1805;100;01:30;0;360 +ARRIVAL;PHX1806;40;02:30;0;360 +DEPARTURE;PHX1000;100;00:05;19;240 +DEPARTURE;PHX1001;100;00:25;21;240 +DEPARTURE;PHX1002;200;01:00;19;240 +DEPARTURE;PHX1003;200;01:30;21;240 +DEPARTURE;PHX1004;200;02:00;19;240 +DEPARTURE;PHX1004;200;03:00;21;240 \ No newline at end of file diff --git a/cdimg/DATA/LEVELS/LEVEL2.LVL b/cdimg/DATA/LEVELS/LEVEL2.LVL new file mode 100644 index 0000000..bc93219 Binary files /dev/null and b/cdimg/DATA/LEVELS/LEVEL2.LVL differ diff --git a/cdimg/DATA/LEVELS/LEVEL2.PLT b/cdimg/DATA/LEVELS/LEVEL2.PLT new file mode 100644 index 0000000..816c81f --- /dev/null +++ b/cdimg/DATA/LEVELS/LEVEL2.PLT @@ -0,0 +1,17 @@ +#DEPARTURE/ARRIVAL;Flight number;Passengers;HH:MM;Parking (departure only);Remaining time +#This is a comment example. +#If DEPARTURE, parking must be set +#If ARRIVAL, set parking to zero +#First line must set initial time +#For example: +14:55 +#Aircraft arrival (or departure) must be set relative to initial time, in HH:MM format. +ARRIVAL;PHX1802;100;00:10;0;360 +ARRIVAL;PHX1805;125;00:10;0;360 +ARRIVAL;PHX1806;125;00:30;0;360 +ARRIVAL;PHX1807;125;00:50;0;360 +ARRIVAL;PHX1808;125;01:30;0;360 +DEPARTURE;PHX1000;53;00:05;177;360 +DEPARTURE;PHX1001;53;00:15;145;360 +DEPARTURE;PHX1002;53;00:30;227;360 +DEPARTURE;PHX1003;53;00:45;135;360 diff --git a/cdimg/DATA/SPRITES/BCNGW.TIM b/cdimg/DATA/SPRITES/BCNGW.TIM new file mode 100644 index 0000000..a59d4ef Binary files /dev/null and b/cdimg/DATA/SPRITES/BCNGW.TIM differ diff --git a/cdimg/DATA/SPRITES/CITYBG1.TIM b/cdimg/DATA/SPRITES/CITYBG1.TIM new file mode 100644 index 0000000..c02b371 Binary files /dev/null and b/cdimg/DATA/SPRITES/CITYBG1.TIM differ diff --git a/cdimg/DATA/SPRITES/LFRARROW.TIM b/cdimg/DATA/SPRITES/LFRARROW.TIM new file mode 100644 index 0000000..a543438 Binary files /dev/null and b/cdimg/DATA/SPRITES/LFRARROW.TIM differ diff --git a/cdimg/DATA/SPRITES/UDNARROW.TIM b/cdimg/DATA/SPRITES/UDNARROW.TIM new file mode 100644 index 0000000..fd2a511 Binary files /dev/null and b/cdimg/DATA/SPRITES/UDNARROW.TIM differ -- cgit v1.2.3