fix postimg data types mismatch
also remove the "postimgflag_t" typedef since its useless and use smoler type for everything we dont need much space lol
This commit is contained in:
1 parent
d41b6c185a
commit
a11227b15a
4 files changed
+14
-12
No files matched your search
@@ -342,15 +342,6 @@ union FColorRGBA
|
||||
} ATTRPACK;
|
||||
typedef union FColorRGBA RGBA_t;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
POSTIMG_WATER = 1, // Underwater screen effect.
|
||||
POSTIMG_MOTION = 1<<1, // Unused motion blur effect.
|
||||
POSTIMG_FLIP = 1<<2, // Flipcam screen effect.
|
||||
POSTIMG_HEAT = 1<<3, // Heatwave screen effect.
|
||||
POSTIMG_MIRROR = 1<<4, // encore screen effect.
|
||||
} postimgflag_t;
|
||||
|
||||
typedef UINT32 lumpnum_t; // 16 : 16 unsigned long (wad num: lump num)
|
||||
#define LUMPERROR UINT32_MAX
|
||||
|
||||
|
||||
+12
-1
@@ -76,6 +76,7 @@ void P_UnlinkThinker(thinker_t *thinker);
|
||||
//
|
||||
// P_USER
|
||||
//
|
||||
|
||||
typedef struct camera_s
|
||||
{
|
||||
boolean chase;
|
||||
@@ -125,9 +126,19 @@ typedef struct camera_s
|
||||
fixed_t pan;
|
||||
|
||||
// postproccess effects
|
||||
UINT16 postimg;
|
||||
UINT8 postimg;
|
||||
} camera_t;
|
||||
|
||||
// post process types
|
||||
enum
|
||||
{
|
||||
POSTIMG_WATER = 1, // Underwater screen effect.
|
||||
POSTIMG_MOTION = 1<<1, // Unused motion blur effect.
|
||||
POSTIMG_FLIP = 1<<2, // Flipcam screen effect.
|
||||
POSTIMG_HEAT = 1<<3, // Heatwave screen effect.
|
||||
POSTIMG_MIRROR = 1<<4, // encore screen effect.
|
||||
};
|
||||
|
||||
extern camera_t camera[MAXSPLITSCREENPLAYERS];
|
||||
extern consvar_t cv_cam_dist[MAXSPLITSCREENPLAYERS];
|
||||
extern consvar_t cv_cam_still[MAXSPLITSCREENPLAYERS];
|
||||
|
||||
+1
-1
@@ -3235,7 +3235,7 @@ void P_DestroyRobots(void)
|
||||
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
||||
{
|
||||
const boolean flipcam = (player->pflags & PF_FLIPCAM && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
|
||||
UINT16 postimgtype = 0;
|
||||
UINT8 postimgtype = 0;
|
||||
|
||||
if (encoremode)
|
||||
postimgtype |= POSTIMG_MIRROR;
|
||||
|
||||
+1
-1
@@ -4252,7 +4252,7 @@ static boolean P_CameraCheckWaterFirstperson(player_t *player, sector_t *sector,
|
||||
static void P_CalcPostImg(player_t *player, camera_t *thiscam)
|
||||
{
|
||||
sector_t *sector = NULL;
|
||||
INT16 postimgtype = 0;
|
||||
UINT8 postimgtype = 0;
|
||||
//INT32 *param;
|
||||
fixed_t pviewheight = 0;
|
||||
|
||||
|
||||
Reference in new issue
Block a user