diff --git a/src/doomdata.h b/src/doomdata.h
index b51dd5d20a..71e581e268 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -347,10 +347,10 @@ struct FMapThing
 	fixed_t		y;
 	fixed_t		z;
 	short		angle;
-	FDoomEdEntry *info;
-	short		EdNum;
 	WORD		SkillFilter;
 	WORD		ClassFilter;
+	short		EdNum;
+	FDoomEdEntry *info;
 	DWORD		flags;
 	int			special;
 	int			args[5];
diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp
index c6fffd87c2..ddfa0e2ec1 100644
--- a/src/p_buildmap.cpp
+++ b/src/p_buildmap.cpp
@@ -781,14 +781,14 @@ vertex_t *FindVertex (fixed_t x, fixed_t y)
 static void CreateStartSpot (fixed_t *pos, FMapThing *start)
 {
 	short angle = LittleShort(*(WORD *)(&pos[3]));
-	FMapThing mt =
-	{
-		0, (LittleLong(pos[0])<<12), ((-LittleLong(pos[1]))<<12), 0,// tid, x, y, z
-		short(Scale ((2048-angle)&2047, 360, 2048)), DoomEdMap.CheckKey(1), 1,	// angle, type
-		0, 0,							// Skillfilter, Classfilter
-		7|MTF_SINGLE|224,				// flags
-		0, {0}, 0 						// special is 0, args and Conversation are 0
-	};
+	FMapThing mt = { 0, };
+
+	mt.x = LittleLong(pos[0])<<12;
+	mt.y = (-LittleLong(pos[1]))<<12;
+	mt.angle = short(Scale((2048-angle)&2047, 360, 2048));
+	mt.info = DoomEdMap.CheckKey(1);
+	mt.EdNum = 1;
+	mt.flags = 7|MTF_SINGLE|224;
 
 	*start = mt;
 }