OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Stuff from master.

Browse source
This commit is contained in:
Mari the Deer 2021-10-09 21:35:13 +02:00
commit 12911c652c
3 changed files with 54 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
zscript/handler/swwm_handler_playerevents.zsc
View file

@ -107,6 +107,27 @@ extend Class SWWMHandler
s.GotWeapon(Weapon(i).GetClass());
}
}
else if ( (s.lastcluster != level.cluster) || !(level.clusterflags&LevelLocals.CLUSTER_HUB) )
{
// clear the "weapon got" lists for weapons we don't have anymore (unless we're in a hub)
// so the obtain lines play again
for ( int i=0; i<s.alreadygot.Size(); i++ )
{
// special case for dual weapons
String cn = s.alreadygot[i].GetClassName();
if ( (cn.Left(4) ~== "Dual") )
{
int ss = p.mo.CountInv(GetDefaultByType(s.alreadygot[i]).SisterWeaponType);
if ( ss == 2 ) continue;
s.alreadygot.Delete(i);
i--;
continue;
}
if ( p.mo.FindInventory(s.alreadygot[i]) ) continue;
s.alreadygot.Delete(i);
i--;
}
}
// reset some vars
multilevel[e.playernumber] = 0;
spreecount[e.playernumber] = 0;