incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix postimg data types mismatch

Browse source 
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:
Alug 2025-01-08 18:23:25 +01:00 committed by NepDisk
parent 6b1de73341
commit 7656b519bf
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/doomtype.h
View file

@ -340,15 +340,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
src/p_local.h
View file

@ -133,7 +133,7 @@ struct camera_t
angle_t old_angle, old_aiming;
// postproccess effects
UINT16 postimgflags;
UINT8 postimgflags;
};
// demo freecam or something before i commit die
@ -145,6 +145,16 @@ struct demofreecam_s {
extern struct demofreecam_s democam;
// 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], cv_cam_still[MAXSPLITSCREENPLAYERS], cv_cam_height[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS], cv_cam_rotate[MAXSPLITSCREENPLAYERS];

2
src/p_mobj.c
View file

@ -3547,7 +3547,7 @@ void P_DestroyRobots(void)
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
{
const boolean flipcam = (player->pflags & PF_FLIPCAM && player->mo->eflags & MFE_VERTICALFLIP);
UINT16 postimgtype = 0;
UINT8 postimgtype = 0;
// This can happen when joining
if (thiscam->subsector == NULL || thiscam->subsector->sector == NULL)

2
src/p_user.c
View file

@ -3424,7 +3424,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;