diff --git a/src/dehacked.c b/src/dehacked.c index 26a17a326..108e15e02 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1421,6 +1421,9 @@ static void readhuditem(MYFILE *f, INT32 num) // IMPORTANT! // DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wincompatible-pointer-types" actionpointer_t actionpointers[] = { {{A_Explode}, "A_EXPLODE"}, @@ -1630,6 +1633,7 @@ actionpointer_t actionpointers[] = // This NULL entry must be the last in the list {{NULL}, NULL}, }; +#pragma GCC diagnostic pop static void readframe(MYFILE *f, INT32 num) { diff --git a/src/g_game.h b/src/g_game.h index b374be216..939f657b6 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -186,6 +186,8 @@ extern consvar_t cv_sloperolldist; extern consvar_t cv_sparkroll; extern consvar_t cv_spinoutroll; +extern consvar_t cv_squishdance; + extern consvar_t cv_playerblendeffects; extern consvar_t cv_cechotoggle; diff --git a/src/info.c b/src/info.c index 87a3c99c4..2a4d61e72 100644 --- a/src/info.c +++ b/src/info.c @@ -69,6 +69,8 @@ char sprnames[NUMSPRITES + 1][5] = }; // Doesn't work with g++, needs actionf_p1 (don't modify this comment) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wincompatible-pointer-types" state_t states[NUMSTATES] = { // frame is masked through FF_FRAMEMASK @@ -3410,6 +3412,7 @@ state_t states[NUMSTATES] = {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK #endif }; +#pragma GCC diagnostic pop mobjinfo_t mobjinfo[NUMMOBJTYPES] = { diff --git a/src/k_kart.c b/src/k_kart.c index f56be4015..1a899f253 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -195,6 +195,8 @@ static CV_PossibleValue_t saltyheight_t[] = {{FRACUNIT/4, "MIN"}, {2*FRACUNIT, " consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, saltyheight_t, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_saltyroll = {"hardcodehoproll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static void saltyhop_onchange(void) { // reset everything when toggling saltyhop @@ -1105,6 +1107,8 @@ void K_RegisterClientKartStuff(void) CV_RegisterVar(&cv_slamsound); + CV_RegisterVar(&cv_squishdance); + CV_RegisterVar(&cv_lessflicker); CV_RegisterVar(&cv_mouseturn); diff --git a/src/m_aatree.c b/src/m_aatree.c index ece4f0acb..45482f6f3 100644 --- a/src/m_aatree.c +++ b/src/m_aatree.c @@ -98,7 +98,6 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32 if (!node) { // Nothing here, so just add where we are - node = Z_Malloc(sizeof (aatree_node_t), PU_STATIC, NULL); node->level = 1; node->key = key; @@ -152,7 +151,6 @@ void *M_AATreeGet(aatree_t *aatree, INT32 key) return M_AATreeGet_Node(aatree->root, key); } - static void M_AATreeIterate_Node(aatree_node_t *node, aatree_iter_t callback) { if (node->left) M_AATreeIterate_Node(node->left, callback); diff --git a/src/p_mobj.h b/src/p_mobj.h index e0257bc0a..5eb3a1236 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -292,7 +292,7 @@ typedef struct mobj_s // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation angle_t old_angle, old_pitch, old_roll; // orientation interpolation - angle_t old_angle2; + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -315,6 +315,7 @@ typedef struct mobj_s //sloperollangle angle_t sloperoll, slopepitch; angle_t old_sloperoll, old_slopepitch; + angle_t old_sloperoll2, old_slopepitch2; angle_t pitch_sprite, roll_sprite; struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears @@ -448,7 +449,7 @@ typedef struct precipmobj_s // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation angle_t old_angle, old_pitch, old_roll; // orientation interpolation - angle_t old_angle2; + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -471,6 +472,7 @@ typedef struct precipmobj_s //sloperollangle angle_t sloperoll, slopepitch; angle_t old_sloperoll, old_slopepitch; + angle_t old_sloperoll2, old_slopepitch2; angle_t pitch_sprite, roll_sprite; struct mprecipsecnode_s *touching_sectorlist; // a linked list of sectors where this object appears diff --git a/src/p_user.c b/src/p_user.c index e38f487d0..2dd1fad50 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1214,6 +1214,10 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->old_y = mobj->old_y2; ghost->old_z = mobj->old_z2; ghost->old_angle = (mobj->player ? mobj->player->old_frameangle2 : mobj->old_angle2); + ghost->old_pitch = mobj->old_pitch2; + ghost->old_roll = mobj->old_roll2; + ghost->old_sloperoll = mobj->old_sloperoll2; + ghost->old_slopepitch = mobj->old_slopepitch2; ghost->old_scale = mobj->old_scale2; ghost->old_spritexscale = mobj->old_spritexscale2; ghost->old_spriteyscale = mobj->old_spriteyscale2; @@ -5005,7 +5009,7 @@ void P_PlayerThink(player_t *player) if (player->losstime && !player->powers[pw_flashing]) player->losstime--; - if (cmd->buttons & BT_CUSTOM3) + if (cv_squishdance.value && (cmd->buttons & BT_CUSTOM3)) { player->squishdance.countdown++; diff --git a/src/r_draw8.c b/src/r_draw8.c index 30d8e9d02..f9e3e12e7 100644 --- a/src/r_draw8.c +++ b/src/r_draw8.c @@ -854,7 +854,6 @@ void R_CalcTiltedLighting(fixed_t start, fixed_t end) */ void R_DrawTiltedSpan_8(void) { - // x1, x2 = ds_x1, ds_x2 int width = ds_x2 - ds_x1; double iz, uz, vz; UINT32 u, v; @@ -890,7 +889,6 @@ void R_DrawTiltedSpan_8(void) dest = ylookup[ds_y] + columnofs[ds_x1]; source = ds_source; - //colormap = ds_colormap; #if 0 // The "perfect" reference version of this routine. Pretty slow. // Use it only to see how things are supposed to look. @@ -918,7 +916,6 @@ void R_DrawTiltedSpan_8(void) izstep = ds_szp->x * SPANSIZE; uzstep = ds_sup->x * SPANSIZE; vzstep = ds_svp->x * SPANSIZE; - //x1 = 0; width++; while (width >= SPANSIZE) @@ -995,7 +992,6 @@ void R_DrawTiltedSpan_8(void) */ void R_DrawTiltedTranslucentSpan_8(void) { - // x1, x2 = ds_x1, ds_x2 int width = ds_x2 - ds_x1; double iz, uz, vz; UINT32 u, v; @@ -1031,7 +1027,6 @@ void R_DrawTiltedTranslucentSpan_8(void) dest = ylookup[ds_y] + columnofs[ds_x1]; source = ds_source; - //colormap = ds_colormap; #if 0 // The "perfect" reference version of this routine. Pretty slow. // Use it only to see how things are supposed to look. @@ -1059,7 +1054,6 @@ void R_DrawTiltedTranslucentSpan_8(void) izstep = ds_szp->x * SPANSIZE; uzstep = ds_sup->x * SPANSIZE; vzstep = ds_svp->x * SPANSIZE; - //x1 = 0; width++; while (width >= SPANSIZE) @@ -1137,7 +1131,6 @@ void R_DrawTiltedTranslucentSpan_8(void) */ void R_DrawTiltedTranslucentWaterSpan_8(void) { - // x1, x2 = ds_x1, ds_x2 int width = ds_x2 - ds_x1; double iz, uz, vz; UINT32 u, v; @@ -1175,7 +1168,6 @@ void R_DrawTiltedTranslucentWaterSpan_8(void) dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1; source = ds_source; - //colormap = ds_colormap; #if 0 // The "perfect" reference version of this routine. Pretty slow. // Use it only to see how things are supposed to look. @@ -1203,7 +1195,6 @@ void R_DrawTiltedTranslucentWaterSpan_8(void) izstep = ds_szp->x * SPANSIZE; uzstep = ds_sup->x * SPANSIZE; vzstep = ds_svp->x * SPANSIZE; - //x1 = 0; width++; while (width >= SPANSIZE) @@ -1696,7 +1687,6 @@ void R_DrawFogSpan_8(void) register size_t count; colormap = ds_colormap; - //dest = ylookup[ds_y] + columnofs[ds_x1]; dest = &topleft[ds_y *vid.width + ds_x1]; count = ds_x2 - ds_x1 + 1; diff --git a/src/r_fps.c b/src/r_fps.c index 49655137a..3102a74be 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -775,17 +775,19 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->old_z2 = mobj->old_z; mobj->old_angle2 = mobj->old_angle; mobj->old_scale2 = mobj->old_scale; - mobj->old_spritexscale2 = mobj->old_spritexscale; - mobj->old_spriteyscale2 = mobj->old_spriteyscale; - mobj->old_spritexoffset2 = mobj->old_spritexoffset; - mobj->old_spriteyoffset2 = mobj->old_spriteyoffset; + + // rotation humor + mobj->old_pitch2 = mobj->old_pitch; + mobj->old_roll2 = mobj->old_roll; + mobj->old_slopepitch2 = mobj->old_slopepitch; + mobj->old_sloperoll2 = mobj->old_sloperoll; mobj->old_x = mobj->x; mobj->old_y = mobj->y; mobj->old_z = mobj->z; mobj->old_angle = mobj->angle; - // rotation humor + // rotation humor, again // pitch and roll first mobj->old_pitch = mobj->pitch; @@ -800,6 +802,11 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->old_spritexoffset = mobj->spritexoffset; mobj->old_spriteyoffset = mobj->spriteyoffset; + mobj->old_spritexscale2 = mobj->old_spritexscale; + mobj->old_spriteyscale2 = mobj->old_spriteyscale; + mobj->old_spritexoffset2 = mobj->old_spritexoffset; + mobj->old_spriteyoffset2 = mobj->old_spriteyoffset; + if (mobj->player) { mobj->player->old_frameangle2 = mobj->player->old_frameangle;