- Redid ClearLcoks() fix that I accidentally removed.

SVN r102 (trunk)
This commit is contained in:
Randy Heit 2006-05-10 04:12:43 +00:00
parent c70ba60fd6
commit 032526340a
3 changed files with 7 additions and 2 deletions

View file

@ -1,4 +1,5 @@
May 9, 2006
- Redid ClearLcoks() fix that I accidentally removed.
- Added a new setting for am_rotate: 2 will enable rotation only for the
overlay map while leaving the regular map unrotated.
- Added a new setting for am_overlay: 2 will disable the normal automap and

View file

@ -322,7 +322,11 @@ static void ClearLocks()
{
if (PClass::m_Types[i]->IsDescendantOf(RUNTIME_CLASS(AKey)))
{
static_cast<AKey*>(GetDefaultByType(PClass::m_Types[i]))->KeyNumber=0;
AKey *key = static_cast<AKey*>(GetDefaultByType(PClass::m_Types[i]));
if (key != NULL)
{
key->KeyNumber = 0;
}
}
}
for(i=0;i<256;i++)

View file

@ -2180,7 +2180,7 @@ void ProcessActor(void (*process)(FState *, int))
catch (...)
{
if (info)
SC_ScriptError("Unexpected error during parsing of actor %s", info->Class->Name+1);
SC_ScriptError("Unexpected error during parsing of actor %s", info->Class->TypeName.GetChars());
else
SC_ScriptError("Unexpected error during parsing of actor definitions");
}