Merge p_mobj.h

This commit is contained in:
Sally Coolatta 2020-08-10 14:37:56 -04:00
parent 0c06da879e
commit 2f9f1df768

View file

@ -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