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

22
src/thingdef/thingdef_properties.cpp
View file

@ -418,11 +418,11 @@ DEFINE_INFO_PROPERTY(game, S, Actor)
DEFINE_INFO_PROPERTY(spawnid, I, Actor)
{
PROP_INT_PARM(id, 0);
if (id<0 || id>255)
if (id<0 || id>65535)
{
I_Error ("SpawnID must be in the range [0,255]");
I_Error ("SpawnID must be in the range [0,65535]");
}
else info->SpawnID=(BYTE)id;
else info->SpawnID=(WORD)id;
}
//==========================================================================
@ -434,20 +434,8 @@ DEFINE_INFO_PROPERTY(conversationid, IiI, Actor)
PROP_INT_PARM(id1, 1);
PROP_INT_PARM(id2, 2);
// Handling for Strife teaser IDs - only of meaning for the standard items
// as PWADs cannot be loaded with the teasers.
if (PROP_PARM_COUNT > 1)
{
if ((gameinfo.flags & (GI_SHAREWARE|GI_TEASER2)) == (GI_SHAREWARE))
convid = id1;
if ((gameinfo.flags & (GI_SHAREWARE|GI_TEASER2)) == (GI_SHAREWARE|GI_TEASER2))
convid = id2;
}
if (convid <= 0) return; // 0 is not usable because the dialogue scripts use it as 'no object'.
SetStrifeType(convid, info);
if (convid <= 0 || convid > 65535) return; // 0 is not usable because the dialogue scripts use it as 'no object'.
else info->ConversationID=(WORD)convid;
}
//==========================================================================