src/deh_soc.c

@@ -1680,6 +1680,8 @@ void readlevelheader(MYFILE *f, INT32 num)
 				mapheaderinfo[num-1]->skybox_scaley = (INT16)i;
 			else if (fastcmp(word, "SKYBOXSCALEZ"))
 				mapheaderinfo[num-1]->skybox_scalez = (INT16)i;
+			else if (fastcmp(word, "OBJECTSCALE"))
+				mapheaderinfo[num-1]->object_scale = get_number(word2);
 
 			else if (fastcmp(word, "BONUSTYPE"))
 			{

src/doomstat.h

@@ -312,6 +312,7 @@ typedef struct
 	INT16 skybox_scalex;   ///< Skybox X axis scale. (0 = no movement, 1 = 1:1 movement, 16 = 16:1 slow movement, -4 = 1:4 fast movement, etc.)
 	INT16 skybox_scaley;   ///< Skybox Y axis scale.
 	INT16 skybox_scalez;   ///< Skybox Z axis scale.
+	fixed_t object_scale;  ///< Global object scale.
 
 	// Extra information.
 	char interscreen[8];  ///< 320x200 patch to display at intermission.

src/lua_maplib.c

@@ -2163,6 +2163,8 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->skybox_scaley);
 	else if (fastcmp(field,"skybox_scalez"))
 		lua_pushinteger(L, header->skybox_scalez);
+	else if (fastcmp(field,"object_scale"))
+		lua_pushinteger(L, header->object_scale);
 	else if (fastcmp(field,"interscreen")) {
 		for (i = 0; i < 8; i++)
 			if (!header->interscreen[i])

src/p_mobj.c

@@ -10520,13 +10520,18 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 	mobj->destscale = mobj->scale;
 	mobj->scalespeed = FRACUNIT/12;
 
-	// TODO: Make this a special map header
-	if ((maptol & TOL_ERZ3) && !(mobj->type == MT_BLACKEGGMAN))
+	// TODO: remove oldbrak/TOL_ERZ3 garbage
+	if (mapheaderinfo[gamemap-1] && (mapheaderinfo[gamemap-1]->object_scale) && !(maptol & TOL_ERZ3))
+	{
+		P_SetScale(mobj, FixedMul(mobj->scale, mapheaderinfo[gamemap-1]->object_scale));
+		mobj->destscale = FixedMul(mobj->destscale, mapheaderinfo[gamemap-1]->object_scale);
+	}
+	else if ((maptol & TOL_ERZ3) && !(mobj->type == MT_BLACKEGGMAN))
 		mobj->destscale = FRACUNIT/2;
 
 	// Sprite rendering
 	mobj->blendmode = AST_TRANSLUCENT;
-	mobj->spritexscale = mobj->spriteyscale = mobj->scale;
+	mobj->spritexscale = mobj->spriteyscale = FRACUNIT;
 	mobj->spritexoffset = mobj->spriteyoffset = 0;
 	mobj->floorspriteslope = NULL;
 

src/p_setup.c

@@ -372,6 +372,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
 	mapheaderinfo[num]->skybox_scalex = 16;
 	mapheaderinfo[num]->skybox_scaley = 16;
 	mapheaderinfo[num]->skybox_scalez = 16;
+	mapheaderinfo[num]->object_scale = FRACUNIT;
 	mapheaderinfo[num]->interscreen[0] = '#';
 	mapheaderinfo[num]->runsoc[0] = '#';
 	mapheaderinfo[num]->scriptname[0] = '#';