- removed the COMPATF_MBFDEHACKED flag because it wouldn't work and is more or less useless anyway.

The range checks this protected against can be safely omitted now that the misc fields are large enough.
- added MBF Dehacked emulation.

SVN r1824 (trunk)

docs/rh-log.txt

@@ -1,6 +1,7 @@
 September 14, 2009  (Changes by Graf Zahl)
 - Fixed: Argument count for UsePuzzleItem was wrong.
 - Added a few things from Gez's experimental build:
+  * MBF Dehacked emulation.
   * MBF's dog (definition only, no sprites yet.)
   * User variables. There's an array of 10. They can be set and checked in
     both DECORATE and ACS.

src/d_dehacked.cpp

@@ -64,11 +64,14 @@
 #include "v_palette.h"
 #include "a_sharedglobal.h"
 #include "thingdef/thingdef.h"
+#include "thingdef/thingdef_exp.h"
 #include "vectors.h"
 #include "dobject.h"
 #include "r_translate.h"
 #include "sc_man.h"
+#include "i_system.h"
 #include "doomerrors.h"
+#include "p_effect.h"
 
 // [SO] Just the way Randy said to do it :)
 // [RH] Made this CVAR_SERVERINFO
@@ -142,6 +145,23 @@ static TArray<StyleName> StyleNames;
 static TArray<const PClass *> AmmoNames;
 static TArray<const PClass *> WeaponNames;
 
+// DeHackEd trickery to support MBF-style parameters
+// List of states that are hacked to use a codepointer
+struct MBFParamState
+{
+	FState * state;
+	int pointer;
+};
+static TArray<MBFParamState *> MBFParamStates;
+// Data on how to correctly modify the codepointers
+struct CodePointerAlias
+{
+	char name[20];
+	char alias[20];
+	BYTE params;
+};
+static TArray<CodePointerAlias> MBFCodePointers;
+
 // Miscellaneous info that used to be constant
 DehInfo deh =
 {
@@ -309,7 +329,6 @@ static void PushTouchedActor(PClass *cls)
 static int HandleMode (const char *mode, int num)
 {
 	int i = 0;
-
 	while (Modes[i].name && stricmp (Modes[i].name, mode))
 		i++;
 
@@ -575,12 +594,145 @@ static int GetLine (void)
 	}
 }
 
