From: <web...@pr...> - 2017-05-18 16:44:47
|
Author: entryway Date: Thu May 18 16:44:37 2017 New Revision: 4525 Log: removed "strafe 50 on turns" feature Modified: branches/prboom-plus-24/prboom2/src/e6y.c branches/prboom-plus-24/prboom2/src/e6y.h branches/prboom-plus-24/prboom2/src/g_game.c branches/prboom-plus-24/prboom2/src/m_menu.c branches/prboom-plus-24/prboom2/src/m_misc.c Modified: branches/prboom-plus-24/prboom2/src/e6y.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y.c Wed May 10 07:28:30 2017 (r4524) +++ branches/prboom-plus-24/prboom2/src/e6y.c Thu May 18 16:44:37 2017 (r4525) @@ -132,7 +132,6 @@ int hudadd_crosshair_lock_target; int movement_strafe50; int movement_shorttics; -int movement_strafe50onturns; int movement_mouselook; int movement_mouseinvert; int movement_maxviewpitch; Modified: branches/prboom-plus-24/prboom2/src/e6y.h ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y.h Wed May 10 07:28:30 2017 (r4524) +++ branches/prboom-plus-24/prboom2/src/e6y.h Thu May 18 16:44:37 2017 (r4525) @@ -120,7 +120,6 @@ extern int hudadd_crosshair_lock_target; extern int movement_strafe50; extern int movement_shorttics; -extern int movement_strafe50onturns; extern int movement_mouselook; extern int movement_mouseinvert; extern int movement_maxviewpitch; Modified: branches/prboom-plus-24/prboom2/src/g_game.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/g_game.c Wed May 10 07:28:30 2017 (r4524) +++ branches/prboom-plus-24/prboom2/src/g_game.c Thu May 18 16:44:37 2017 (r4525) @@ -371,7 +371,6 @@ } else { - movement_strafe50onturns = false; sidemove[0] = sidemove_normal[0]; sidemove[1] = sidemove_normal[1]; } @@ -722,21 +721,13 @@ //e6y if (movement_strafe50) { - if (!speed) + if(!strafe && cmd->angleturn) { - if (side > sidemove_strafe50[0]) - side = sidemove_strafe50[0]; - else if (side < -sidemove_strafe50[0]) - side = -sidemove_strafe50[0]; - } - else if(!movement_strafe50onturns && !strafe && cmd->angleturn) - { - if (side > sidemove_normal[1]) - side = sidemove_normal[1]; - else if (side < -sidemove_normal[1]) - side = -sidemove_normal[1]; + if (side > sidemove_normal[speed]) + side = sidemove_normal[speed]; + else if (side < -sidemove_normal[speed]) + side = -sidemove_normal[speed]; } - } cmd->forwardmove += fudgef((signed char)forward); Modified: branches/prboom-plus-24/prboom2/src/m_menu.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/m_menu.c Wed May 10 07:28:30 2017 (r4524) +++ branches/prboom-plus-24/prboom2/src/m_menu.c Thu May 18 16:44:37 2017 (r4525) @@ -3158,7 +3158,6 @@ {"Movements", S_SKIP|S_TITLE,m_null,G_X, G_Y+7*8}, {"Permanent Strafe50", S_YESNO, m_null, G_X, G_Y+ 8*8, {"movement_strafe50"}, 0, 0, M_ChangeSpeed}, - {"Strafe50 On Turns", S_YESNO, m_null, G_X, G_Y+ 9*8, {"movement_strafe50onturns"}, 0, 0, M_ChangeSpeed}, {"Mouse", S_SKIP|S_TITLE,m_null, G_X, G_Y+11*8}, {"Dbl-Click As Use", S_YESNO, m_null, G_X, G_Y+12*8, {"mouse_doubleclick_as_use"}}, Modified: branches/prboom-plus-24/prboom2/src/m_misc.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/m_misc.c Wed May 10 07:28:30 2017 (r4524) +++ branches/prboom-plus-24/prboom2/src/m_misc.c Thu May 18 16:44:37 2017 (r4525) @@ -947,8 +947,6 @@ {"Prboom-plus game settings",{NULL},{0},UL,UL,def_none,ss_none}, {"movement_strafe50", {&movement_strafe50}, {0},0,1, def_bool,ss_stat}, - {"movement_strafe50onturns", {&movement_strafe50onturns}, {0},0,1, - def_bool,ss_stat}, {"movement_shorttics", {&movement_shorttics}, {0},0,1, def_bool,ss_stat}, {"interpolation_maxobjects", {&interpolation_maxobjects}, {0},0,UL, |