OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Clear references to map data on level change

Browse source 
These shouldn't be left as they'll now point towards potentially invalid memory and also cause errors with serializing. Arrays and maps holding them are cleared. Also unlinks and relinks inventory items correctly from the hashmap on traveling.
This commit is contained in:
Boondorl 2025-07-07 21:23:16 -04:00 • committed by Ricardo Luís Vaz Silva
commit 269689703d
6 changed files with 87 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/g_level.cpp
View file

@ -1646,6 +1646,9 @@ void FLevelLocals::StartTravel ()
inv->UnlinkFromWorld (nullptr);
inv->UnlinkBehaviorsFromLevel();
inv->DeleteAttachedLights();
tid = inv->tid;
inv->SetTID(0);
inv->tid = tid;
}
}
}
@ -1751,7 +1754,7 @@ int FLevelLocals::FinishTravel ()
pawn->LinkBehaviorsToLevel();
pawn->ClearInterpolation();
pawn->ClearFOVInterpolation();
const int tid = pawn->tid; // Save TID (actor isn't linked into the hash chain yet)
int tid = pawn->tid; // Save TID (actor isn't linked into the hash chain yet)
pawn->tid = 0; // Reset TID
pawn->SetTID(tid); // Set TID (and link actor into the hash chain)
pawn->SetState(pawn->SpawnState);
@ -1763,6 +1766,9 @@ int FLevelLocals::FinishTravel ()
inv->LinkToWorld (nullptr);
P_FindFloorCeiling(inv, FFCF_ONLYSPAWNPOS);
inv->LinkBehaviorsToLevel();
tid = inv->tid;
inv->tid = 0;
inv->SetTID(tid);
IFVIRTUALPTRNAME(inv, NAME_Inventory, Travelled)
{