From 2f9f1df768446d44994e3e2aaf986a0bbfd14518 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Aug 2020 14:37:56 -0400 Subject: [PATCH] Merge p_mobj.h --- src/p_mobj.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/p_mobj.h b/src/p_mobj.h index ef4c84d94..7e36fda90 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -383,11 +383,8 @@ typedef struct mobj_s #endif boolean colorized; // Whether the mobj uses the rainbow colormap -<<<<<<< HEAD - -======= boolean mirrored; // The object's rotations will be mirrored left to right, e.g., see frame AL from the right and AR from the left ->>>>>>> srb2/next + fixed_t shadowscale; // If this object casts a shadow, and the size relative to radius boolean whiteshadow; // Use white shadow, set to true by default for fullbright objects