Merged MQ12b update

This commit is contained in:
Eddoursul 2024-02-21 17:41:16 +01:00
parent fe9971362f
commit b410dd4e62
5 changed files with 8 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -27,8 +27,8 @@ Function PrepareNPC(Actor akMoveActor, Bool bOnlyGhost = False)
Return Return
EndIf EndIf
If bOnlyGhost == False && RegisteredDisabledNPCs.Find(akMoveActor) < 0 If bOnlyGhost == False
If akMoveActor.IsDisabled() If RegisteredDisabledNPCs.Find(akMoveActor) >= 0 || akMoveActor.IsDisabled()
Return Return
EndIf EndIf
@ -54,9 +54,10 @@ Function PrepareNPC(Actor akMoveActor, Bool bOnlyGhost = False)
EndFunction EndFunction
Function _RegisterDisabledNPC(Actor akMoveActor) Function _RegisterDisabledNPC(Actor akMoveActor)
if nRegisteredDisabledNPCs + 1 <= 128 int iSlot = nRegisteredDisabledNPCs
RegisteredDisabledNPCs[nRegisteredDisabledNPCs] = akMoveActor if iSlot + 1 <= 128
nRegisteredDisabledNPCs += 1 nRegisteredDisabledNPCs += 1
RegisteredDisabledNPCs[iSlot] = akMoveActor
Debug.Trace("Registered disabled " + akMoveActor.GetBaseObject().GetName() + " " + (akMoveActor as String)) Debug.Trace("Registered disabled " + akMoveActor.GetBaseObject().GetName() + " " + (akMoveActor as String))
else else
; Added overflow to the ghosted ; Added overflow to the ghosted
@ -65,9 +66,10 @@ Function _RegisterDisabledNPC(Actor akMoveActor)
EndFunction EndFunction
Function _RegisterGhostedNPC(Actor akMoveActor) Function _RegisterGhostedNPC(Actor akMoveActor)
if nRegisteredGhostedNPCs + 1 <= 128 int iSlot = nRegisteredGhostedNPCs
RegisteredGhostedNPCs[nRegisteredGhostedNPCs] = akMoveActor if iSlot + 1 <= 128
nRegisteredGhostedNPCs += 1 nRegisteredGhostedNPCs += 1
RegisteredGhostedNPCs[iSlot] = akMoveActor
Debug.Trace("Registered ghosted " + akMoveActor.GetBaseObject().GetName() + " " + (akMoveActor as String)) Debug.Trace("Registered ghosted " + akMoveActor.GetBaseObject().GetName() + " " + (akMoveActor as String))
else else
; oh well ; oh well