OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'b6a4511dd1' into scripting

Browse source 
Conflicts:
	src/dobjtype.cpp
	src/p_conversation.cpp
	src/p_local.h
	src/p_things.cpp
	src/thingdef/thingdef_properties.cpp

(This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)
This commit is contained in:
Christoph Oelckers 2015-04-28 13:08:18 +02:00
commit f7834061df
45 changed files with 707 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/info.cpp
View file

@ -354,6 +354,15 @@ void PClassActor::RegisterIDs()
return;
}
// Conversation IDs have never been filtered by game so we cannot start doing that.
if (ConversationID > 0)
{
StrifeTypes[ConversationID] = cls;
if (cls != Class)
{
Printf(TEXTCOLOR_RED"Conversation ID %d refers to hidden class type '%s'\n", SpawnID, cls->TypeName.GetChars());
}
}
if (GameFilter == GAME_Any || (GameFilter & gameinfo.gametype))
{
if (SpawnID > 0)