SV_PushMove: import fix from https://www.quake-info-pool.net/q1/qfix.htm#movetype_push

Sigrid Solveig Haflínudóttir committed 1 year ago

Commit 6d2cd2d1 parent bc0fe981 file · +10 −5Browse files

Unified · Split

 {
 	static edict_t *moved_edict[MAX_EDICTS];
 	static vec3_t moved_from[MAX_EDICTS];
-	int i, e, num_moved;
+	int i, e, num_moved, solid;
 	edict_t *check, *block;
 	vec3_t mins, maxs, move, entorig, pushorig;
 		num_moved++;
 		// try moving the contacted entity
-		pusher->v.solid = SOLID_NOT;
+		solid = pusher->v.solid;
-		SV_PushEntity(pr, check, move);
+		if(solid >= SOLID_BBOX && solid <= SOLID_BSP) {
-		pusher->v.solid = SOLID_BSP;
+			// https://www.quake-info-pool.net/q1/qfix.htm#movetype_push
+			pusher->v.solid = SOLID_NOT;
+			SV_PushEntity(pr, check, move);
+			pusher->v.solid = solid;
+		}
 		// if it is still inside the pusher, block
 		block = SV_TestEntityPosition(pr, check);
 			// fail the move
 			if(check->v.mins[0] == check->v.maxs[0])
 				continue;
-			if(check->v.solid == SOLID_NOT || check->v.solid == SOLID_TRIGGER) {
+			solid = check->v.solid;
+			if(solid <= SOLID_TRIGGER) {
 				// corpse
 				check->v.mins[0] = check->v.mins[1] = 0;
 				VectorCopy(check->v.mins, check->v.maxs);

Keyboard shortcuts