From 725c6d195e710b6d82634ebf0bd113eb8bab93b0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 28 Apr 2007 22:03:18 +0000 Subject: [PATCH] - DamageFactor fixed SVN r520 (trunk) --- src/dobjtype.cpp | 1 + src/thingdef.cpp | 3 +- tools/updaterevision/updaterevision.vcproj | 154 ++++++++++----------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index 4484e94c2..fc3e092ff 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -232,6 +232,7 @@ PClass *PClass::CreateDerivedClass (FName name, unsigned int size) info->Replacement = NULL; info->Replacee = NULL; info->StateList = NULL; + info->DamageFactors = NULL; m_RuntimeActors.Push (type); } return type; diff --git a/src/thingdef.cpp b/src/thingdef.cpp index 93a6c0dd4..e3291ab0e 100644 --- a/src/thingdef.cpp +++ b/src/thingdef.cpp @@ -1179,7 +1179,6 @@ static FActorInfo * CreateNewActor(FActorInfo ** parentc, Baggage *bag) info->DamageFactors = new DmgFactors; *info->DamageFactors = *parent->ActorInfo->DamageFactors; } - else info->DamageFactors = NULL; // Check for "replaces" SC_MustGetString (); @@ -3194,7 +3193,7 @@ static void ActorDamageFactor (AActor *defaults, Baggage &bag) SC_MustGetToken(','); SC_MustGetFloat(); - bag.Info->DamageFactors[dmgType]=(fixed_t)(sc_Float*FRACUNIT); + (*bag.Info->DamageFactors)[dmgType]=(fixed_t)(sc_Float*FRACUNIT); } //========================================================================== diff --git a/tools/updaterevision/updaterevision.vcproj b/tools/updaterevision/updaterevision.vcproj index 202c9d042..f39914dca 100644 --- a/tools/updaterevision/updaterevision.vcproj +++ b/tools/updaterevision/updaterevision.vcproj @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +