mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
- Redid ClearLcoks() fix that I accidentally removed.
SVN r102 (trunk)
This commit is contained in:
parent
c70ba60fd6
commit
032526340a
3 changed files with 7 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
||||||
May 9, 2006
|
May 9, 2006
|
||||||
|
- Redid ClearLcoks() fix that I accidentally removed.
|
||||||
- Added a new setting for am_rotate: 2 will enable rotation only for the
|
- Added a new setting for am_rotate: 2 will enable rotation only for the
|
||||||
overlay map while leaving the regular map unrotated.
|
overlay map while leaving the regular map unrotated.
|
||||||
- Added a new setting for am_overlay: 2 will disable the normal automap and
|
- Added a new setting for am_overlay: 2 will disable the normal automap and
|
||||||
|
|
|
@ -322,7 +322,11 @@ static void ClearLocks()
|
||||||
{
|
{
|
||||||
if (PClass::m_Types[i]->IsDescendantOf(RUNTIME_CLASS(AKey)))
|
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++)
|
for(i=0;i<256;i++)
|
||||||
|
|
|
@ -2180,7 +2180,7 @@ void ProcessActor(void (*process)(FState *, int))
|
||||||
catch (...)
|
catch (...)
|
||||||
{
|
{
|
||||||
if (info)
|
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
|
else
|
||||||
SC_ScriptError("Unexpected error during parsing of actor definitions");
|
SC_ScriptError("Unexpected error during parsing of actor definitions");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue