OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '4f7ec3ad89' into scripting

Browse source 
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/info.h
	src/p_acs.cpp
	src/p_interaction.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp

(scripting branch update part 5)
This commit is contained in:
Christoph Oelckers 2015-04-28 12:48:33 +02:00
commit 065c0a79cd
192 changed files with 2493 additions and 1232 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/thingdef/thingdef_properties.cpp
View file

@ -1459,14 +1459,8 @@ DEFINE_PROPERTY(stamina, I, Actor)
DEFINE_PROPERTY(telefogsourcetype, S, Actor)
{
PROP_STRING_PARM(str, 0);
if (!stricmp(str, "") || (!stricmp(str, "none")) || (!stricmp(str, "null")) || *str == 0)
{
defaults->TeleFogSourceType = NULL;
}
else
{
defaults->TeleFogSourceType = FindClassTentative(str, PClass::FindClass("TeleportFog"));
}
if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogSourceType = NULL;
else defaults->TeleFogSourceType = FindClassTentative(str, RUNTIME_CLASS(AActor));
}
//==========================================================================
@ -1475,14 +1469,8 @@ DEFINE_PROPERTY(telefogsourcetype, S, Actor)
DEFINE_PROPERTY(telefogdesttype, S, Actor)
{
PROP_STRING_PARM(str, 0);
if (!stricmp(str, "") || (!stricmp(str, "none")) || (!stricmp(str, "null")) || *str == 0)
{
defaults->TeleFogDestType = NULL;
}
else
{
defaults->TeleFogDestType = FindClassTentative(str, PClass::FindClass("TeleportFog"));
}
if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogDestType = NULL;
else defaults->TeleFogDestType = FindClassTentative(str, RUNTIME_CLASS(AActor));
}
//==========================================================================