From 3ee473d909e8581964dba4c0133110a170f45378 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Fri, 15 Sep 2023 20:38:58 +0200 Subject: [PATCH] Revert "port: fall back to copy if a zipped file is not zipped" This reverts commit 233f4b7514a4f27bbaaa365057cea7d8559b4cdf. --- src/game/file.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/game/file.c b/src/game/file.c index acaf552bd..6bad0b536 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -12,7 +12,6 @@ #include "types.h" #ifndef PLATFORM_N64 #include "romdata.h" -#include "system.h" #endif /** @@ -4191,18 +4190,7 @@ void fileLoad(u8 *dst, u32 allocationlen, romptr_t *romaddrptr, struct fileinfo dmaExec(scratch, *romaddrptr, romsize); result = rzipInflate(scratch, dst, buffer); -#ifndef PLATFORM_N64 - if (result == 0) { - // probably not zipped, just copy it over if there's enough space - if (romsize < allocationlen) { - dmaExec(dst, *romaddrptr, romsize); - result = romsize; - } else { - // by this point we've already written out of bounds in the previous dmaExec call but oh well - sysFatalError("File %d is larger than its allocation: %u > %u", filenum); - } - } -#elif VERSION < VERSION_NTSC_1_0 +#if VERSION < VERSION_NTSC_1_0 if (result == 0) { sprintf(sp54, "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x", "ob.c", 204, scratch[0], scratch[1], scratch[2], scratch[3],