From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 22 Feb 2006 07:46:31 +0000 (+0000)
Subject: made QC error() and objerror() builtins print the error string above and below the... 
X-Git-Tag: xonotic-v0.1.0preview~4311
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fccdc283176a2cdf896d825c663d804d5dabba9;p=xonotic%2Fdarkplaces.git

made QC error() and objerror() builtins print the error string above and below the crash information, to be less confusing


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

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 85af22e2..722582e7 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -116,14 +116,14 @@ void VM_error (void)
 	char string[VM_STRINGTEMP_LENGTH];
 
 	VM_VarString(0, string, sizeof(string));
-	Con_Printf("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+	Con_Printf("======%s ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
 	if(prog->self)
 	{
 		ed = PRVM_G_EDICT(prog->self->ofs);
 		PRVM_ED_Print(ed);
 	}
 
-	PRVM_ERROR ("%s: Program error", PRVM_NAME);
+	PRVM_ERROR ("%s: Program error in function %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
 }
 
 /*
@@ -142,7 +142,7 @@ void VM_objerror (void)
 	char string[VM_STRINGTEMP_LENGTH];
 
 	VM_VarString(0, string, sizeof(string));
-	Con_Printf("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+	Con_Printf("======OBJECT ERROR======\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
 	if(prog->self)
 	{
 		ed = PRVM_G_EDICT (prog->self->ofs);
@@ -153,6 +153,7 @@ void VM_objerror (void)
 	else
 		// objerror has to display the object fields -> else call
 		PRVM_ERROR ("VM_objecterror: self not defined !");
+	Con_Printf("%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
 }
 
 /*