From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 3 Jan 2012 16:32:45 +0000 (+0000)
Subject: getimagesize(): return '0 0 0' for missing texture (previously the size of the notext... 
X-Git-Tag: xonotic-v0.6.0~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f9912e670619d8f7bd6e077677b37bd513d0987;p=xonotic%2Fdarkplaces.git

getimagesize(): return '0 0 0' for missing texture (previously the size of the notexture, that is, '16 16 0')

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11631 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c64899c50bbe92c4f85528170b6802395fe3dffa
---

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 217d897d..f3f38d62 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3911,9 +3911,16 @@ void VM_getimagesize(prvm_prog_t *prog)
 	VM_CheckEmptyString(prog, p);
 
 	pic = Draw_CachePic_Flags (p, CACHEPICFLAG_NOTPERSISTENT);
-
-	PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
-	PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
+	if( Draw_CachePic_Flags(s, 0)->tex == r_texture_notexture )
+	{
+		PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
+		PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
+	}
+	else
+	{
+		PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
+		PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
+	}
 	PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 }