OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Trying to replace an actor that does not exist is now a warning rather than an error.

Browse source 
SVN r3820 (trunk)
This commit is contained in:
Randy Heit 2012-08-12 03:36:49 +00:00
commit 27f6d431ca
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/thingdef/thingdef.cpp
View file

@ -180,7 +180,7 @@ FActorInfo *CreateNewActor(const FScriptPosition &sc, FName typeName, FName pare
//
//==========================================================================
void SetReplacement(FActorInfo *info, FName replaceName)
void SetReplacement(FScanner &sc, FActorInfo *info, FName replaceName)
{
// Check for "replaces"
if (replaceName != NAME_None)
@ -190,11 +190,13 @@ void SetReplacement(FActorInfo *info, FName replaceName)
if (replacee == NULL)
{
I_Error ("Replaced type '%s' not found in %s", replaceName.GetChars(), info->Class->TypeName.GetChars());
sc.ScriptMessage("Replaced type '%s' not found for %s", replaceName.GetChars(), info->Class->TypeName.GetChars());
return;
}
else if (replacee->ActorInfo == NULL)
{
I_Error ("Replaced type '%s' is not an actor in %s", replaceName.GetChars(), info->Class->TypeName.GetChars());
sc.ScriptMessage("Replaced type '%s' for %s is not an actor", replaceName.GetChars(), info->Class->TypeName.GetChars());
return;
}
if (replacee != NULL)
{