thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge p_mobj.h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 14:37:56 -04:00
parent 0c06da879e
commit 2f9f1df768
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_mobj.h
View file

@ -383,11 +383,8 @@ typedef struct mobj_s
#endif #endif
boolean colorized; // Whether the mobj uses the rainbow colormap 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 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 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 boolean whiteshadow; // Use white shadow, set to true by default for fullbright objects