X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=7231bd8f6fba2d94be4e2604cb2d75149231c6e5;hb=c1b079f2971aac5b48b4e0a37d21c50eab5e2021;hp=7acb35d69896d9f0bb16bad60448d6bdde413d2d;hpb=c1c5a398025611690a8d7d6bd64219ccf452e673;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 7acb35d69..7231bd8f6 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2069,21 +2069,20 @@ void Physics_Frame()
 
 	IL_EACH(g_moveables, true,
 	{
-		if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH || it.move_movetype == MOVETYPE_PHYSICS)
+		if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PHYSICS)
 			continue;
 
 		//set_movetype(it, it.move_movetype);
 		// inline the set_movetype function, since this is called a lot
-		it.movetype = (it.move_qcphysics) ? MOVETYPE_NONE : it.move_movetype;
+		it.movetype = (it.move_qcphysics) ? MOVETYPE_QCENTITY : it.move_movetype;
 
-		if(it.move_movetype == MOVETYPE_NONE)
-			continue;
-
-		if(it.move_qcphysics)
+		if(it.move_qcphysics && it.move_movetype != MOVETYPE_NONE)
 			Movetype_Physics_NoMatchTicrate(it, PHYS_INPUT_TIMELENGTH, false);
 
 		if(it.movetype >= MOVETYPE_USER_FIRST && it.movetype <= MOVETYPE_USER_LAST) // these cases have no think handling
 		{
+			if(it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH)
+				continue; // these movetypes have no regular think function
 			// handle thinking here
 			if (getthink(it) && it.nextthink > 0 && it.nextthink <= time + frametime)
 				RunThink(it);
@@ -2095,7 +2094,7 @@ void Physics_Frame()
 
 	IL_EACH(g_moveables, it.move_qcphysics,
 	{
-		if(IS_CLIENT(it) || is_pure(it) || it.classname == "" || it.move_movetype == MOVETYPE_NONE)
+		if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_NONE)
 			continue;
 		Movetype_Physics_NoMatchTicrate(it, PHYS_INPUT_TIMELENGTH, false);
 	});