From 0148c1209c6cbbf13ec8b0626c44ba1a4e9dd772 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Fri, 2 Nov 2018 02:28:34 -0400 Subject: [PATCH] quick merge fix --- src/p_map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 0129701a1..f9eb8bc2c 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -697,7 +697,7 @@ static boolean PIT_CheckThing(mobj_t *thing) } // Push fakes out of other items - if (tmthing->type == MT_FAKEITEM && (thing->type == MT_RANDOMITEM || thing->type == MT_FAKEITEM)) + if (tmthing->type == MT_EGGMANITEM && (thing->type == MT_RANDOMITEM || thing->type == MT_EGGMANITEM)) { // see if it went over / under if (tmthing->z > thing->z + thing->height) @@ -708,7 +708,7 @@ static boolean PIT_CheckThing(mobj_t *thing) P_InstaThrust(tmthing, R_PointToAngle2(thing->x, thing->y, tmthing->x, tmthing->y), thing->radius/4); return true; } - else if (thing->type == MT_FAKEITEM && (tmthing->type == MT_RANDOMITEM || tmthing->type == MT_FAKEITEM)) + else if (thing->type == MT_EGGMANITEM && (tmthing->type == MT_RANDOMITEM || tmthing->type == MT_EGGMANITEM)) { // see if it went over / under if (tmthing->z > thing->z + thing->height)