+// This enum must be in sync with the Aliases array in DEHSUPP.
+enum MBFCodePointers
+{
+	// Die and Detonate are not in this list because these codepointers have
+	// no dehacked arguments and therefore do not need special handling.
+	// NailBomb has no argument but is implemented as new parameters for A_Explode.
+	MBF_Mushroom,	// misc1 = vrange (arg +3), misc2 = hrange (arg+4)
+	MBF_Spawn,		// misc1 = type (arg +0), misc2 = Z-pos (arg +2)
+	MBF_Turn,		// misc1 = angle (in degrees) (arg +0 but factor in current actor angle too)
+	MBF_Face,		// misc1 = angle (in degrees) (arg +0)
+	MBF_Scratch,	// misc1 = damage, misc 2 = sound
+	MBF_PlaySound,	// misc1 = sound, misc2 = attenuation none (true) or normal (false)
+	MBF_RandomJump,	// misc1 = state, misc2 = probability
+	MBF_LineEffect,	// misc1 = Boom linedef type, misc2 = sector tag
+	SMMU_NailBomb,	// No misc, but it's basically A_Explode with an added effect
+};
+
+int PrepareStateParameters(FState * state, int numparams, const PClass *cls);// Should probably be in a .h file.
+
+// Hacks the parameter list for the given state so as to convert MBF-args (misc1 and misc2) into real args.
+
+void SetDehParams(FState * state, int codepointer)
+{
+	int value1 = state->GetMisc1();
+	int value2 = state->GetMisc2();
+	if (!(value1|value2)) return;
+	
+	// Fakey fake script position thingamajig. Because NULL cannot be used instead.
+	// Even if the lump was parsed by an FScanner, there would hardly be a way to
+	// identify which line is troublesome.
+	FScriptPosition * pos = new FScriptPosition(FString("DEHACKED"), 0);
+	
+	// Let's identify the codepointer we're dealing with.
+	PSymbolActionFunction * sym; PSymbol * s;	
+	s = RUNTIME_CLASS(AInventory)->Symbols.FindSymbol(FName(MBFCodePointers[codepointer].name), true);
+	if (!s || s->SymbolType != SYM_ActionFunction) return;
+	sym = static_cast<PSymbolActionFunction*>(s);
+
+
+	// Bleargh! This will all have to be redone once scripting works
+
+	// Not sure exactly why the index for a state is greater by one point than the index for a symbol.
+	DPrintf("SetDehParams: Paramindex is %d, default is %d.\n", 
+		state->ParameterIndex-1, sym->defaultparameterindex);
+	if (state->ParameterIndex-1 == sym->defaultparameterindex)
+	{
+		int a = PrepareStateParameters(state, MBFCodePointers[codepointer].params+1, 
+			FState::StaticFindStateOwner(state)) -1;
+		int b = sym->defaultparameterindex;
+		//		StateParams.Copy(a, b, MBFParams[codepointer]);
+		// Meh, function doesn't work. For some reason it resets the paramindex to the default value.
+		// For instance, a dehacked Commander Keen calling A_Explode would result in a crash as
+		// ACTION_PARAM_INT(damage, 0) would properly evaluate at paramindex 1377, but then 
+		// ACTION_PARAM_INT(distance, 1) would improperly evaluate at paramindex 148! Now I'm not sure
+		// whether it's a genuine problem or working as intended and merely not appropriate for the
+		// task at hand here. So rather than modify it, I use a simple for loop of Set()s and Get()s,
+		// with a small modification to Set() that I know will have no repercussion anywhere else.
+		for (int i = 0; i<MBFCodePointers[codepointer].params; i++)
+		{
+			StateParams.Set(a+i, StateParams.Get(b+i), true);
+		}
+		DPrintf("New paramindex is %d.\n", state->ParameterIndex-1);
+	}
+	int ParamIndex = state->ParameterIndex - 1;
+
+	switch (codepointer)
+	{
+	case MBF_Mushroom:
+		StateParams.Set(ParamIndex+2, new FxConstant(1, *pos)); // Flag
+		// NOTE: Do not convert to float here because it will lose precision. It must be double.
+		if (value1) StateParams.Set(ParamIndex+3, new FxConstant(value1/65536., *pos)); // vrange
+		if (value2) StateParams.Set(ParamIndex+4, new FxConstant(value2/65536., *pos)); // hrange
+		break;
+	case MBF_Spawn:
+		if (InfoNames[value1-1] == NULL)
+		{
+			I_Error("No class found for dehackednum %d!\n", value1+1);
+			return;
+		}
+		StateParams.Set(ParamIndex+0, new FxConstant(InfoNames[value1-1], *pos));	// type
+		StateParams.Set(ParamIndex+2, new FxConstant(value2, *pos));				// height
+		break;
+	case MBF_Turn:
+		// Intentional fall through. I tried something more complicated by creating an
+		// FxExpression that corresponded to "variable angle + angle" so as to use A_SetAngle
+		// as well, but it became an overcomplicated mess that didn't even work as I had to
+		// create a compile context as well and couldn't get it right.
+	case MBF_Face:
+		StateParams.Set(ParamIndex+0, new FxConstant(value1, *pos)); // angle
+		break;
+	case MBF_Scratch:	// misc1 = damage, misc 2 = sound
+		StateParams.Set(ParamIndex+0, new FxConstant(value1, *pos));							// damage
+		if (value2) StateParams.Set(ParamIndex+1, new FxConstant(SoundMap[value2-1], *pos));	// hit sound
+		break;
+	case MBF_PlaySound:
+		StateParams.Set(ParamIndex+0, new FxConstant(SoundMap[value1-1], *pos));			// soundid
+		StateParams.Set(ParamIndex+4, new FxConstant((value2?ATTN_NONE:ATTN_NORM), *pos));	// attenuation
+		break;
+	case MBF_RandomJump:
+		StateParams.Set(ParamIndex+0, new FxConstant(2, *pos));					// count
+		StateParams.Set(ParamIndex+1, new FxConstant(value2, *pos));			// maxchance
+		StateParams.Set(ParamIndex+2, new FxConstant(FindState(value1), *pos));	// jumpto
+		break;
+	case MBF_LineEffect:
+		// This is the second MBF codepointer that couldn't be translated easily.
+		// Calling P_TranslateLineDef() here was a simple matter, as was adding an
+		// extra parameter to A_CallSpecial so as to replicate the LINEDONE stuff,
+		// but unfortunately DEHACKED lumps are processed before the map translation
+		// arrays are initialized so this didn't work.
+		StateParams.Set(ParamIndex+0, new FxConstant(value1, *pos));	// special
+		StateParams.Set(ParamIndex+1, new FxConstant(value2, *pos));	// tag
+		break;
+	case SMMU_NailBomb:
+		// That one does not actually have MBF-style parameters. But since
+		// we're aliasing it to an extension of A_Explode...
+		StateParams.Set(ParamIndex+5, new FxConstant(30, *pos));	// nails
+		StateParams.Set(ParamIndex+6, new FxConstant(10, *pos));	// naildamage
+		break;
+	default:
+		// This simply should not happen.
+		Printf("Unmanaged dehacked codepointer alias num %i\n", codepointer);
+	}
+}
+
 static int PatchThing (int thingy)
 {
 	enum
 	{
+		// Boom flags
 		MF_TRANSLATION	= 0x0c000000,	// if 0x4 0x8 or 0xc, use a translation
 		MF_TRANSSHIFT	= 26,			// table for player colormaps
+		// A couple of Boom flags that don't exist in ZDoom
+		MF_SLIDE		= 0x00002000,	// Player: keep info about sliding along walls.
+		MF_TRANSLUCENT	= 0x80000000,	// Translucent sprite?
+		// MBF flags: TOUCHY is remapped to flags6, FRIEND is turned into FRIENDLY,
+		// and finally BOUNCES is replaced by bouncetypes with the BOUNCES_MBF bit.
+		MF_TOUCHY		= 0x10000000,	// killough 11/98: dies when solids touch it
+		MF_BOUNCES		= 0x20000000,	// killough 7/11/98: for beta BFG fireballs
+		MF_FRIEND		= 0x40000000,	// killough 7/18/98: friendly monsters
 	};
 
 	int result;
@@ -793,20 +945,26 @@ static int PatchThing (int thingy)
 			{
 				DWORD value[4] = { 0, 0, 0 };
 				bool vchanged[4] = { false, false, false };
+				// ZDoom used to block the upper range of bits to force use of mnemonics for extra flags.
+				// MBF also defined extra flags in the same range, but without forcing mnemonics. For MBF
+				// compatibility, the upper bits are freed, but we have conflicts between the ZDoom bits
+				// and the MBF bits. The only such flag exposed to DEHSUPP, though, is STEALTH -- the others
+				// are not available through mnemonics, and aren't available either through their bit value.
+				// So if we find the STEALTH keyword, it's a ZDoom mod, otherwise assume assume FRIEND.
+				bool zdoomflags = false;
 				char *strval;
 
 				for (strval = Line2; (strval = strtok (strval, ",+| \t\f\r")); strval = NULL)
 				{
 					if (IsNum (strval))
 					{
-						// Force the top 4 bits to 0 so that the user is forced
+						value[0] |= (unsigned long)strtol(strval, NULL, 10);
-						// to use the mnemonics to change them. And MF_SLIDE doesn't
-						// exist anymore, so 0 that too.
-						value[0] |= strtoul(strval, NULL, 10) & 0x0fffdfff;
 						vchanged[0] = true;
 					}
 					else
 					{
+						// STEALTH FRIEND HACK!
+						if (!stricmp(strval, "STEALTH")) zdoomflags = true;
 						unsigned i;
 						for(i = 0; i < BitNames.Size(); i++)
 						{
@@ -825,12 +983,110 @@ static int PatchThing (int thingy)
 				}
 				if (vchanged[0])
 				{
+				/*	Just some testing info				
+					Printf("value[0]: %x   %i\n", value[0], value[0]);
+					for (int flagi = 0; flagi < 31; flagi++)
+						if (value[0] & 1<<flagi) Printf(" %s", flagnamesd[flagi]);
+					Printf("\n");*/
+
+					if (value[0] & MF_SLIDE)
+					{
+						// SLIDE (which occupies in Doom what is the MF_INCHASE slot in ZDoom)
+						value[0] &= ~MF_SLIDE; // clean the slot
+						// Nothing else to do, this flag is never actually used.
+					}
 					if (value[0] & MF_TRANSLATION)
 					{
 						info->Translation = TRANSLATION (TRANSLATION_Standard,
 							((value[0] & MF_TRANSLATION) >> (MF_TRANSSHIFT))-1);
 						value[0] &= ~MF_TRANSLATION;
 					}
+					if (value[0] & MF_TOUCHY)
+					{
+						// TOUCHY (which occupies in MBF what is the MF_UNMORPHED slot in ZDoom)
+						value[0] &= ~MF_TOUCHY; // clean the slot
+						info->flags6 |= MF6_TOUCHY; // remap the flag
+					}
+					if (value[0] & MF_BOUNCES)
+					{
+						// BOUNCES (which occupies in MBF the MF_NOLIFTDROP slot)
+						// This flag is especially convoluted as what it does depend on what
+						// other flags the actor also has, and whether it's "sentient" or not.
+						value[0] &= ~MF_BOUNCES; // clean the slot
+
+						// MBF considers that things that bounce can be damaged, even if not shootable.
+						info->flags6 |= MF6_VULNERABLE;
+						// MBF also considers that bouncers pass through blocking lines as projectiles.
+						info->flags3 |= MF3_NOBLOCKMONST;
+						// MBF also considers that bouncers that explode are grenades, and MBF grenades
+						// are supposed to hurt everything, except cyberdemons if they're fired by cybies.
+						// Let's translate that in a more generic way as grenades which hurt everything
+						// except the class of their shooter. Yes, it does diverge a bit from MBF, as for
+						// example a dehacked arachnotron that shoots grenade would kill itself quickly
+						// in MBF and will not here. But class-specific checks are cumbersome and limiting.
+						info->flags4 |= (MF4_FORCERADIUSDMG | MF4_DONTHARMCLASS);
+
+						// MBF bouncing missiles rebound on floors and ceiling, but not on walls.
+						// This is different from BOUNCE_Heretic behavior as in Heretic the missiles
+						// die when they bounce, while in MBF they will continue to bounce until they
+						// collide with a wall or a solid actor.
+						if (value[0] & MF_MISSILE) info->BounceFlags = BOUNCE_Classic;
+						// MBF bouncing actors that do not have the missile flag will also rebound on
+						// walls, and this does correspond roughly to the ZDoom bounce style.
+						else info->BounceFlags = BOUNCE_Grenade;
+
+						// MBF grenades are dehacked rockets that gain the BOUNCES flag but
+						// lose the MISSILE flag, so they can be identified here easily.
+						if (!(value[0] & MF_MISSILE) && info->effects & FX_ROCKET)
+						{
+							info->effects &= ~FX_ROCKET;	// replace rocket trail
+							info->effects |= FX_GRENADE;	// by grenade trail
+						}
+
+						// MBF bounce factors depend on flag combos:
+						enum
+						{
+							MBF_BOUNCE_NOGRAVITY	= FRACUNIT,				// With NOGRAVITY: full momentum
+							MBF_BOUNCE_FLOATDROPOFF	= (FRACUNIT * 85) / 100,// With FLOAT and DROPOFF: 85%
+							MBF_BOUNCE_FLOAT		= (FRACUNIT * 70) / 100,// With FLOAT alone: 70%
+							MBF_BOUNCE_DEFAULT		= (FRACUNIT * 45) / 100,// Without the above flags: 45%
+							MBF_BOUNCE_WALL			= (FRACUNIT * 50) / 100,// Bouncing off walls: 50%
+						};
+						info->bouncefactor = ((value[0] & MF_NOGRAVITY) ? MBF_BOUNCE_NOGRAVITY
+							: (value[0] & MF_FLOAT) ? (value[0] & MF_DROPOFF) ? MBF_BOUNCE_FLOATDROPOFF
+							: MBF_BOUNCE_FLOAT : MBF_BOUNCE_DEFAULT);
+
+						info->wallbouncefactor = ((value[0] & MF_NOGRAVITY) ? MBF_BOUNCE_NOGRAVITY : MBF_BOUNCE_WALL);
+
+						// MBF sentient actors with BOUNCE and FLOAT are able to "jump" by floating up.
+						if (info->IsSentient())
+						{
+							if (value[0] & MF_FLOAT) info->flags6 |= MF6_CANJUMP;
+						}
+						// Non sentient actors can be damaged but they shouldn't bleed.
+						else
+						{
+							value[0] |= MF_NOBLOOD;
+						}
+					}
+					if (zdoomflags && (value [0] & MF_STEALTH))
+					{
+						// STEALTH FRIEND HACK!
+					}
+					else if (value[0] & MF_FRIEND) 
+					{
+						// FRIEND (which occupies in MBF the MF_STEALTH slot)
+						value[0] &= ~MF_FRIEND; // clean the slot
+						value[0] |= MF_FRIENDLY; // remap the flag to its ZDoom equivalent
+						// MBF friends are not blocked by monster blocking lines:
+						info->flags3 |= MF3_NOBLOCKMONST;
+					}
+					if (value[0] & MF_TRANSLUCENT)
+					{
+						// TRANSLUCENT (which occupies in Boom the MF_ICECORPSE slot)
+						value[0] &= ~MF_TRANSLUCENT; // clean the slot
+						vchanged[2] = true; value[2] |= 2; // let the TRANSLUCxx code below handle it
+					}
 					info->flags = value[0];
 				}
 				if (vchanged[1])
@@ -1044,25 +1300,11 @@ static int PatchFrame (int frameNum)
 		}
 		else if (keylen == 9 && stricmp (Line1, "Unknown 1") == 0)
 		{
-			if (val < -128 || val > 127)
+			misc1 = val;
-			{
-				Printf ("Frame %d: misc1 is out of range\n", frameNum);
-			}
-			else
-			{
-				misc1 = val;
-			}
 		}
 		else if (keylen == 9 && stricmp (Line1, "Unknown 2") == 0)
 		{
-			if (val < 0 || val > 255)
+			info->Misc2 = val;
-			{
-				Printf ("Frame %d: misc2 is out of range\n", frameNum);
-			}
-			else
-			{
-				info->Misc2 = val;
-			}
 		}
 		else if (keylen == 13 && stricmp (Line1, "Sprite number") == 0)
 		{
@@ -1105,11 +1347,7 @@ static int PatchFrame (int frameNum)
 
 	if (info != &dummy)
 	{
-		if (misc1 != 0 && tics > 254)
+		info->DefineFlags |= SDF_DEHACKED;	// Signals the state has been modified by dehacked
-		{
-			Printf ("Frame %d: Misc1 must be 0 if tics >254\n", frameNum);
-			misc1 = 0;
-		}
 		if ((unsigned)(frame & 0x7fff) > 63)
 		{
 			Printf ("Frame %d: Subnumber must be in range [0,63]\n", frameNum);
@@ -1118,6 +1356,8 @@ static int PatchFrame (int frameNum)
 		info->Misc1 = misc1;
 		info->Frame = (frame & 0x3f) |
 			(frame & 0x8000 ? SF_FULLBRIGHT : 0);
+		Printf("Misc1 patched to %d, Misc2 patched to %d in state %x (framenum %d)\n", 
+			info->Misc1, info->Misc2, info, frameNum);
 	}
 
 	return result;
@@ -1357,15 +1597,31 @@ static int PatchWeapon (int weapNum)
 	return result;
 }
 
-static void SetPointer(FState *state, PSymbol *sym)
+static void SetPointer(FState *state, PSymbol *sym, int frame = 0)
 {
+	Printf("Changing the pointer for state %d (%x)\n", frame, state);
 	if (sym==NULL || sym->SymbolType != SYM_ActionFunction)
 	{
 		state->SetAction(NULL);
+		return;
 	}
 	else
 	{
+		FString symname = sym->SymbolName;
 		state->SetAction(static_cast<PSymbolActionFunction*>(sym));
+
+		// Note: CompareNoCase() calls stricmp() and therefore returns 0 when they're the same.
+		for (unsigned int i = 0; i < MBFCodePointers.Size(); i++)
+		{
+			if (!symname.CompareNoCase(MBFCodePointers[i].name))
+			{
+				MBFParamState * newstate = new MBFParamState;
+				newstate->state = state;
+				newstate->pointer = i;
+				MBFParamStates.Push(newstate);
+				break; // No need to cycle through the rest of the list.
+			}
+		}
 	}
 }
 
@@ -1414,8 +1670,10 @@ static int PatchPointer (int ptrNum)
 					SetPointer(state, NULL);
 				else
 				{
-					SetPointer(state, Actions[index]);
+					SetPointer(state, Actions[index], CodePConv[ptrNum]);
 				}
+				DPrintf("%s has a hacked state for pointer num %i with index %i\nLine1=%s, Line2=%s\n", 
+					state->StaticFindStateOwner(state)->TypeName.GetChars(), ptrNum, index, Line1, Line2);
 			}
 			else
 			{
@@ -1720,6 +1978,16 @@ static int PatchCodePtrs (int dummy)
 				else
 					symname.Format("A_%s", Line2);
 
+				// Let's consider as aliases some redundant MBF pointer
+				for (unsigned int i = 0; i < MBFCodePointers.Size(); i++)
+				{
+					if (!symname.CompareNoCase(MBFCodePointers[i].alias))
+					{
+						symname = MBFCodePointers[i].name;
+						Printf("%s --> %s\n", MBFCodePointers[i].alias, MBFCodePointers[i].name);
+					}
+				}
+
 				// This skips the action table and goes directly to the internal symbol table
 				// DEH compatible functions are easy to recognize.
 				PSymbol *sym = RUNTIME_CLASS(AInventory)->Symbols.FindSymbol(symname, true);
@@ -1736,12 +2004,7 @@ static int PatchCodePtrs (int dummy)
 						sym = NULL;
 					}
 				}
-				SetPointer(state, sym);
+				SetPointer(state, sym, frame);
-				// Hack to trigger compatible mode for A_Mushroom when called from Dehacked mods
-				if (symname.CompareNoCase("A_Mushroom"))
-				{
-					state->Misc1 = 1;
-				}
 			}
 		}
 	}
@@ -2233,6 +2496,15 @@ static void UnloadDehSupp ()
 {
 	if (--DehUseCount <= 0)
 	{
+		// Handle MBF params here, before the required arrays are cleared
+		for (unsigned int i=0; i < MBFParamStates.Size(); i++)
+		{
+			SetDehParams(MBFParamStates[i]->state, MBFParamStates[i]->pointer);
+		}
+		MBFParamStates.Clear();
+		MBFParamStates.ShrinkToFit();
+		MBFCodePointers.Clear();
+		MBFCodePointers.ShrinkToFit();
 		// StateMap is not freed here, because if you load a second
 		// dehacked patch through some means other than including it
 		// in the first patch, it won't see the state information
@@ -2563,6 +2835,27 @@ static bool LoadDehSupp ()
 					sc.MustGetStringName(",");
 				}
 			}
+			else if (sc.Compare("Aliases"))
+			{
+				sc.MustGetStringName("{");
+				while (!sc.CheckString("}"))
+				{
+					CodePointerAlias temp;
+					sc.MustGetString();
+					strncpy(temp.alias, sc.String, 19);
+					temp.alias[19]=0;
+					sc.MustGetStringName(",");
+					sc.MustGetString();
+					strncpy(temp.name, sc.String, 19);
+					temp.name[19]=0;
+					sc.MustGetStringName(",");
+					sc.MustGetNumber();
+					temp.params = sc.Number;
+					MBFCodePointers.Push(temp);
+					if (sc.CheckString("}")) break;
+					sc.MustGetStringName(",");
+				}
+			}
 			else
 			{
 				sc.ScriptError("Unknown section '%s'", sc.String);

src/d_main.cpp

@@ -512,7 +512,7 @@ CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
 
 	case 5: // MBF compat mode
 		v = COMPATF_TRACE|COMPATF_SOUNDTARGET|COMPATF_BOOMSCROLL|COMPATF_MUSHROOM|
-			COMPATF_MBFDEHACKED|COMPATF_MBFTORQUE|COMPATF_MBFMONSTERMOVE|COMPATF_NOBLOCKFRIENDS;
+			COMPATF_MBFTORQUE|COMPATF_MBFMONSTERMOVE|COMPATF_NOBLOCKFRIENDS;
 		break;
 
 	}

