- get rid of PC Filesystem spooling micro-freezes on slow hard drives

OpenDriver2 · Jan 19, 2022 · e4ff21c · e4ff21c
1 parent a139e35
commit e4ff21c
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 206 deletions.
diff --git a/src_rebuild/Game/C/E3stuff.c b/src_rebuild/Game/C/E3stuff.c
@@ -524,8 +524,6 @@ void SetPleaseWait(char *buffer)
 		ResetCityType();
 
 #else
-	ResetCityType();
-
 	PsyX_EndScene();
 #endif // PSX
 

diff --git a/src_rebuild/Game/C/main.c b/src_rebuild/Game/C/main.c
@@ -406,12 +406,7 @@ void LoadGameLevel(void)
 	sector = citylumps[GameLevel][CITYLUMP_DATA1].x / CDSECTOR_SIZE;
 	nsectors = citylumps[GameLevel][CITYLUMP_DATA1].y / CDSECTOR_SIZE;
 
-#ifdef PSX 
 	loadsectors((char*)_primTab1, sector, nsectors);
-#else
-	extern char g_CurrentLevelFileName[64];
-	loadsectorsPC(g_CurrentLevelFileName, (char*)_primTab1, sector, nsectors);
-#endif // PSX
 
 	sector += nsectors;
 
@@ -428,12 +423,8 @@ void LoadGameLevel(void)
 	malloc_lump = D_MALLOC(nsectors * CDSECTOR_SIZE);
 	D_MALLOC_END();
 
-#ifdef PSX
 	loadsectors(malloc_lump, sector, nsectors);
-#else
-	extern char g_CurrentLevelFileName[64];
-	loadsectorsPC(g_CurrentLevelFileName, malloc_lump, sector, nsectors);
-#endif // PSX
+
 	sector += nsectors;
 
 	// CITYLUMP_DATA2 - in-memory lump

diff --git a/src_rebuild/Game/C/map.c b/src_rebuild/Game/C/map.c
@@ -406,7 +406,7 @@ void ControlMap(void)
 	region_to_unpack = region_x + region_z * regions_across;
 
 	if (current_region == -1)
-		UnpackRegion(region_to_unpack, region_x & 1U | (region_z & 1U) * 2);		// is that ever valid for 'target_barrel_region'?
+		UnpackRegion(region_to_unpack, region_x & 1U | (region_z & 1U) * 2);
 
 	current_region = region_to_unpack;