zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into openal

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-26 09:37:49 +02:00
commit a23afbd7ce
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_acs.cpp
View file

@ -1562,7 +1562,7 @@ void FBehavior::StaticSerializeModuleStates (FArchive &arc)
if (modnum != StaticModules.Size()) 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) for (modnum = 0; modnum < StaticModules.Size(); ++modnum)
@ -1583,7 +1583,7 @@ void FBehavior::StaticSerializeModuleStates (FArchive &arc)
if (stricmp (modname, module->ModuleName) != 0) if (stricmp (modname, module->ModuleName) != 0)
{ {
delete[] modname; 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()) else if (ModSize != module->GetDataSize())
{ {

2
src/p_mobj.cpp
View file

@ -4749,7 +4749,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
// [RH] sound sequence overriders // [RH] sound sequence overriders
if (mentry->Type == NULL && mentry->Special == SMT_SSeqOverride) 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 == 255) type = -1;
if (type > 63) if (type > 63)
{ {