src/g_doom/a_fatso.cpp

@@ -151,7 +151,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Mushroom)
 			target->x = self->x + (i << FRACBITS);    // Aim in many directions from source
 			target->y = self->y + (j << FRACBITS);
 			target->z = self->z + (P_AproxDistance(i,j) * vrange); // Aim up fairly high
-			if (flags == 0 && (self->state->Misc1 == 0 || !(i_compatflags & COMPATF_MUSHROOM)))
+			if (flags == 0 && (!(self->state->DefineFlags & SDF_DEHACKED) || !(i_compatflags & COMPATF_MUSHROOM)))
 			{
 				mo = P_SpawnMissile (self, target, spawntype); // Launch fireball
 			}

src/g_hexen/a_blastradius.cpp

@@ -59,8 +59,9 @@ bool AArtiBlastRadius::Use (bool pickup)
 		else if (!(mo->flags3 & MF3_ISMONSTER) &&
 			!(mo->player) &&
 			!(mo->flags & MF_MISSILE) &&
-			!(mo->flags3 & MF3_CANBLAST))
+			!(mo->flags3 & MF3_CANBLAST) &&
-		{	// Must be monster, player, or missile
+			!(mo->flags6 & MF6_TOUCHY))
+		{	// Must be monster, player, missile, or touchy
 			continue;
 		}
 		if (mo->flags2 & MF2_DORMANT)
@@ -162,5 +163,10 @@ void AArtiBlastRadius::BlastActor (AActor *victim, fixed_t strength)
 		{
 			victim->flags2 |= MF2_BLASTED;
 		}
+		if (victim->flags6 & MF6_TOUCHY)
+		{ // Touchy objects die when blasted
+			victim->flags6 &= ~MF6_ARMED; // Disarm
+			P_DamageMobj(victim, Owner, Owner, victim->health, NAME_Melee, DMG_FORCED);
+		}
 	}
 }

src/g_shared/a_artifacts.cpp

@@ -91,10 +91,7 @@ void APowerupGiver::Serialize (FArchive &arc)
 	Super::Serialize (arc);
 	arc << PowerupType;
 	arc << EffectTics << BlendColor << Mode;
-	if (SaveVersion >= 1693)
+	arc << Strength;
-	{
-		arc << Strength;
-	}
 }
 
 // Powerup -------------------------------------------------------------------
@@ -128,10 +125,7 @@ void APowerup::Serialize (FArchive &arc)
 {
 	Super::Serialize (arc);
 	arc << EffectTics << BlendColor << Mode;
-	if (SaveVersion >= 1693)
+	arc << Strength;
-	{
-		arc << Strength;
-	}
 }
 
 //===========================================================================

src/info.h

