Remove XDeath injection. It is a gross hack and it should not be used.
|
|
@ -1,3 +1,3 @@
|
|||
[default]
|
||||
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r713 \cu(Wed 28 Dec 22:18:03 CET 2022)\c-";
|
||||
SWWM_SHORTVER="\cw1.3pre r713 \cu(2022-12-28 22:18:03)\c-";
|
||||
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r714 \cu(Wed 28 Dec 22:20:01 CET 2022)\c-";
|
||||
SWWM_SHORTVER="\cw1.3pre r714 \cu(2022-12-28 22:20:01)\c-";
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 976 B |
|
Before Width: | Height: | Size: 766 B |
|
Before Width: | Height: | Size: 725 B |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 996 B |
|
Before Width: | Height: | Size: 683 B |
|
Before Width: | Height: | Size: 697 B |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
|
@ -137,30 +137,6 @@ extend Class SWWMHandler
|
|||
let pt = Actor.Spawn("PartyTime",e.Thing.pos);
|
||||
pt.target = e.Thing;
|
||||
}
|
||||
// force insert gib animations on some vanilla Doom monsters
|
||||
int gibhealth = e.Thing.GetGibHealth();
|
||||
bool gotgibbed = (!e.Thing.bDONTGIB && ((e.Inflictor && e.Inflictor.bEXTREMEDEATH) || (e.DamageSource && e.DamageSource.bEXTREMEDEATH) || (e.DamageType == 'Extreme') || (e.Thing.Health < gibhealth)) && (!e.Inflictor || !e.Inflictor.bNOEXTREMEDEATH) && (!e.DamageSource || !e.DamageSource.bNOEXTREMEDEATH));
|
||||
if ( !gotgibbed )
|
||||
{
|
||||
if ( profiling ) ProfileTock(PT_WORLDTHINGDIED);
|
||||
return;
|
||||
}
|
||||
if ( (e.Thing.GetClass() == "Demon") || (e.Thing.GetClass() == "Spectre") )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"DemonXDeath");
|
||||
else if ( e.Thing.GetClass() == "HellKnight" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"KnightXDeath");
|
||||
else if ( e.Thing.GetClass() == "BaronOfHell" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"BaronXDeath");
|
||||
else if ( e.Thing.GetClass() == "Cacodemon" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"CacoXDeath");
|
||||
else if ( e.Thing.GetClass() == "Revenant" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"BonerXDeath");
|
||||
else if ( e.Thing.GetClass() == "Archvile" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"VileXDeath");
|
||||
else if ( e.Thing.GetClass() == "Arachnotron" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"ArachXDeath");
|
||||
else if ( e.Thing.GetClass() == "Fatso" )
|
||||
ExtraGibDeaths.GibThis(e.Thing,"FatsoXDeath");
|
||||
if ( profiling ) ProfileTock(PT_WORLDTHINGDIED);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -808,98 +808,6 @@ Class PurpleBloodReference : Actor
|
|||
}
|
||||
}
|
||||
|
||||
// bare actor used for extra gib deaths
|
||||
Class ExtraGibDeaths : SWWMNonInteractiveActor
|
||||
{
|
||||
StateLabel gibstate;
|
||||
|
||||
static void GibThis( Actor a, Statelabel st )
|
||||
{
|
||||
if ( !a ) return;
|
||||
let g = ExtraGibDeaths(Spawn("ExtraGibDeaths"));
|
||||
g.master = a;
|
||||
g.gibstate = st;
|
||||
}
|
||||
|
||||
void A_DoGib()
|
||||
{
|
||||
if ( !master ) return;
|
||||
master.SetState(FindState(gibstate));
|
||||
}
|
||||
|
||||
States
|
||||
{
|
||||
Spawn:
|
||||
TNT1 A 1 NoDelay;
|
||||
TNT1 A 1 A_DoGib();
|
||||
Stop;
|
||||
DemonXDeath:
|
||||
SARX A 5;
|
||||
SARX B 5 A_XScream();
|
||||
SARX C 5 A_NoBlocking();
|
||||
SARX DEF 5;
|
||||
SARX G -1;
|
||||
Stop;
|
||||
KnightXDeath:
|
||||
BO2X A 5;
|
||||
BO2X B 5 A_XScream();
|
||||
BO2X C 5;
|
||||
BO2X D 5 A_NoBlocking();
|
||||
BO2X EFGH 5;
|
||||
BO2X I -1;
|
||||
Stop;
|
||||
BaronXDeath:
|
||||
BOSX A 5;
|
||||
BOSX B 5 A_XScream();
|
||||
BOSX C 5;
|
||||
BOSX D 5 A_NoBlocking();
|
||||
BOSX EFGH 5;
|
||||
BOSX I -1 A_BossDeath();
|
||||
Stop;
|
||||
CacoXDeath:
|
||||
CACX A 5;
|
||||
CACX B 5 A_XScream();
|
||||
CACX C 5 A_NoBlocking();
|
||||
CACX D 4;
|
||||
CACX E 3;
|
||||
CACX F 4;
|
||||
CACX G 5;
|
||||
CACX H -1;
|
||||
Stop;
|
||||
BonerXDeath:
|
||||
REVX A 3;
|
||||
REVX B 4 A_XScream();
|
||||
REVX C 5 A_NoBlocking();
|
||||
REVX DE 5;
|
||||
REVX F -1;
|
||||
Stop;
|
||||
VileXDeath:
|
||||
VILX A 5;
|
||||
VILX B 5 A_XScream();
|
||||
VILX C 5 A_NoBlocking();
|
||||
VILX DEF 5;
|
||||
VILX G -1;
|
||||
Stop;
|
||||
ArachXDeath:
|
||||
BSPX A 5;
|
||||
BSPX A 5 A_XScream();
|
||||
BSPX B 8 A_NoBlocking();
|
||||
BSPX C 6;
|
||||
BSPX DE 6 BRIGHT;
|
||||
BSPX F 5 BRIGHT;
|
||||
BSPX GH 4 BRIGHT;
|
||||
BSPX I -1 A_BossDeath();
|
||||
Stop;
|
||||
FatsoXDeath:
|
||||
FATX A 5;
|
||||
FATX B 5 A_XScream();
|
||||
FATX C 5 A_NoBlocking();
|
||||
FATX DE 5;
|
||||
FATX F -1 A_BossDeath();
|
||||
Stop;
|
||||
}
|
||||
}
|
||||
|
||||
// corpse thump handler
|
||||
Class CorpseFallTracker : Thinker
|
||||
{
|
||||
|
|
|
|||