From ff95948017f4b22610aa1f8721199cef19d89c0f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 2 Jan 2010 12:40:07 +0000
Subject: [PATCH] SVN r2079 (trunk)

---
 docs/rh-log.txt | 2 ++
 src/p_acs.cpp   | 1 +
 src/statnums.h  | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 81e4be4a82..707cdec108 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 January 2, 2010  (Changes by Graf Zahl)
+- fixed: The ACS thinker needs its own statnum above all actors. Otherwise
+  order of execution is not guaranteed.
 - fixed: Only ActorMovers should go into STAT_ACTORMOVER, not all PathFollowers.
 - fixed: SBARINFO's DrawGem command accepted a size value of 0 and divided
   by it. Reinstated the old '+1' this command had in the old code.
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 6ffabeec3e..d79154609a 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -1798,6 +1798,7 @@ END_POINTERS
 TObjPtr<DACSThinker> DACSThinker::ActiveThinker;
 
 DACSThinker::DACSThinker ()
+: DThinker(STAT_SCRIPTS)
 {
 	if (ActiveThinker)
 	{
diff --git a/src/statnums.h b/src/statnums.h
index 201b586da5..f699b9c392 100644
--- a/src/statnums.h
+++ b/src/statnums.h
@@ -60,8 +60,9 @@ enum
 	STAT_MAPMARKER,							// Map marker actors
 
 	STAT_DEFAULT = 100,
-	STAT_SECTOREFFECT,
-	STAT_ACTORMOVER,
+	STAT_SECTOREFFECT,						// All sector effects that cause floor and ceiling movement
+	STAT_ACTORMOVER,						// actor movers
+	STAT_SCRIPTS,							// The ACS thinker. This is to ensure that it can't tick before all actors calles PostBeginPlay
 };
 
 #endif
\ No newline at end of file