From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Aug 2011 12:04:15 +0000 (+0000)
Subject: allow drawpic calls without flag parameter, as per CSQC spec
X-Git-Tag: xonotic-v0.6.0~163^2~272
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=cf0da2edf701e03cd2b7447523a850515005d1eb

allow drawpic calls without flag parameter, as per CSQC spec


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11280 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/clvm_cmds.c b/clvm_cmds.c
index a1b3b813..d9b8c77d 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -4390,7 +4390,7 @@ VM_getimagesize,				// #318 vector(string picname) draw_getimagesize (EXT_CSQC)
 VM_freepic,						// #319 void(string name) freepic (EXT_CSQC)
 VM_drawcharacter,				// #320 float(vector position, float character, vector scale, vector rgb, float alpha, float flag) drawcharacter (EXT_CSQC)
 VM_drawstring,					// #321 float(vector position, string text, vector scale, vector rgb, float alpha[, float flag]) drawstring (EXT_CSQC, DP_CSQC)
-VM_drawpic,						// #322 float(vector position, string pic, vector size, vector rgb, float alpha, float flag) drawpic (EXT_CSQC)
+VM_drawpic,						// #322 float(vector position, string pic, vector size, vector rgb, float alpha[, float flag]) drawpic (EXT_CSQC)
 VM_drawfill,					// #323 float(vector position, vector size, vector rgb, float alpha, float flag) drawfill (EXT_CSQC)
 VM_drawsetcliparea,				// #324 void(float x, float y, float width, float height) drawsetcliparea
 VM_drawresetcliparea,			// #325 void(void) drawresetcliparea
diff --git a/prvm_cmds.c b/prvm_cmds.c
index e0bccf8e..703280f3 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3699,9 +3699,9 @@ void VM_drawpic(void)
 {
 	const char *picname;
 	float *size, *pos, *rgb;
-	int flag;
+	int flag = 0;
 
-	VM_SAFEPARMCOUNT(6,VM_drawpic);
+	VM_SAFEPARMCOUNTRANGE(5,6,VM_drawpic);
 
 	picname = PRVM_G_STRING(OFS_PARM1);
 	VM_CheckEmptyString (picname);
@@ -3717,7 +3717,8 @@ void VM_drawpic(void)
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	size = PRVM_G_VECTOR(OFS_PARM2);
 	rgb = PRVM_G_VECTOR(OFS_PARM3);
-	flag = (int) PRVM_G_FLOAT(OFS_PARM5);
+	if (prog->argc >= 6)
+		flag = (int) PRVM_G_FLOAT(OFS_PARM5);
 
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{