From 0fd93cc033d9a40f1b7e9e73fb532897cc710a10 Mon Sep 17 00:00:00 2001
From: Edward Richardson <Edward850@crantime.org>
Date: Sat, 25 Apr 2015 18:10:26 +1200
Subject: [PATCH 1/2] Slightly more information on ACS serialize errors

---
 src/p_acs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 43d7c7bd5..753d7728f 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -1562,7 +1562,7 @@ void FBehavior::StaticSerializeModuleStates (FArchive &arc)
 
 	if (modnum != StaticModules.Size())
 	{
-		I_Error ("Level was saved with a different number of ACS modules.");
+		I_Error("Level was saved with a different number of ACS modules. (Have %d, save has %d)", StaticModules.Size(), modnum);
 	}
 
 	for (modnum = 0; modnum < StaticModules.Size(); ++modnum)
@@ -1583,7 +1583,7 @@ void FBehavior::StaticSerializeModuleStates (FArchive &arc)
 			if (stricmp (modname, module->ModuleName) != 0)
 			{
 				delete[] modname;
-				I_Error ("Level was saved with a different set of ACS modules.");
+				I_Error("Level was saved with a different set or order of ACS modules. (Have %s, save has %s)", module->ModuleName, modname);
 			}
 			else if (ModSize != module->GetDataSize())
 			{

From 46e975418d9776de580b9e404fe2a100b464d6ae Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 26 Apr 2015 08:48:49 +0200
Subject: [PATCH 2/2] - fixeed: Sound sequence overrides took the parameter
 from the wrong data structure.

---
 src/p_mobj.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 5921f97e7..e2aa67764 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -4749,7 +4749,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 	// [RH] sound sequence overriders
 	if (mentry->Type == NULL && mentry->Special == SMT_SSeqOverride)
 	{
-		int type = mentry->Args[0];
+		int type = mthing->args[0];
 		if (type == 255) type = -1;
 		if (type > 63)
 		{