diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index 0d443bb69..cdac25902 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -317,7 +317,6 @@ PClass *PClass::CreateDerivedClass (FName name, unsigned int size) info->DamageFactors = NULL; info->PainChances = NULL; info->ColorSets = NULL; - info->ConversationID = -1; m_RuntimeActors.Push (type); } return type; @@ -412,7 +411,6 @@ void PClass::InitializeActorInfo () info->DamageFactors = NULL; info->PainChances = NULL; info->ColorSets = NULL; - info->ConversationID = -1; m_RuntimeActors.Push (this); } diff --git a/src/info.h b/src/info.h index d7d939c0b..9480f5f59 100644 --- a/src/info.h +++ b/src/info.h @@ -203,7 +203,6 @@ struct FActorInfo BYTE GameFilter; BYTE SpawnID; SWORD DoomEdNum; - int ConversationID; FStateLabels *StateList; DmgFactors *DamageFactors; PainChanceList *PainChances; diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 1e8f51f97..1e47dfd86 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -257,7 +257,6 @@ DEFINE_INFO_PROPERTY(conversationid, IiI, Actor) } - bag.Info->ConversationID = convid; if (convid <= 0) return; // 0 is not usable because the dialogue scripts use it as 'no object'. SetStrifeType(convid, info->Class); }