@@ -55,8 +55,8 @@ struct FState
 {
 	WORD		sprite;
 	SWORD		Tics;
-	SBYTE		Misc1;
+	long		Misc1;			// Was changed to SBYTE, reverted to long for MBF compat
-	BYTE		Misc2;
+	long		Misc2;			// Was changed to BYTE, reverted to long for MBF compat
 	BYTE		Frame;
 	BYTE		DefineFlags;	// Unused byte so let's use it during state creation.
 	FState		*NextState;

src/m_options.cpp

@@ -1109,7 +1109,6 @@ static menuitem_t CompatibilityItems[] = {
 	{ bitflag,  "Allow any bossdeath for level special",	{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_ANYBOSSDEATH} },
 	{ bitflag,  "No Minotaur floor flames in water",		{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MINOTAUR} },
 	{ bitflag,  "Original A_Mushroom speed in DEH mods",	{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MUSHROOM} },
-	{ bitflag,	"Allow MBF DeHackEd parameters",			{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MBFDEHACKED} },
 	{ bitflag,	"Allow MBF pseudo-torque effects",			{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MBFTORQUE} },
 	{ bitflag,	"Monster movement is affected by effects",	{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_MBFMONSTERMOVE} },
 	{ bitflag,	"Crushed monsters can be resurrected",		{&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_CORPSEGIBS} },

src/p_saveg.cpp

@@ -418,11 +418,8 @@ void extsector_t::Serialize(FArchive &arc)
 
 FArchive &operator<< (FArchive &arc, side_t::part &p)
 {
-	arc << p.xoffset << p.yoffset << p.interpolation << p.texture;// << p.Light;
+	arc << p.xoffset << p.yoffset << p.interpolation << p.texture 
-	if (SaveVersion >= 1645)
+		<< p.xscale << p.yscale;// << p.Light;
-	{
-		arc << p.xscale << p.yscale;
-	}
 	return arc;
 }
 

src/p_user.cpp

@@ -424,11 +424,8 @@ void APlayerPawn::Serialize (FArchive &arc)
 		<< InvFirst
 		<< InvSel
 		<< MorphWeapon
-		<< DamageFade;
+		<< DamageFade
-	if (SaveVersion >= 1695)
+		<< PlayerFlags;
-	{
-		arc << PlayerFlags;
-	}
 }
 
 //===========================================================================

wadsrc/static/actors/actor.txt

@@ -46,6 +46,10 @@ ACTOR Actor native //: Thinker
 	native fixed_t momy;	// alias for vely
 	native fixed_t momz;	// alias for velz
 	native int score;
+	// Meh, MBF redundant functions. Only for DeHackEd support.
+	action native A_Turn(float angle = 0);
+	action native A_LineEffect(int boomspecial = 0, int tag = 0);
+	// End of MBF redundant functions.
 
 	action native A_MonsterRail();
 	action native A_BFGSpray(class<Actor> spraytype = "BFGExtra", int numrays = 40, int damagecount = 15);
@@ -167,7 +171,7 @@ ACTOR Actor native //: Thinker
 	action native A_MeleeAttack();
 	action native A_ComboAttack();
 	action native A_BulletAttack();
-	action native A_PlaySound(sound whattoplay, int slot = CHAN_BODY, float volume = 1.0, bool looping = false, float attenuation = ATTN_NORM);
+	action native A_PlaySound(sound whattoplay = "weapons/pistol", int slot = CHAN_BODY, float volume = 1.0, bool looping = false, float attenuation = ATTN_NORM);
 	action native A_PlayWeaponSound(sound whattoplay);
 	action native A_FLoopActiveSound();
 	action native A_LoopActiveSound();
@@ -175,7 +179,7 @@ ACTOR Actor native //: Thinker
 	action native A_PlaySoundEx(sound whattoplay, coerce name slot, bool looping = false, int attenuation = 0);
 	action native A_StopSoundEx(coerce name slot);
 	action native A_SeekerMissile(int threshold, int turnmax);
-	action native A_Jump(int chance, state label, ...);
+	action native A_Jump(int chance = 256, state label, ...);
 	action native A_CustomMissile(class<Actor> missiletype, float spawnheight = 32, int spawnofs_xy = 0, float angle = 0, int flags = 0, float pitch = 0);
 	action native A_CustomBulletAttack(float spread_xy, float spread_z, int	numbullets, int damageperbullet, class<Actor> pufftype = "BulletPuff", float range = 0, bool aimfacing = false);
 	action native A_CustomRailgun(int damage, int spawnofs_xy = 0, color color1 = "", color color2 = "", int flags = 0, bool aim = false, float maxdiff = 0, class<Actor> pufftype = "BulletPuff");
@@ -185,7 +189,7 @@ ACTOR Actor native //: Thinker
 	action native A_JumpIfArmorType(string Type, state label, int amount = 1);
 	action native A_GiveInventory(class<Inventory> itemtype, int amount = 0);
 	action native A_TakeInventory(class<Inventory> itemtype, int amount = 0);
-	action native A_SpawnItem(class<Actor> itemtype, float distance = 0, float zheight = 0, bool useammo = true, bool transfer_translation = false);
+	action native A_SpawnItem(class<Actor> itemtype = "Unknown", float distance = 0, float zheight = 0, bool useammo = true, bool transfer_translation = false);
 	action native A_SpawnItemEx(class<Actor> itemtype, float xofs = 0, float yofs = 0, float zofs = 0, float xvel = 0, float yvel = 0, float zvel = 0, float angle = 0, int flags = 0, int failchance = 0);
 	action native A_Print(string whattoprint, float time = 0, string fontname = "");
 	action native A_PrintBold(string whattoprint, float time = 0, string fontname = "");
@@ -220,7 +224,7 @@ ACTOR Actor native //: Thinker
 	action native A_GiveToTarget(class<Inventory> itemtype, int amount = 0);
 	action native A_TakeFromTarget(class<Inventory> itemtype, int amount = 0);
 	action native A_CountdownArg(int argnum);
-	action native A_CustomMeleeAttack(int damage, sound meleesound = "", sound misssound = "", name damagetype = "none", bool bleed = true);
+	action native A_CustomMeleeAttack(int damage = 0, sound meleesound = "", sound misssound = "", name damagetype = "none", bool bleed = true);
 	action native A_CustomComboAttack(class<Actor> missiletype, float spawnheight, int damage, sound meleesound = "", name damagetype = "none", bool bleed = true);
 	action native A_Burst(class<Actor> chunktype);
 	action native A_RadiusThrust(int force = 128, int distance = -1, bool affectsource = true);

wadsrc/static/actors/doom/doommisc.txt

@@ -77,5 +77,52 @@ ACTOR DoomUnusedStates
 		stop
 		PLAY S -1
 		stop
+	TNT: // MBF compatibility
+		TNT1 A -1
+		Loop
+	}
+}
+
+Actor DemonicDagger : ScoreItem
+{
+	Inventory.PickupMessage "$BETA_BONUS1"
+	States
+	{
+	Spawn:
+		BON1 A 6
+		Loop
+	}
+}
+
+Actor SkullChest : ScoreItem
+{
+	Inventory.PickupMessage "$BETA_BONUS2"
+	States
+	{
+	Spawn:
+		BON2 A 6
+		Loop
+	}
+}
+
+Actor EvilSceptre : ScoreItem 2016
+{
+	Inventory.PickupMessage "$BETA_BONUS3"
+	States
+	{
+	Spawn:
+		BON3 A 6
+		Loop
+	}
+}
+
+Actor UnholyBible : ScoreItem 2017
+{
+	Inventory.PickupMessage "$BETA_BONUS4"
+	States
+	{
+	Spawn:
+		BON4 A 6
+		Loop
 	}
 }

wadsrc/static/actors/doom/doomweapons.txt

@@ -342,12 +342,13 @@ ACTOR Rocket
 
 // --------------------------------------------------------------------------
 //
-// Grenade -- Taken and adapted from Skulltag
+// Grenade -- Taken and adapted from Skulltag, with MBF stuff added to it
 //
 // --------------------------------------------------------------------------
 
 ACTOR Grenade
 {
+	Game Doom
 	SpawnID 216
 	Radius 8
 	Height 8
@@ -376,6 +377,17 @@ ACTOR Grenade
 		MISL C 6 Bright
 		MISL D 4 Bright
 		Stop
+	Grenade:
+		MISL A 1000 A_Die
+		Wait
+	Detonate:
+		MISL B 4 A_Scream
+		MISL C 6 A_Detonate
+		MISL D 10
+		Stop
+	Mushroom:
+		MISL B 8 A_Mushroom
+		Goto Death+1
 	}
 }
 
@@ -446,7 +458,41 @@ ACTOR PlasmaBall
 	}
 }
 
+// --------------------------------------------------------------------------
+//
+// BFG 2704
+//
+// --------------------------------------------------------------------------
 
+ACTOR PlasmaBall1 : PlasmaBall
+{
+	Damage 4
+	BounceType "Classic"
+	BounceFactor 1.0
+	Obituary "$OB_MPBFG_MBF"
+	States
+	{
+	Spawn:
+		PLS1 AB 6 Bright
+		Loop
+	Death:
+		PLS1 CDEFG 4 Bright
+		Stop
+	}
+}
+	
+ACTOR PlasmaBall2 : PlasmaBall1
+{
+	States
+	{
+	Spawn:
+		PLS2 AB 6 Bright
+		Loop
+	Death:
+		PLS2 CDE 4 Bright
+		Stop
+	}
+}
 
 // --------------------------------------------------------------------------
 //
@@ -489,6 +535,12 @@ ACTOR BFG9000 : DoomWeapon 2006
 	Spawn:
 		BFUG A -1
 		Stop
+	OldFire:
+		BFGG A 10 A_BFGsound
+		BFGG BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB 1 A_FireOldBFG
+		BFGG B 0 A_Light0
+		BFGG B 20 A_ReFire
+		Goto Ready
 	}
 }
 

wadsrc/static/decaldef.txt

@@ -522,6 +522,78 @@ decal RevenantScorch
 	randomflipy
 }
 
+/***** MBF OldBFG plasma scorches ******************************************/
+
+
+decal GreenPlasmaScorch1
+{
+	pic PLS1A0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal DoomImpScorch
+}
+
+decal GreenPlasmaScorch2
+{
+	pic PLS1B0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal DoomImpScorch
+}
+
+decal GreenPlasmaScorch3
+{
+	pic PLS1C0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal DoomImpScorch
+}
+
+decal GreenPlasmaScorch4
+{
+	pic PLS1D0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal DoomImpScorch
+}
+
+decalgroup GreenPlasmaScorch
+{
+	GreenPlasmaScorch1	1
+	GreenPlasmaScorch2	1
+	GreenPlasmaScorch3	1
+	GreenPlasmaScorch4	1
+}
+
+decal RedPlasmaScorch1
+{
+	pic PLS2A0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal PlasmaScorchLower1
+}
+
+decal RedPlasmaScorch2
+{
+	pic PLS2B0
+	add 1.0
+	fullbright
+	animator GoAway
+	lowerdecal PlasmaScorchLower2
+}
+
+decalgroup RedPlasmaScorch
+{
+	RedPlasmaScorch1	1
+	RedPlasmaScorch2	1
+}
+
+
 // Graf Zahl provided definitions for the other games.
 
 /***** Crossbow ************************************************************/
@@ -975,6 +1047,8 @@ generator Chaingun			BulletChip
 generator PlasmaBall			PlasmaScorch
 generator Rocket			Scorch
 generator BFGBall			BFGLightning
+generator PlasmaBall1		GreenPlasmaScorch
+generator PlasmaBall2		RedPlasmaScorch
 
 generator MarinePistol			BulletChip
 generator MarineShotgun			BulletChip

wadsrc/static/dehsupp.txt

