From 3dcb2e7854ba8e7c73f55d5d3d4ac49f4495a477 Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 18 Aug 2023 16:50:12 +0300 Subject: [PATCH] Funny pain spin --- src/d_netcmd.c | 2 +- src/d_netcmd.h | 1 + src/m_menu.c | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b3ca5ca30..6043141b3 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -485,7 +485,7 @@ consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange, consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t skinselectspin_cons_t[] = { - {0, "Off"}, {1, "Slow"}, {2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"}, {8, "8"}, {9, "9"}, {10, "Fast"}, {0, NULL}}; + {0, "Off"}, {1, "Slow"}, {2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"}, {8, "8"}, {9, "9"}, {10, "Fast"}, {SKINSELECTSPIN_PAIN, "Pain"}, {0, NULL}}; consvar_t cv_skinselectspin = {"skinselectspin", "5", CV_SAVE, skinselectspin_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t perfstats_cons_t[] = { diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 5d7c7d62e..e92289397 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -156,6 +156,7 @@ extern consvar_t cv_skipmapcheck; extern consvar_t cv_sleep; +#define SKINSELECTSPIN_PAIN 25 extern consvar_t cv_skinselectspin; extern consvar_t cv_perfstats; diff --git a/src/m_menu.c b/src/m_menu.c index 6284af50c..e70ab967f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -10315,7 +10315,7 @@ static void M_DrawSetupMultiPlayerMenu(void) multi_tics -= renderdeltatics; while (multi_tics <= 0) { - st = multi_state->nextstate; + st = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? S_KART_PAIN : multi_state->nextstate; if (st != S_NULL) multi_state = &states[st]; @@ -10752,7 +10752,7 @@ static void M_SetupMultiPlayer(INT32 choice) { (void)choice; - multi_state = &states[mobjinfo[MT_PLAYER].seestate]; + multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics*FRACUNIT; strcpy(setupm_name, cv_playername.string); @@ -10789,7 +10789,7 @@ static void M_SetupMultiPlayer2(INT32 choice) { (void)choice; - multi_state = &states[mobjinfo[MT_PLAYER].seestate]; + multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics*FRACUNIT; strcpy (setupm_name, cv_playername2.string); @@ -10826,7 +10826,7 @@ static void M_SetupMultiPlayer3(INT32 choice) { (void)choice; - multi_state = &states[mobjinfo[MT_PLAYER].seestate]; + multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics; strcpy(setupm_name, cv_playername3.string); @@ -10863,7 +10863,7 @@ static void M_SetupMultiPlayer4(INT32 choice) { (void)choice; - multi_state = &states[mobjinfo[MT_PLAYER].seestate]; + multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics; strcpy(setupm_name, cv_playername4.string);