From 218fd0ae5675bd3ce47608218f7f37c3a3503c2e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 13 Apr 2006 16:56:06 +0000 Subject: [PATCH] SVN r38 (trunk) --- src/g_strife/a_macil.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/g_strife/a_macil.cpp b/src/g_strife/a_macil.cpp index c8c16f7d2..4359390dc 100644 --- a/src/g_strife/a_macil.cpp +++ b/src/g_strife/a_macil.cpp @@ -183,5 +183,7 @@ int AMacil2::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, i { if (inflictor->IsKindOf (RUNTIME_CLASS(ASpectralLightningV1))) return -1; - return Super::TakeSpecialDamage(inflictor, source, damage, damagetype); + + // This must skip the method of AMacil1 but it should call AActor's version. + return AActor::TakeSpecialDamage(inflictor, source, damage, damagetype); }