@@ -239,7 +239,17 @@ CodePConv
 	733, 734, 735, 736, 737, 738, 739, 740, 741, 743,
 	745, 746, 750, 751, 766, 774, 777, 779, 780, 783,
 	784, 785, 786, 787, 788, 789, 790, 791, 792, 793,
-	794, 795, 796, 797, 798, 801, 809, 811
+	794, 795, 796, 797, 798, 801, 809, 811, // 448th
+	// Now for the 74 MBF states with code pointers
+	968, 969, 970, 972, 973, 974, 975, 976, 977, 978,
+	979, 980, 981, 982, 983, 984, 986, 988, 990, 999,
+	1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
+	1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015,
+	1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+	1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031,
+	1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039,
+	1040, 1041, 1056, 1057, 1058, 1059, 1060, 1061,
+	1062, 1065, 1071, 1073, 1074, 1075 // Total: 522
 };
 
 // Sprite names in the order Doom originally had them.
@@ -258,7 +268,8 @@ OrgSprNames
 	POL3,POL1,POL6,GOR2,GOR3,GOR4,GOR5,SMIT,COL1,COL2,
 	COL3,COL4,CAND,CBRA,COL6,TRE1,TRE2,ELEC,CEYE,FSKU,
 	COL5,TBLU,TGRN,TRED,SMBT,SMGT,SMRT,HDB1,HDB2,HDB3,
-	HDB4,HDB5,HDB6,POB1,POB2,BRS1,TLMP,TLP2
+	HDB4,HDB5,HDB6,POB1,POB2,BRS1,TLMP,TLP2,
+	TNT1,DOGS,PLS1,PLS2,BON3,BON4	// Added by MBF
 };
 
 StateMap
@@ -400,6 +411,17 @@ StateMap
 	BrainStem,			Spawn, 1,	// S_BRAINSTEM
 	TechLamp,			Spawn, 4,	// S_TECHLAMP - S_TECHLAMP4
 	TechLamp2,			Spawn, 4	// S_TECH2LAMP - S_TECH2LAMP4
+	DoomUnusedStates,	TNT, 1,			// [MBF] S_TNT1							967
+	Grenade,			Grenade, 1,		// [MBF] S_GRENADE						968
+	Grenade,			Detonate, 3,	// [MBF] S_DETONATE - S_DETONATE3		969-971
+	Dog,				Spawn, 27,		// [MBF] S_DOGS_STND - S_DOGS_RAISE6	972-998
+	BFG9000,			OldFire, 43,	// [MBF] S_OLDBFG1 - S_OLDBFG43			999-1041
+	PlasmaBall1,		Spawn, 7,		// [MBF] S_PLS1BALL - S_PLS1EXP5		1042-1048
+	PlasmaBall2,		Spawn, 5,		// [MBF] S_PLS2BALL - S_PLS2BALLX3		1049-1053
+	EvilSceptre,		Spawn, 1,		// [MBF] S_BON3							1054
+	UnholyBible,		Spawn, 1,		// [MBF] S_BON4							1055
+	BetaSkull,			Spawn, 19,		// [MBF] S_BSKUL_STND - S_BSKUL_DIE8	1056-1074
+	Grenade,			Mushroom, 1,	// [MBF] S_MUSHROOM						1075
 };
 
 // Sound equivalences. When a patch tries to change a sound, use these sound names.
@@ -654,7 +676,16 @@ InfoNames
 	HangTNoBrain,
 	ColonGibs,
 	SmallBloodPool,
-	BrainStem
+	BrainStem,
+// Boom additional actors:
+	PointPusher,
+	PointPuller,
+// MBF additional actors:
+	Dog,
+	PlasmaBall1,
+	PlasmaBall2,
+	EvilSceptre,
+	UnholyBible
 };
 
 ThingBits
@@ -672,6 +703,7 @@ ThingBits
 	10, 0, DROPOFF,
 	11, 0, PICKUP,
 	12, 0, NOCLIP,
+	13, 0, SLIDE,
 	14, 0, FLOAT,
 	15, 0, TELEPORT,
 	16, 0, MISSILE,
@@ -691,7 +723,10 @@ ThingBits
 	28, 0, UNUSED2,			// BOOM compatibility
 	29, 0, UNUSED3,			// BOOM compatibility
 	30, 0, UNUSED4,			// BOOM compatibility
-	 2, 2, TRANSLUCENT,		// BOOM compatibility?
+	28, 0, TOUCHY,			// MBF compatibility
+	29, 0, BOUNCES,			// MBF compatibility
+	30, 0, FRIEND,			// MBF compatibility
+	31, 0, TRANSLUCENT,		// BOOM compatibility
 	30, 0, STEALTH,
 	 1, 2, TRANSLUC25,
 	 2, 2, TRANSLUC50,
@@ -773,3 +808,22 @@ WeaponNames
 	Chainsaw,
 	SuperShotgun
 };
+
+// Codepointer aliases
+// The idea is that, rather than add redundant codepointers for compatibility,
+// or codepointers that would require to transform ZDoom's underlying architecture
+// because they refer to things, sounds or states by their DeHackEd numbers,
+// we can translate their parameters and transform them into standard functions
+// when parsing a DEHACKED lump. 
+Aliases
+{
+	A_Mushroom,		A_Mushroom,				5,
+	A_Spawn,		A_SpawnItem,			5,
+	A_Turn,			A_Turn,					1,
+	A_Face,			A_SetAngle,				1,
+	A_Scratch,		A_CustomMeleeAttack,	5,	// 19 characters for "A_CustomMeleeAttack"!
+	A_PlaySound,	A_PlaySound,			5,	// A function name any longer and the definition
+	A_RandomJump,	A_Jump,					3,	// for CodePointerAlias would need to be updated.
+	A_LineEffect,	A_LineEffect,			2,
+	A_NailBomb,		A_Explode,				7,
+};