From 34255908b0ecfb036f7149ba9184944e5517b5bf Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Thu, 11 Feb 2016 20:41:04 +0100
Subject: [PATCH] - fixed: Initialization of spawn IDs from MAPINFO and
 DECORATE was in the wrong order. (looks like a badly resolved merging
 conflict)

---
 src/d_main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 23c837dfab..d2120f88e1 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2481,8 +2481,9 @@ void D_DoomMain (void)
 		FinishDehPatch();
 
 		InitActorNumsFromMapinfo();
-		PClassActor::StaticSetActorNums ();
 		InitSpawnablesFromMapinfo();
+		PClassActor::StaticSetActorNums();
+
 		//Added by MC:
 		bglobal.getspawned.Clear();
 		argcount = Args->CheckParmList("-bots", &args);