X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_edict.c;h=0bb47d99be013566ef4ce6c0a703018d55ec1bd2;hp=d327821d53e3ff2fac629424604ad21082a69936;hb=6a384398c93b7e2bc1936427797909eb60094160;hpb=b173d36c45adbab8703d638b9d0e5744c178135a;ds=sidebyside

diff --git a/pr_edict.c b/pr_edict.c
index d327821d..0bb47d99 100644
--- a/pr_edict.c
+++ b/pr_edict.c
@@ -207,7 +207,7 @@ edict_t *ED_Alloc (void)
 	}
 	
 	if (i == MAX_EDICTS)
-		Sys_Error ("ED_Alloc: no free edicts");
+		Host_Error ("ED_Alloc: no free edicts");
 		
 	sv.num_edicts++;
 	e = EDICT_NUM(i);
@@ -235,8 +235,8 @@ void ED_Free (edict_t *ed)
 	ed->v.colormap = 0;
 	ed->v.skin = 0;
 	ed->v.frame = 0;
-	VectorCopy (vec3_origin, ed->v.origin);
-	VectorCopy (vec3_origin, ed->v.angles);
+	VectorClear(ed->v.origin);
+	VectorClear(ed->v.angles);
 	ed->v.nextthink = -1;
 	ed->v.solid = 0;
 	
@@ -759,7 +759,7 @@ ED_ParseGlobals
 */
 void ED_ParseGlobals (char *data)
 {
-	char	keyname[64];
+	char	keyname[1024]; // LordHavoc: good idea? bad idea?  was 64
 	ddef_t	*key;
 
 	while (1)
@@ -807,7 +807,7 @@ char *ED_NewString (char *string)
 	int		i,l;
 	
 	l = strlen(string) + 1;
-	new = Hunk_Alloc (l);
+	new = Hunk_AllocName (l, "edict string");
 	new_p = new;
 
 	for (i=0 ; i< l ; i++)
@@ -880,7 +880,7 @@ qboolean	ED_ParseEpair (void *base, ddef_t *key, char *s)
 		if (!def)
 		{
 			// LordHavoc: don't warn about worldspawn sky/fog fields because they don't require mod support
-			if (strcmp(s, "sky") && strncmp(s, "fog_", 4) && strcmp(s, "skyboxsize"))
+			if (strcmp(s, "sky") && strcmp(s, "fog") && strncmp(s, "fog_", 4) && strcmp(s, "farclip"))
 				Con_DPrintf ("Can't find field %s\n", s);
 			return false;
 		}
@@ -1033,7 +1033,7 @@ void ED_LoadFromFile (char *data)
 		if (!data)
 			break;
 		if (com_token[0] != '{')
-			Sys_Error ("ED_LoadFromFile: found %s when expecting {",com_token);
+			Host_Error ("ED_LoadFromFile: found %s when expecting {",com_token);
 
 		if (!ent)
 			ent = EDICT_NUM(0);
@@ -1323,7 +1323,7 @@ void PR_Init (void)
 // LordHavoc: turned EDICT_NUM into a #define for speed reasons
 edict_t *EDICT_NUM_ERROR(int n)
 {
-	Sys_Error ("EDICT_NUM: bad number %i", n);
+	Host_Error ("EDICT_NUM: bad number %i", n);
 	return NULL;
 }
 /*
@@ -1343,6 +1343,6 @@ int NUM_FOR_EDICT(edict_t *e)
 	b = b / pr_edict_size;
 	
 	if (b < 0 || b >= sv.num_edicts)
-		Sys_Error ("NUM_FOR_EDICT: bad pointer");
+		Host_Error ("NUM_FOR_EDICT: bad pointer");
 	return b;
 }