Skip to content

Commit dc44114

Browse files
committed
- remove area data loading hack and change condition to fix the original way of handling it
1 parent fb09d8c commit dc44114

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

src_rebuild/Game/C/spool.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ void CheckValidSpoolData(void)
715715
if (models_ready)
716716
init_spooled_models();
717717

718+
#ifdef PSX
718719
if (spoolactive && check_regions_present())
719720
{
720721
stopgame();
@@ -727,6 +728,7 @@ void CheckValidSpoolData(void)
727728

728729
startgame();
729730
}
731+
#endif // PSX
730732
}
731733

732734
// [D] [T]
@@ -759,14 +761,6 @@ void CheckLoadAreaData(int cellx, int cellz)
759761

760762
spoolptr = (Spool *)(RegionSpoolInfo + spoolinfo_offsets[current_region]);
761763

762-
#ifndef PSX
763-
// [A] this fixes spooling not activated bug (reversing bug?)
764-
if (LoadedArea != spoolptr->super_region && spoolptr->super_region != 0xFF && old_region != -1)
765-
{
766-
LoadedArea = spoolptr->super_region;
767-
}
768-
else
769-
#endif
770764
if (old_region == -1 && spoolptr->super_region != 0xFF)
771765
{
772766
// just load the area if no
@@ -778,7 +772,7 @@ void CheckLoadAreaData(int cellx, int cellz)
778772

779773
if (old_region == -1)
780774
LoadedArea = -1;
781-
else if (/*spoolptr->super_region == 0xFF ||*/ nAreas == 0)
775+
else if (spoolptr->super_region == 0xFF && nAreas == 0)
782776
return;
783777

784778
#define BOUNDARY_MIN 15

0 commit comments

Comments
 (0)