mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
- removed FActorInfo::ConversationID which was development garbage of the USDF branch.
SVN r2569 (trunk)
This commit is contained in:
parent
ec71635ca1
commit
9073b8cdea
3 changed files with 0 additions and 4 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -203,7 +203,6 @@ struct FActorInfo
|
|||
BYTE GameFilter;
|
||||
BYTE SpawnID;
|
||||
SWORD DoomEdNum;
|
||||
int ConversationID;
|
||||
FStateLabels *StateList;
|
||||
DmgFactors *DamageFactors;
|
||||
PainChanceList *PainChances;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue