Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-26 04:12:34 +01:00
Code Issues Projects Releases Wiki Activity

- force clean spooled model slots during InitSpooling

Browse Source
This commit is contained in:
Ilya Shurumov 2020-11-12 22:29:23 +06:00
parent 6cfe1b5190
commit 1004581b6c
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src_rebuild/GAME/C/SPOOL.C
View File

@ -110,7 +110,7 @@ int chunk_complete;
int new_area_location;
int LoadingArea = 0;
unsigned short *newmodels;
unsigned short *newmodels = NULL;
SPOOLQ spooldata[48];
@ -1159,6 +1159,26 @@ void RequestSpool(int type, int data, int offset, int loadsize, char *address, s
/* WARNING: Unknown calling convention yet parameter storage is locked */
// [A]
void ClearSpooledModelSlots()
{
if (!newmodels)
return;
// clear old model ids
int nmodels = *newmodels;
unsigned short* new_model_numbers = newmodels + 1;
// set old model ids to dummy
for (int i = 0; i < nmodels; i++)
{
int model_number = new_model_numbers[i];
modelpointers[model_number] = &dummyModel;
}
SPOOL_INFO("freed %d model slots\n", nmodels);
}
// [D] [T]
void InitSpooling(void)
{
@ -1168,6 +1188,8 @@ void InitSpooling(void)
ClearRegion(i);
}
ClearSpooledModelSlots();
newmodels = NULL;
spool_regioncounter = 0;
spoolerror = 0;
@ -1727,22 +1749,8 @@ void SetupModels(void)
// [D] [T]
void LoadInAreaModels(int area)
{
if (newmodels)
{
// clear old model ids
int nmodels = *newmodels;
unsigned short* new_model_numbers = newmodels + 1;
// set old model ids to dummy
for (int i = 0; i < nmodels; i++)
{
int model_number = new_model_numbers[i];
modelpointers[model_number] = &dummyModel;
}
SPOOL_INFO("freed %d model slots\n", nmodels);
}
ClearSpooledModelSlots();
int length = AreaData[area].model_size;
newmodels = (ushort *)(model_spool_buffer + (length-1) * 2048);