Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-25 20:02:33 +01:00
Code Issues Projects Releases Wiki Activity

- remove area data loading hack and change condition to fix the original way of handling it

Browse Source
This commit is contained in:
SoapyMan 2023-04-21 16:37:21 +06:00
parent fb09d8c171
commit dc441146a1
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src_rebuild/Game/C/spool.c
View File

@ -715,6 +715,7 @@ void CheckValidSpoolData(void)
if (models_ready) if (models_ready)
init_spooled_models(); init_spooled_models();
#ifdef PSX
if (spoolactive && check_regions_present()) if (spoolactive && check_regions_present())
{ {
stopgame(); stopgame();
@ -727,6 +728,7 @@ void CheckValidSpoolData(void)
startgame(); startgame();
} }
#endif // PSX
} }
// [D] [T] // [D] [T]
@ -759,14 +761,6 @@ void CheckLoadAreaData(int cellx, int cellz)
spoolptr = (Spool *)(RegionSpoolInfo + spoolinfo_offsets[current_region]); spoolptr = (Spool *)(RegionSpoolInfo + spoolinfo_offsets[current_region]);
#ifndef PSX
// [A] this fixes spooling not activated bug (reversing bug?)
if (LoadedArea != spoolptr->super_region && spoolptr->super_region != 0xFF && old_region != -1)
{
LoadedArea = spoolptr->super_region;
}
else
#endif
if (old_region == -1 && spoolptr->super_region != 0xFF) if (old_region == -1 && spoolptr->super_region != 0xFF)
{ {
// just load the area if no // just load the area if no
@ -778,7 +772,7 @@ void CheckLoadAreaData(int cellx, int cellz)
if (old_region == -1) if (old_region == -1)
LoadedArea = -1; LoadedArea = -1;
else if (/*spoolptr->super_region == 0xFF ||*/ nAreas == 0) else if (spoolptr->super_region == 0xFF && nAreas == 0)
return; return;
#define BOUNDARY_MIN 15 #define BOUNDARY_MIN 15