zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed FActorInfo::ConversationID which was development garbage of the USDF branch.

Browse source 
SVN r2569 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-22 17:49:28 +00:00
parent ec71635ca1
commit 9073b8cdea
3 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dobjtype.cpp
View file

@ -317,7 +317,6 @@ PClass *PClass::CreateDerivedClass (FName name, unsigned int size)
info->DamageFactors = NULL; info->DamageFactors = NULL;
info->PainChances = NULL; info->PainChances = NULL;
info->ColorSets = NULL; info->ColorSets = NULL;
info->ConversationID = -1;
m_RuntimeActors.Push (type); m_RuntimeActors.Push (type);
} }
return type; return type;
@ -412,7 +411,6 @@ void PClass::InitializeActorInfo ()
info->DamageFactors = NULL; info->DamageFactors = NULL;
info->PainChances = NULL; info->PainChances = NULL;
info->ColorSets = NULL; info->ColorSets = NULL;
info->ConversationID = -1;
m_RuntimeActors.Push (this); m_RuntimeActors.Push (this);
} }

1
src/info.h
View file

@ -203,7 +203,6 @@ struct FActorInfo
BYTE GameFilter; BYTE GameFilter;
BYTE SpawnID; BYTE SpawnID;
SWORD DoomEdNum; SWORD DoomEdNum;
int ConversationID;
FStateLabels *StateList; FStateLabels *StateList;
DmgFactors *DamageFactors; DmgFactors *DamageFactors;
PainChanceList *PainChances; PainChanceList *PainChances;

1
src/thingdef/thingdef_properties.cpp
View file

@ -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'. if (convid <= 0) return; // 0 is not usable because the dialogue scripts use it as 'no object'.
SetStrifeType(convid, info->Class); SetStrifeType(convid, info->Class);
} }