X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=world.c;h=4830996ca77b50073ca69005e277fa51bee82b37;hb=9b73f5e152089c02f4157b4f3cddcc884e3648cd;hp=eadb9895547840a775b7c995355f5411ea88b48d;hpb=e660b4c0147da9f4b5db110a05cfbadcea6b1b64;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index eadb9895..4830996c 100644
--- a/world.c
+++ b/world.c
@@ -2296,7 +2296,7 @@ treatasbox:
 	//VectorCopy(PRVM_gameedictvector(ed, spinvelocity), spinvelocity);
 	VectorCopy(PRVM_gameedictvector(ed, angles), angles);
 	VectorCopy(PRVM_gameedictvector(ed, avelocity), avelocity);
-	if (PRVM_gameedictfloat(ed, gravity) != 0.0f && PRVM_EDICTFIELDFLOAT(ed, gravity) < 0.5f) gravity = false;
+	if (PRVM_gameedictfloat(ed, gravity) != 0.0f && PRVM_gameedictfloat(ed, gravity) < 0.5f) gravity = false;
 	if (ed == prog->edicts)
 		gravity = false;
 
@@ -2553,11 +2553,11 @@ static void nearCallback (void *data, dGeomID o1, dGeomID o2)
 
 	if(!strcmp(prog->name, "server"))
 	{
-		if(ed1 && ed1->fields.server->touch)
+		if(ed1 && PRVM_serveredictfunction(ed1, touch))
 		{
 			SV_LinkEdict_TouchAreaGrid_Call(ed1, ed2 ? ed2 : prog->edicts);
 		}
-		if(ed2 && ed2->fields.server->touch)
+		if(ed2 && PRVM_serveredictfunction(ed2, touch))
 		{
 			SV_LinkEdict_TouchAreaGrid_Call(ed2, ed1 ? ed1 : prog->edicts);
 		}