From cb0c75e9a8c8e046d14a10848dcf8cae53a81d66 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 8 Jan 2024 08:09:43 +0100 Subject: [PATCH 1/4] dont do anything if sloperoll is disabled well it still precalcs some things, but only on gamestart which is needed since we cant reeinit sprites everytime we change sloperoll --- src/g_game.c | 8 +-- src/hardware/hw_main.c | 60 +++++++++++----------- src/r_things.c | 113 +++++++++++++++++++++-------------------- 3 files changed, 90 insertions(+), 91 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index b8aa208db..96b994616 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -496,17 +496,12 @@ consvar_t cv_ydeadzone4 = {"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_c static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}}; consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL}; - static CV_PossibleValue_t stretchfactor_t[] = { {0, "Off"}, {FRACUNIT/8, "0.125"}, {FRACUNIT/4, "0.250"}, {3*FRACUNIT/8, "0.375"}, {FRACUNIT/2, "0.500"}, {5*FRACUNIT/8, "0.625"}, {3*FRACUNIT/4, "0.750"}, {7*FRACUNIT/8, "0.875"}, {FRACUNIT, "Max"}, {0, NULL}}; consvar_t cv_gravstretch = {"gravstretch", "0", CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - static CV_PossibleValue_t slamsound_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}}; consvar_t cv_slamsound = {"slamsound", "1", CV_SAVE, slamsound_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -516,8 +511,9 @@ static CV_PossibleValue_t sloperolldist_cons_t[] = { {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; - +consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 119fb8350..88f1196ec 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5318,8 +5318,6 @@ void HWR_ProjectSprite(mobj_t *thing) angle_t sliptiderollangle = 0; #endif - - // uncapped/interpolation interpmobjstate_t interp = {0}; @@ -5457,36 +5455,38 @@ void HWR_ProjectSprite(mobj_t *thing) spr_topoffset = spritecachedinfo[lumpoff].topoffset; #ifdef ROTSPRITE - - rollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) - + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) - + FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) - + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch) - + thing->rollangle; - - if ((rollangle)||(thing->player && thing->player->sliproll)) + if (cv_sloperoll.value == 1) { - if (thing->player) - { - sliptiderollangle = cv_sliptideroll.value ? thing->player->sliproll*(thing->player->sliptidemem) : 0; - rollsum = rollangle+FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); - } - else - rollsum = rollangle; + rollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) + + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) + + FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) + + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch) + + thing->rollangle; - rollangle = R_GetRollAngle(rollsum); - rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); - - if (rotsprite != NULL) + if ((rollangle)||(thing->player && thing->player->sliproll)) { - spr_width = rotsprite->width << FRACBITS; - spr_height = rotsprite->height << FRACBITS; - spr_offset = rotsprite->leftoffset << FRACBITS; - spr_topoffset = rotsprite->topoffset << FRACBITS; - spr_topoffset += FEETADJUST; - - // flip -> rotate, not rotate -> flip - flip = 0; + if (thing->player) + { + sliptiderollangle = cv_sliptideroll.value ? thing->player->sliproll*(thing->player->sliptidemem) : 0; + rollsum = rollangle+FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); + } + else + rollsum = rollangle; + + rollangle = R_GetRollAngle(rollsum); + rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); + + if (rotsprite != NULL) + { + spr_width = rotsprite->width << FRACBITS; + spr_height = rotsprite->height << FRACBITS; + spr_offset = rotsprite->leftoffset << FRACBITS; + spr_topoffset = rotsprite->topoffset << FRACBITS; + spr_topoffset += FEETADJUST; + + // flip -> rotate, not rotate -> flip + flip = 0; + } } } #endif @@ -5592,7 +5592,7 @@ void HWR_ProjectSprite(mobj_t *thing) vis->spriteyoffset = FIXED_TO_FLOAT(spr_topoffset); #ifdef ROTSPRITE - if (rotsprite) + if ((rotsprite) && (cv_sloperoll.value == 1)) vis->gpatch = (GLPatch_t *)rotsprite; else #endif diff --git a/src/r_things.c b/src/r_things.c index 43a4aaab9..ea2b8e67b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -143,11 +143,11 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch // rotsprite #ifdef ROTSPRITE - for (r = 0; r < 16; r++) - { - sprtemp[frame].rotated[0][r] = NULL; - sprtemp[frame].rotated[1][r] = NULL; - } + for (r = 0; r < 16; r++) + { + sprtemp[frame].rotated[0][r] = NULL; + sprtemp[frame].rotated[1][r] = NULL; + } #endif/*ROTSPRITE*/ @@ -1494,61 +1494,64 @@ static void R_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE pitchnroll = 0; // set this to 0, non-paper sprites will affect this value + + if (cv_sloperoll.value == 1) + { + if (papersprite) + { + if (ang >= ANGLE_180) + { + // Makes Software act much more sane like OpenGL + rollangle = InvAngle(thing->rollangle); + } + else + { + rollangle = thing->rollangle; + } + } + else + { + // this is very messy, but it on-the-fly calculates rotations for all the + // pitch and roll variables + pitchnroll = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) + + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) + + FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) + + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch); - if (papersprite) - { - if (ang >= ANGLE_180) - { - // Makes Software act much more sane like OpenGL - rollangle = InvAngle(thing->rollangle); - } - else - { - rollangle = thing->rollangle; - } - } - else - { - // this is very messy, but it on-the-fly calculates rotations for all the - // pitch and roll variables - pitchnroll = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) + - FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) + - FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) + - FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch); + rollangle = thing->rollangle; + } - rollangle = thing->rollangle; - } + if ((rollangle) || (pitchnroll) || (thing->player && thing->player->sliproll)) + { + rollsum = pitchnroll; - if ((rollangle) || (pitchnroll) || (thing->player && thing->player->sliproll)) - { - rollsum = pitchnroll; + if (thing->player) + { + sliptiderollangle = + cv_sliptideroll.value ? thing->player->sliproll * (thing->player->sliptidemem) : 0; + rollsum += thing->rollangle + + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); + } + else + rollsum += thing->rollangle; - if (thing->player) - { - sliptiderollangle = - cv_sliptideroll.value ? thing->player->sliproll * (thing->player->sliptidemem) : 0; - rollsum += thing->rollangle + - FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); - } - else - rollsum += thing->rollangle; + rollangle = R_GetRollAngle(rollsum); + rotsprite = Patch_GetRotatedSprite( + sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); - rollangle = R_GetRollAngle(rollsum); - rotsprite = Patch_GetRotatedSprite( - sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); + if (rotsprite != NULL) + { + spr_width = rotsprite->width << FRACBITS; + spr_height = rotsprite->height << FRACBITS; + spr_offset = rotsprite->leftoffset << FRACBITS; + spr_topoffset = rotsprite->topoffset << FRACBITS; + spr_topoffset += FEETADJUST; - if (rotsprite != NULL) - { - spr_width = rotsprite->width << FRACBITS; - spr_height = rotsprite->height << FRACBITS; - spr_offset = rotsprite->leftoffset << FRACBITS; - spr_topoffset = rotsprite->topoffset << FRACBITS; - spr_topoffset += FEETADJUST; - - // flip -> rotate, not rotate -> flip - flip = 0; - } - } + // flip -> rotate, not rotate -> flip + flip = 0; + } + } + } #endif // calculate edges of the shape @@ -1799,7 +1802,7 @@ static void R_ProjectSprite(mobj_t *thing) //Fab: lumppat is the lump number of the patch to use, this is different // than lumpid for sprites-in-pwad : the graphics are patched #ifdef ROTSPRITE - if (rotsprite != NULL) + if ((rotsprite != NULL) && (cv_sloperoll.value == 1)) vis->patch = rotsprite; else #endif From 9bf10bf35bb6f9224ffe270b91534635761fc13e Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 8 Jan 2024 08:29:58 +0100 Subject: [PATCH 2/4] make new cvar "spriteroll" for sprite rotation disable so stuff that uses spriterotation can still be used when slope rotation is toggled off better for some effects --- src/g_game.c | 1 + src/g_game.h | 1 + src/hardware/hw_main.c | 4 ++-- src/m_menu.c | 2 +- src/r_main.c | 1 + src/r_things.c | 4 ++-- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 96b994616..fe0a6a8ec 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -512,6 +512,7 @@ static CV_PossibleValue_t sloperolldist_cons_t[] = { {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_spriteroll = {"spriteroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/g_game.h b/src/g_game.h index b6aab2b87..b45e42875 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -164,6 +164,7 @@ extern consvar_t cv_saltysquish; extern consvar_t cv_driftsparkpulse; extern consvar_t cv_gravstretch; extern consvar_t cv_sloperoll; +extern consvar_t cv_spriteroll; extern consvar_t cv_sliptideroll; extern consvar_t cv_slamsound; extern consvar_t cv_sloperolldist; diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 88f1196ec..9ba76a32b 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5455,7 +5455,7 @@ void HWR_ProjectSprite(mobj_t *thing) spr_topoffset = spritecachedinfo[lumpoff].topoffset; #ifdef ROTSPRITE - if (cv_sloperoll.value == 1) + if (cv_spriteroll.value) { rollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) @@ -5592,7 +5592,7 @@ void HWR_ProjectSprite(mobj_t *thing) vis->spriteyoffset = FIXED_TO_FLOAT(spr_topoffset); #ifdef ROTSPRITE - if ((rotsprite) && (cv_sloperoll.value == 1)) + if ((rotsprite) && (cv_spriteroll.value)) vis->gpatch = (GLPatch_t *)rotsprite; else #endif diff --git a/src/m_menu.c b/src/m_menu.c index cce9eaf40..81f815b91 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3131,7 +3131,7 @@ void PDistort_menu_Onchange(void) { UINT16 status; - if (cv_sloperoll.value) + if ((cv_sloperoll.value) && (cv_spriteroll.value)) { status = IT_STRING | IT_CVAR; } diff --git a/src/r_main.c b/src/r_main.c index 45c56ede1..08bd34cb6 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1955,6 +1955,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_driftsparkpulse); CV_RegisterVar(&cv_gravstretch); CV_RegisterVar(&cv_sloperoll); + CV_RegisterVar(&cv_spriteroll); CV_RegisterVar(&cv_sliptideroll); CV_RegisterVar(&cv_sloperolldist); CV_RegisterVar(&cv_sparkroll); diff --git a/src/r_things.c b/src/r_things.c index ea2b8e67b..41bd5c6e1 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1495,7 +1495,7 @@ static void R_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE pitchnroll = 0; // set this to 0, non-paper sprites will affect this value - if (cv_sloperoll.value == 1) + if (cv_spriteroll.value) { if (papersprite) { @@ -1802,7 +1802,7 @@ static void R_ProjectSprite(mobj_t *thing) //Fab: lumppat is the lump number of the patch to use, this is different // than lumpid for sprites-in-pwad : the graphics are patched #ifdef ROTSPRITE - if ((rotsprite != NULL) && (cv_sloperoll.value == 1)) + if ((rotsprite != NULL) && (cv_spriteroll.value)) vis->patch = rotsprite; else #endif From 213718d1bd2695ae12de74dee0c4e2a4b09cf6e9 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 8 Jan 2024 08:34:32 +0100 Subject: [PATCH 3/4] add toggle to be able to either rotate just players or everything you can either just having Players be rotated on slopes, or every mobj more customizable and also for performance concerns for some also some stuff i forgor --- src/g_game.c | 3 ++- src/k_kart.c | 2 +- src/m_menu.c | 7 ++++--- src/p_mobj.c | 5 ++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index fe0a6a8ec..38f063f62 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -511,8 +511,9 @@ static CV_PossibleValue_t sloperolldist_cons_t[] = { {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t sloperoll_cons_t[] = {{0, "Off"}, {1, "Players"}, {2, "Everything"}, {0, NULL}}; consvar_t cv_spriteroll = {"spriteroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, sloperoll_cons_t, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/k_kart.c b/src/k_kart.c index 971bc6c01..46d891890 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6446,7 +6446,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (cv_sloperolldist.value > 0) usedist = true; - if (cv_sloperoll.value == 1) + if ((cv_spriteroll.value) && (cv_sloperoll.value)) { if ((!player->mo->salty_jump)) // seeing a character rotate mid-hop looks really janky K_RollMobjBySlopes(player->mo, usedist); diff --git a/src/m_menu.c b/src/m_menu.c index 81f815b91..9691e9bd5 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2061,15 +2061,16 @@ static menuitem_t OP_PlayerDistortMenu[] = { {IT_HEADER, NULL, "Sprite Distortion", NULL, 0}, - {IT_STRING | IT_CVAR, NULL, "Rotate Objects on Slopes", &cv_sloperoll, 20}, + {IT_STRING | IT_CVAR, NULL, "Sprite Rotation", &cv_spriteroll, 10}, + {IT_STRING | IT_CVAR, NULL, "Sprite Slope Rotation", &cv_sloperoll, 20}, {IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 35}, {IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 50}, {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 65}, {IT_STRING | IT_CVAR, NULL, "Player Stretch Factor", &cv_gravstretch, 80}, {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 95}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 110}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 110}, {IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 125}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 140}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 140}, }; static const char* OP_PlayerDistortTooltips[] = diff --git a/src/p_mobj.c b/src/p_mobj.c index d8237ff7b..5d9d5db2d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6263,7 +6263,7 @@ void P_RollPitchMobj(mobj_t* mobj) if (cv_sloperolldist.value > 0) usedist = true; - if (cv_sloperoll.value == 1) + if ((cv_spriteroll.value) && (cv_sloperoll.value == 2)) { K_RollMobjBySlopes(mobj, usedist); } @@ -6284,6 +6284,9 @@ angle_t P_MobjPitchAndRoll(mobj_t *mobj) if (P_MobjWasRemoved(mobj)) return 0; + + if (cv_spriteroll.value) + return 0; size_t rot = mobj->frame & FF_FRAMEMASK; boolean papersprite = (mobj->frame & FF_PAPERSPRITE); From 77577530da927be7d6a4ac91da4e3c6b32c2a261 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 8 Jan 2024 08:50:08 +0100 Subject: [PATCH 4/4] menu stuff --- src/m_menu.c | 66 +++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 9691e9bd5..6d7bf4c0a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2005,7 +2005,7 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 80}, {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 85}, - {IT_STRING | IT_CVAR, NULL, "Midnight Channel Flicker Effect", &cv_lessflicker, 95}, + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 95}, {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 105}, {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 110}, @@ -2061,22 +2061,23 @@ static menuitem_t OP_PlayerDistortMenu[] = { {IT_HEADER, NULL, "Sprite Distortion", NULL, 0}, - {IT_STRING | IT_CVAR, NULL, "Sprite Rotation", &cv_spriteroll, 10}, - {IT_STRING | IT_CVAR, NULL, "Sprite Slope Rotation", &cv_sloperoll, 20}, - {IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 35}, - {IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 50}, - {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 65}, - {IT_STRING | IT_CVAR, NULL, "Player Stretch Factor", &cv_gravstretch, 80}, - {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 95}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 110}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 125}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 140}, + {IT_STRING | IT_CVAR, NULL, "Sprite Rotation", &cv_spriteroll, 15}, + {IT_STRING | IT_CVAR, NULL, "Sprite Slope Rotation", &cv_sloperoll, 30}, + {IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 45}, + {IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 60}, + {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 75}, + {IT_STRING | IT_CVAR, NULL, "Player Stretch Factor", &cv_gravstretch, 90}, + {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 105}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 120}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 135}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 150}, }; static const char* OP_PlayerDistortTooltips[] = { NULL, - "Object rotation on slopes.", + "Sprite rotation features.", + "Sprite rotation on slopes. Can either be just players or all objects.", "Distance object rotation should be visable.", "Player rotation when sliptiding.", "Rotation of a player's boost trails and drift sparks.", @@ -2089,9 +2090,12 @@ static const char* OP_PlayerDistortTooltips[] = enum { + spriteheader, + spriterotate, sloperotate, slrotatedist, sliptide, + sparkrotate, stretchyplayer, squishsound, salthmmm, @@ -3130,20 +3134,26 @@ void Addons_option_Onchange(void) void PDistort_menu_Onchange(void) { - UINT16 status; - - if ((cv_sloperoll.value) && (cv_spriteroll.value)) + if (!cv_spriteroll.value) { - status = IT_STRING | IT_CVAR; + OP_PlayerDistortMenu[sloperotate].status = IT_GRAYEDOUT; + OP_PlayerDistortMenu[sliptide].status = IT_GRAYEDOUT; } else { - status = IT_GRAYEDOUT; + OP_PlayerDistortMenu[sloperotate].status = IT_STRING | IT_CVAR; + OP_PlayerDistortMenu[sliptide].status = IT_STRING | IT_CVAR; } - // enable/disable rolldist and sparkroll options - OP_PlayerDistortMenu[2].status = status; - OP_PlayerDistortMenu[4].status = status; + if ((cv_sloperoll.value) && (cv_spriteroll.value)) //enable/disable sloperotate distance + OP_PlayerDistortMenu[slrotatedist].status = IT_STRING | IT_CVAR; + else + OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT; + + if ((cv_sloperoll.value == 2) && (cv_spriteroll.value)) //enable/disable sparkroll depending on which setting + OP_PlayerDistortMenu[sparkrotate].status = IT_STRING | IT_CVAR; + else + OP_PlayerDistortMenu[sparkrotate].status = IT_GRAYEDOUT; } void Bird_menu_Onchange(void) @@ -3151,26 +3161,18 @@ void Bird_menu_Onchange(void) UINT16 status; if (cv_tilting.value) - { status = IT_STRING | IT_CVAR; - } else - { status = IT_GRAYEDOUT; - } OP_TiltMenu[tiltwturning].status = status; OP_TiltMenu[smoothening].status = status; OP_TiltMenu[tiltwquakes].status = status; if (cv_fading.value) - { status = IT_STRING | IT_CVAR; - } else - { status = IT_GRAYEDOUT; - } OP_AdvancedBirdMenu[fadeinvinc].status = status; OP_AdvancedBirdMenu[fadegrow].status = status; @@ -3197,13 +3199,9 @@ void Saturn_menu_Onchange(void) UINT16 status; if (cv_colorizedhud.value) - { - status = IT_STRING | IT_CVAR; - } + status = IT_STRING | IT_CVAR; else - { - status = IT_GRAYEDOUT; - } + status = IT_GRAYEDOUT; OP_SaturnMenu[sm_coloritem].status = status; OP_SaturnMenu[sm_colorhud_customcolor].status = status;