From 9cd47643dfac9cc33c86c7dcb8df1637109f111b Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 22 Oct 2018 15:08:04 -0400 Subject: [PATCH] Falling rocks only collide with players and other rocks --- src/p_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index 468a5c67..9c343944 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1077,7 +1077,8 @@ static boolean PIT_CheckThing(mobj_t *thing) //} - if (thing->type == MT_FALLINGROCK || tmthing->type == MT_FALLINGROCK) + if ((thing->type == MT_FALLINGROCK && (tmthing->player || tmthing->type == MT_FALLINGROCK)) + || (tmthing->type == MT_FALLINGROCK && (thing->player || thing->type == MT_FALLINGROCK))) { // see if it went over / under if (tmthing->z > thing->z + thing->height)