Added allllllll the old mobjs. Still need to reassign level ids.

src/doomdef.h

@@ -143,16 +143,16 @@ extern FILE *logstream;
 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    103 // Game version
-#define SUBVERSION 19 // more precise version number
+#define SUBVERSION 20 // more precise version number
 #define VERSIONSTRING "Development EXE"
-#define VERSIONSTRINGW "v1.3.19"
+#define VERSIONSTRINGW "v1.3.20"
 // most interface strings are ignored in development mode.
 // we use comprevision and compbranch instead.
 #else
 #define VERSION    103 // Game version
-#define SUBVERSION 19  // more precise version number
+#define SUBVERSION 20  // more precise version number
-#define VERSIONSTRING "DevEXE v1.3.19"
+#define VERSIONSTRING "DevEXE v1.3.20"
-#define VERSIONSTRINGW L"v1.3.19"
+#define VERSIONSTRINGW L"v1.3.20"
 // Hey! If you change this, add 1 to the MODVERSION below!
 // Otherwise we can't force updates!
 #endif

src/info.h

@@ -605,6 +605,16 @@ typedef enum sprite
 
 	// Additional Kart Objects
 	SPR_POKE, // Pokey
+	SPR_AUDI, // Audience members
+	SPR_DECO, // Old 1.0 Kart Decoratives + New misc ones
+	SPR_DOOD, // All the old D00Dkart objects
+	SPR_SNES, // Sprites for SNES remake maps
+	SPR_GBAS, // Sprites for GBA remake maps
+	SPR_SPRS, // Sapphire Coast Spring Shell
+	SPR_BUZB, // Sapphire Coast Buzz Mk3
+	SPR_CHOM, // Sapphire Coast Chomper
+	SPR_SACO, // Sapphire Coast Fauna
+	SPR_CRAB, // Crystal Abyss mobs
 
 	SPR_FIRSTFREESLOT,
 	SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
@@ -3227,6 +3237,128 @@ typedef enum state
 	S_POKEY8,
 	S_POKEYIDLE,
 
+	// Audience Members
+	S_RANDOMAUDIENCE,
+	S_AUDIENCE_TOAD1,
+	S_AUDIENCE_TOAD2,
+	S_AUDIENCE_BOO1,
+	S_AUDIENCE_BOO2,
+	S_AUDIENCE_GMBA1,
+	S_AUDIENCE_GMBA2,
+	S_AUDIENCE_SHYG1,
+	S_AUDIENCE_SHYG2,
+	S_AUDIENCE_SNIF1,
+	S_AUDIENCE_SNIF2,
+
+	S_FANCHAR_KOTE,
+	S_FANCHAR_RYAN,
+	S_FANCHAR_WENDY,
+	S_FANCHAR_FREEZOR,
+	S_FANCHAR_METALKO,
+	S_FANCHAR_BLACKOUT,
+	S_FANCHAR_BLADE,
+	S_FANCHAR_HINOTE,
+
+	// 1.0 Kart Decoratives
+	S_FLAYM1,
+	S_FLAYM2,
+	S_FLAYM3,
+	S_FLAYM4,
+	S_DEVIL,
+	S_ANGEL,
+	S_PALMTREE,
+	S_FLAG,
+	S_HEDGEHOG, // (Rimshot)
+	S_BUSH1,
+	S_TWEE,
+	S_HYDRANT,
+
+	// New Misc Decorations
+	S_BIGPUMA1,
+	S_BIGPUMA2,
+	S_BIGPUMA3,
+	S_BIGPUMA4,
+	S_BIGPUMA5,
+	S_BIGPUMA6,
+	S_APPLE1,
+	S_APPLE2,
+	S_APPLE3,
+	S_APPLE4,
+	S_APPLE5,
+	S_APPLE6,
+	S_APPLE7,
+	S_APPLE8,
+
+	// D00Dkart - Fall Flowers
+	S_DOOD_FLOWER1,
+	S_DOOD_FLOWER2,
+	S_DOOD_FLOWER3,
+	S_DOOD_FLOWER4,
+	S_DOOD_FLOWER5,
+	S_DOOD_FLOWER6,
+
+	// D00Dkart - Super Circuit Box
+	S_DOOD_BOX1,
+	S_DOOD_BOX2,
+	S_DOOD_BOX3,
+	S_DOOD_BOX4,
+	S_DOOD_BOX5,
+
+	// D00Dkart - Diddy Kong Racing Balloon
+	S_DOOD_BALLOON,
+
+	// D00Dkart - Big Ring
+	S_DOOD_RING1,
+	S_DOOD_RING2,
+	S_DOOD_RING3,
+	S_DOOD_RING4,
+	S_DOOD_RING5,
+
+	// SNES Objects
+	
+
+	// GBA Objects
+	S_GBA_BOO1,
+	S_GBA_BOO2,
+	S_GBA_BOO3,
+	S_GBA_BOO4,
+
+	// Sapphire Coast Mobs
+	S_BUZZBOMBER_LOOK1,
+	S_BUZZBOMBER_LOOK2,
+	S_BUZZBOMBER_FLY1,
+	S_BUZZBOMBER_FLY2,
+	S_BUZZBOMBER_FLY3,
+	S_BUZZBOMBER_FLY4,
+
+	S_CHOMPER_SPAWN,
+	S_CHOMPER_HOP1,
+	S_CHOMPER_HOP2,
+	S_CHOMPER_TURNAROUND,
+
+	S_PALMTREE2,
+	S_PURPLEFLOWER1,
+	S_PURPLEFLOWER2,
+	S_YELLOWFLOWER1,
+	S_YELLOWFLOWER2,
+	S_PLANT2,
+	S_PLANT3,
+	S_PLANT4,
+
+	// Crystal Abyss Mobs
+	S_SKULL,
+	S_PHANTREE,
+	S_FLYINGGARG1,
+	S_FLYINGGARG2,
+	S_FLYINGGARG3,
+	S_FLYINGGARG4,
+	S_FLYINGGARG5,
+	S_FLYINGGARG6,
+	S_FLYINGGARG7,
+	S_FLYINGGARG8,
+	S_LAMPPOST,
+	S_MOSSYTREE,
+
 #ifdef SEENAMES
 	S_NAMECHECK,
 #endif
@@ -3809,6 +3941,56 @@ typedef enum mobj_type
 	MT_ENEMYFLIP,
 	MT_WAYPOINT,
 
+	MT_RANDOMAUDIENCE,
+	MT_FANCHAR_KOTE,
+	MT_FANCHAR_RYAN,
+	MT_FANCHAR_WENDY,
+	MT_FANCHAR_FREEZOR,
+	MT_FANCHAR_METALKO,
+	MT_FANCHAR_BLACKOUT,
+	MT_FANCHAR_BLADE,
+	MT_FANCHAR_HINOTE,
+
+	MT_FLAYM,
+	MT_DEVIL,
+	MT_ANGEL,
+	MT_PALMTREE,
+	MT_FLAG,
+	MT_HEDGEHOG,
+	MT_BUSH1,
+	MT_TWEE,
+	MT_HYDRANT,
+
+	MT_BIGPUMA,
+	MT_APPLE,
+
+	MT_DOOD_FLOWER1,
+	MT_DOOD_FLOWER2,
+	MT_DOOD_FLOWER3,
+	MT_DOOD_FLOWER4,
+	MT_DOOD_BOX,
+	MT_DOOD_BALLOON,
+	MT_DOOD_RING,
+
+	MT_GBA_BOO,
+
+	MT_BUZZBOMBER,
+	MT_CHOMPER,
+	MT_PALMTREE2,
+	MT_PURPLEFLOWER1,
+	MT_PURPLEFLOWER2,
+	MT_YELLOWFLOWER1,
+	MT_YELLOWFLOWER2,
+	MT_PLANT2,
+	MT_PLANT3,
+	MT_PLANT4,
+
+	MT_SKULL,
+	MT_PHANTREE,
+	MT_FLYINGGARG,
+	MT_LAMPPOST,
+	MT_MOSSYTREE,
+
 #ifdef SEENAMES
 	MT_NAMECHECK,
 #endif

src/p_map.c

@@ -1124,14 +1124,15 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		fixed_t tmz     = ((thing->eflags & MFE_VERTICALFLIP) ? -(tmthing->z + tmthing->height) : tmthing->z);
 		fixed_t tmznext = ((thing->eflags & MFE_VERTICALFLIP) ? -tmthing->momz : tmthing->momz) + tmz;
 		fixed_t thzh    = ((thing->eflags & MFE_VERTICALFLIP) ? -thing->z : thing->z + thing->height);
-		fixed_t sprarea = FixedMul(8*FRACUNIT, thing->scale) * P_MobjFlip(thing);
+		//fixed_t sprarea = FixedMul(8*FRACUNIT, thing->scale) * P_MobjFlip(thing);
 
-		if ((tmznext <= thzh && tmz > thzh) || (tmznext > thzh - sprarea && tmznext < thzh))
+		//if ((tmznext <= thzh && tmz > thzh) || (tmznext > thzh - sprarea && tmznext < thzh))
+		if (tmznext <= thzh)
 		{
 			P_DoSpring(thing, tmthing);
-			return true;
+		//	return true;
 		}
-		else if (tmz > thzh - sprarea && tmz < thzh) // Don't damage people springing up / down
+		//else if (tmz > thzh - sprarea && tmz < thzh) // Don't damage people springing up / down
 			return true;
 	}
 	// missiles can hit other things