Blue background dimensions are now limited to drawing enviroment's.

Fixed X position for "Remaining aircraft" and "Next aircraft" messages in GameGui.c

12 files changed, 44 insertions, 30 deletions

diff --git a/Bin/AIRPORT.bin b/Bin/AIRPORT.bin
index f4bb646..7cdbcab 100644
--- a/Bin/AIRPORT.bin
+++ b/Bin/AIRPORT.bin
diff --git a/Source/Airport.geany b/Source/Airport.geany
index b03b580..79f5340 100644
--- a/Source/Airport.geany
+++ b/Source/Airport.geany
@@ -28,36 +28,36 @@ long_line_behaviour=1
 long_line_column=120
 
 [files]
-current_page=32
-FILE_NAME_0=29974;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4
+current_page=5
+FILE_NAME_0=8700;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4
 FILE_NAME_1=5265;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4
 FILE_NAME_2=4555;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.c;0;4
 FILE_NAME_3=6794;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.c;0;4
-FILE_NAME_4=40052;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4
-FILE_NAME_5=38072;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4
+FILE_NAME_4=15748;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4
+FILE_NAME_5=21375;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4
 FILE_NAME_6=3129;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.c;0;4
-FILE_NAME_7=14837;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.c;0;4
+FILE_NAME_7=11629;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.c;0;4
 FILE_NAME_8=717;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=30632;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMemCard.c;0;4
-FILE_NAME_11=3620;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMenu.c;0;4
+FILE_NAME_11=4273;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMenu.c;0;4
 FILE_NAME_12=3904;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMessage.c;0;4
 FILE_NAME_13=11137;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPad.c;0;4
-FILE_NAME_14=10976;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.c;0;4
+FILE_NAME_14=7369;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPltParser.c;0;4
 FILE_NAME_15=9894;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FPSXSDKIntro.c;0;4
 FILE_NAME_16=1091;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial.c;0;4
 FILE_NAME_17=2669;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.c;0;4
 FILE_NAME_18=2662;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.c;0;4
-FILE_NAME_19=3753;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.c;0;4
-FILE_NAME_20=1270;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.h;0;4
+FILE_NAME_19=3179;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.c;0;4
+FILE_NAME_20=364;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.h;0;4
 FILE_NAME_21=392;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=1145;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.h;0;4
 FILE_NAME_24=1682;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.h;0;4
-FILE_NAME_25=390;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4
-FILE_NAME_26=294;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4
+FILE_NAME_25=1610;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4
+FILE_NAME_26=6047;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4
 FILE_NAME_27=3576;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.h;0;4
-FILE_NAME_28=424;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGlobal_Inc.h;0;4
+FILE_NAME_28=300;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGlobal_Inc.h;0;4
 FILE_NAME_29=630;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
@@ -70,7 +70,7 @@ FILE_NAME_37=490;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial
 FILE_NAME_38=815;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.h;0;4
 FILE_NAME_39=4207;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=2404;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4
+FILE_NAME_41=2489;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4
 FILE_NAME_42=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FLEVEL3.PLT;0;4
 FILE_NAME_43=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FEASY.PLT;0;4
 FILE_NAME_44=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FLEVEL1.PLT;0;4
diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf
index 2630e32..b4e899a 100755
--- a/Source/Exe/AIRPORT.elf
+++ b/Source/Exe/AIRPORT.elf
diff --git a/Source/Exe/AIRPORT.exe b/Source/Exe/AIRPORT.exe
index 33319aa..621d266 100644
--- a/Source/Exe/AIRPORT.exe
+++ b/Source/Exe/AIRPORT.exe
diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso
index dcb31aa..9d8cefc 100644
--- a/Source/Exe/AIRPORT.iso
+++ b/Source/Exe/AIRPORT.iso
diff --git a/Source/Game.c b/Source/Game.c
index d208dce..54c40ce 100644
--- a/Source/Game.c
+++ b/Source/Game.c
@@ -172,7 +172,7 @@ static void GameMinimumSpawnTimeout(void);
 static void GameRenderBuildingAircraft(TYPE_PLAYER* const 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 void GameDrawBackground(void);
 static DIRECTION GameGetRunwayDirection(uint16_t rwyHeader);
 static DIRECTION GameGetParkingDirection(uint16_t parkingTile);
 
@@ -940,8 +940,7 @@ void GameGraphics(void)
             // the whole screen as usual.
 
             // Render background first.
-
-            GameDrawBackground(ptrPlayer);
+            GameDrawBackground();
 
             // Then ground tiles must be rendered.
 
@@ -962,8 +961,8 @@ void GameGraphics(void)
 
             if (split_screen)
             {
-                //~ GfxDrawScene_NoSwap();
-                //~ while (GsIsDrawing());
+                GfxDrawScene_NoSwap();
+                while (GsIsDrawing());
             }
         }
     }
@@ -985,7 +984,7 @@ void GameGraphics(void)
 
     if (split_screen)
     {
-        //~ GfxDrawScene_NoSwap();
+        GfxDrawScene_NoSwap();
     }
 
     GfxDrawScene();
@@ -1005,7 +1004,7 @@ void GameGraphics(void)
  *
  * *******************************************************************/
 
-void GameDrawBackground(TYPE_PLAYER* const ptrPlayer)
+static void GameDrawBackground(void)
 {
     enum
     {
@@ -1026,17 +1025,13 @@ void GameDrawBackground(TYPE_PLAYER* const ptrPlayer)
         BG_POLY4_B3 = 80
     };
 
-    static const GsGPoly4 BgPoly4 =
+    static GsGPoly4 BgPoly4 =
     {
         .x[0] = 0,
-        .x[1] = X_SCREEN_RESOLUTION,
         .x[2] = 0,
-        .x[3] = X_SCREEN_RESOLUTION,
 
         .y[0] = 0,
         .y[1] = 0,
-        .y[2] = Y_SCREEN_RESOLUTION,
-        .y[3] = Y_SCREEN_RESOLUTION,
 
         .r[0] = BG_POLY4_R0,
         .g[0] = BG_POLY4_G0,
@@ -1055,6 +1050,12 @@ void GameDrawBackground(TYPE_PLAYER* const ptrPlayer)
         .b[3] = BG_POLY4_B3
     };
 
+    BgPoly4.x[1] = GfxGetDrawEnvWidth();
+    BgPoly4.x[3] = BgPoly4.x[1];
+
+    BgPoly4.y[2] = GfxGetDrawEnvHeight();
+    BgPoly4.y[3] = BgPoly4.y[2];
+
     GsSortGPoly4((GsGPoly4*)&BgPoly4);
 }
 
diff --git a/Source/GameGui.c b/Source/GameGui.c
index 35a1d3f..4f3fe1f 100644
--- a/Source/GameGui.c
+++ b/Source/GameGui.c
@@ -506,7 +506,7 @@ void GameGuiAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const p
     {
         GAME_GUI_REMAINING_AIRCRAFT_X = AIRCRAFT_DATA_GSGPOLY4_X0 + 16,
         GAME_GUI_REMAINING_AIRCRAFT_Y = AIRCRAFT_DATA_GSGPOLY4_Y2 - 16,
-        GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER = AIRCRAFT_DATA_GSGPOLY4_X0_2PLAYER + 16,
+        GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER = AIRCRAFT_DATA_GSGPOLY4_X0_2PLAYER + 4,
         GAME_GUI_REMAINING_AIRCRAFT_Y_2PLAYER = AIRCRAFT_DATA_GSGPOLY4_Y2_2PLAYER - 16
     };
 
@@ -514,7 +514,7 @@ void GameGuiAircraftList(TYPE_PLAYER* const ptrPlayer, TYPE_FLIGHT_DATA* const p
     {
         GAME_GUI_NEXT_AIRCRAFT_TIME_X = GAME_GUI_REMAINING_AIRCRAFT_X,
         GAME_GUI_NEXT_AIRCRAFT_TIME_Y = GAME_GUI_REMAINING_AIRCRAFT_Y + 8,
-        GAME_GUI_NEXT_AIRCRAFT_TIME_X_2PLAYER = GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER - 6,
+        GAME_GUI_NEXT_AIRCRAFT_TIME_X_2PLAYER = GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER,
         GAME_GUI_NEXT_AIRCRAFT_TIME_Y_2PLAYER = GAME_GUI_REMAINING_AIRCRAFT_Y_2PLAYER + 8,
     };
 
diff --git a/Source/Gfx.c b/Source/Gfx.c
index 67fd3ed..2332892 100644
--- a/Source/Gfx.c
+++ b/Source/Gfx.c
@@ -909,7 +909,7 @@ void GfxSetSplitScreen(uint8_t playerIndex)
 		break;
 	}
 
-	GsSetDrawEnv_DMA(&DrawEnv);
+	GsSetDrawEnv(&DrawEnv);
 }
 
 void GfxDisableSplitScreen(void)
@@ -919,3 +919,13 @@ void GfxDisableSplitScreen(void)
 
 	GsSetDrawEnv_DMA(&DrawEnv);
 }
+
+short GfxGetDrawEnvWidth(void)
+{
+    return DrawEnv.w;
+}
+
+short GfxGetDrawEnvHeight(void)
+{
+    return DrawEnv.h;
+}
diff --git a/Source/Gfx.h b/Source/Gfx.h
index 6c191bc..23f0156 100644
--- a/Source/Gfx.h
+++ b/Source/Gfx.h
@@ -114,6 +114,9 @@ void GfxDrawScene_NoSwap(void);
 
 void GfxDevMenuEnable(void);
 
+short GfxGetDrawEnvWidth(void);
+short GfxGetDrawEnvHeight(void);
+
 /* *************************************
  * 	Global variables
  * *************************************/
diff --git a/Source/Makefile b/Source/Makefile
index 20027e2..09a1185 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -11,7 +11,7 @@ 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
 
diff --git a/Source/MapEditor/MapEditor.pro.user b/Source/MapEditor/MapEditor.pro.user
index 4d40971..2dcdee3 100644
--- a/Source/MapEditor/MapEditor.pro.user
+++ b/Source/MapEditor/MapEditor.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.7.2, 2018-11-27T22:49:44. -->
+<!-- Written by QtCreator 4.7.2, 2018-11-29T01:11:33. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/cdimg/AIRPORT.exe b/cdimg/AIRPORT.exe
index 33319aa..621d266 100644
--- a/cdimg/AIRPORT.exe
+++ b/cdimg/AIRPORT.exe