From 853c9958d7c044629608d5316715333016c207b5 Mon Sep 17 00:00:00 2001 From: spherallic Date: Sat, 31 Dec 2022 02:40:44 +0100 Subject: [PATCH] Remove unfinished sprite rotation --- src/m_menu.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index b4b5409b0..a1c22bb3e 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -11999,7 +11999,6 @@ static void M_HandleConnectIP(INT32 choice) static fixed_t multi_tics; static UINT8 multi_frame; static UINT8 multi_spr2; -static UINT8 multi_angle; static boolean multi_paused; // this is set before entering the MultiPlayer setup menu, @@ -12091,8 +12090,8 @@ static void M_DrawSetupMultiPlayerMenu(void) multi_frame = 0; sprframe = &sprdef->spriteframes[multi_frame]; - patch = W_CachePatchNum(sprframe->lumppat[multi_angle], PU_PATCH); - if (sprframe->flip & 1 || multi_angle >= 5) // Only for first sprite + patch = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH); + if (sprframe->flip & 1) // Only for first sprite flags |= V_FLIP; // This sprite is left/right flipped! #define chary (y+64) @@ -12410,20 +12409,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice) } break; - case KEY_KEYPAD5: + case KEY_PAUSE: multi_paused = !multi_paused; break; - case KEY_KEYPAD4: - if (multi_angle <= 0) multi_angle = 7; - else multi_angle--; - break; - - case KEY_KEYPAD6: - if (multi_angle >= 7) multi_angle = 0; - else multi_angle++; - break; - default: if (itemOn != 0 || choice < 32 || choice > 127) break; @@ -12463,7 +12452,7 @@ static void M_SetupMultiPlayer(INT32 choice) multi_frame = 0; multi_tics = 4*FRACUNIT; - multi_angle = 0; + strcpy(setupm_name, cv_playername.string); // set for player 1 @@ -12508,7 +12497,7 @@ static void M_SetupMultiPlayer2(INT32 choice) multi_frame = 0; multi_tics = 4*FRACUNIT; - multi_angle = 0; + strcpy (setupm_name, cv_playername2.string); // set for splitscreen secondary player