diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2018-02-07 18:15:07 +0100 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2018-02-07 18:15:07 +0100 |
| commit | 81d9242514b4e8e3fe97cf7063a15680f610bf2f (patch) | |
| tree | da455367502d946bd8b7b04377debef9686fc2bc /Source | |
| parent | 6364d64cbca986c61b3bea76167610198fbe99bb (diff) | |
| download | airport-81d9242514b4e8e3fe97cf7063a15680f610bf2f.tar.gz | |
* I think GameGraphics() can be executed as long as GPU has received all DMA blocks. Remove if something goes wrong.
Diffstat (limited to 'Source')
| -rwxr-xr-x[-rw-r--r--] | Source/Exe/AIRPORT.elf | bin | 330656 -> 330572 bytes | |||
| -rw-r--r-- | Source/Exe/AIRPORT.iso | bin | 1480704 -> 1480704 bytes | |||
| -rw-r--r-- | Source/Game.c | 4 | ||||
| -rw-r--r-- | Source/Gfx.c | 2 | ||||
| -rw-r--r-- | Source/Makefile | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf Binary files differindex 074d649..72a9f0f 100644..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 77a91f2..dc164f6 100644 --- a/Source/Exe/AIRPORT.iso +++ b/Source/Exe/AIRPORT.iso diff --git a/Source/Game.c b/Source/Game.c index f3fd11a..0263933 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -1062,7 +1062,7 @@ void GameGraphics(void) SystemAcknowledgeFrame(); - while ( (SystemRefreshNeeded() == false) || (GfxIsGPUBusy() != false) ); + while ( (SystemRefreshNeeded() == false) || (GfxReadyForDMATransfer() == false) ); if (TwoPlayersActive != false) { @@ -1075,8 +1075,6 @@ void GameGraphics(void) GfxIncreaseGlobalLuminance(1); } - while (GsIsDrawing()); - for (i = 0; i < MAX_PLAYERS ; i++) { TYPE_PLAYER* ptrPlayer = &PlayerData[i]; diff --git a/Source/Gfx.c b/Source/Gfx.c index 879ec37..d4de561 100644 --- a/Source/Gfx.c +++ b/Source/Gfx.c @@ -263,7 +263,7 @@ void GfxDrawScene_Fast(void) * **********************************************************************/ bool GfxReadyForDMATransfer(void) { - return ( (GPUSTAT & 1<<28) && !(D2_CHCR & 1<<24) ); + return (!(D2_CHCR & 1<<24)); } /* ********************************************************************** diff --git a/Source/Makefile b/Source/Makefile index e47a3da..7de5746 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: |