OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting for plugged userinfo memory leak

Browse source 
Conflicts:
	src/d_player.h
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Randy Heit 2013-07-23 21:01:13 -05:00
commit 9c86f1c220
39 changed files with 323 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/thingdef/thingdef_codeptr.cpp
View file

@ -70,6 +70,7 @@
#include "m_bbox.h"
#include "r_data/r_translate.h"
#include "p_trace.h"
#include "gstrings.h"
static FRandom pr_camissile ("CustomActorfire");
@ -2300,6 +2301,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Print)
PARAM_FLOAT_OPT (time) { time = 0; }
PARAM_NAME_OPT (fontname) { fontname = NAME_None; }
if (text[0] == '$') text = GStrings(&text[1]);
if (self->CheckLocalView (consoleplayer) ||
(self->target != NULL && self->target->CheckLocalView (consoleplayer)))
{
@ -2338,6 +2340,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_PrintBold)
float saved = con_midtime;
FFont *font = NULL;
if (text[0] == '$') text = GStrings(&text[1]);
if (fontname != NAME_None)
{
font = V_GetFont(fontname);
@ -2363,12 +2366,14 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Log)
{
PARAM_ACTION_PROLOGUE;
PARAM_STRING(text);
Printf("%s\n", text.GetChars());
if (text[0] == '$') text = GStrings(&text[1]);
Printf("%s\n", text);
ACTION_SET_RESULT(false); // Prints should never set the result for inventory state chains!
return numret;
}
//===========================================================================
//=========================================================================
//
// A_LogInt
//