OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Converted Strife's Programmer, Loremaster and Thingstoblowup to DECORATE.

Browse source 
- Fixed: Attacking a merchant in Strife didn't alert the enemies.


SVN r1121 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-06 22:59:24 +00:00
commit 535f209560
17 changed files with 444 additions and 545 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef.cpp
View file

@ -393,7 +393,7 @@ static FActorInfo *CreateNewActor(FScanner &sc, FActorInfo **parentc, Baggage *b
{
sc.ScriptError("Unknown native class '%s'", typeName.GetChars());
}
else if (ti->ParentClass != parent)
else if (ti->ParentClass->NativeClass() != parent->NativeClass())
{
sc.ScriptError("Native class '%s' does not inherit from '%s'",
typeName.GetChars(),parent->TypeName.GetChars());