thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Admin Tools menu

Browse source 
Just a superpowered version of the Call Votekick menu, also just to make release cleanly
This commit is contained in:
toaster 2023-06-28 00:02:09 +01:00
parent 685e1b019f
commit dee753d979
4 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menu.h
View file

@ -453,6 +453,7 @@ typedef enum
mpause_discordrequests, mpause_discordrequests,
#endif #endif
mpause_callvote, mpause_callvote,
mpause_admin,
mpause_continue, mpause_continue,
mpause_spectate, mpause_spectate,
@ -1088,6 +1089,7 @@ extern struct playerkickmenu_s {
tic_t ticker; tic_t ticker;
UINT8 player; UINT8 player;
UINT8 poke; UINT8 poke;
boolean adminpowered;
} playerkickmenu; } playerkickmenu;
void M_KickHandler(INT32 choice); void M_KickHandler(INT32 choice);

4
src/k_menudraw.c
View file

@ -4636,7 +4636,9 @@ void M_DrawKickHandler(void)
V_DrawCenteredThinString( V_DrawCenteredThinString(
BASEVIDWIDTH/2, 12, BASEVIDWIDTH/2, 12,
V_ALLOWLOWERCASE|V_6WIDTHSPACE, V_ALLOWLOWERCASE|V_6WIDTHSPACE,
K_GetMidVoteLabel(menucallvote) (playerkickmenu.adminpowered)
? "You are using ""\x85""Admin Tools""\x80"", ""\x83""(A)""\x80"" to kick and ""\x84""(C)""\x80"" to ban"
: K_GetMidVoteLabel(menucallvote)
); );
} }

11
src/menus/transient/pause-game.c
View file

@ -43,6 +43,9 @@ menuitem_t PAUSE_Main[] =
{IT_STRING | IT_ARROWS, "CALL VOTE", "M_ICOVOT", {IT_STRING | IT_ARROWS, "CALL VOTE", "M_ICOVOT",
NULL, {.routine = M_HandlePauseMenuCallVote}, 0, 0}, NULL, {.routine = M_HandlePauseMenuCallVote}, 0, 0},
{IT_STRING | IT_ARROWS, "ADMIN TOOLS", "M_ICOADM",
NULL, {.routine = M_KickHandler}, 0, 0},
{IT_STRING | IT_CALL, "RESUME GAME", "M_ICOUNP", {IT_STRING | IT_CALL, "RESUME GAME", "M_ICOUNP",
NULL, {.routine = M_QuitPauseMenu}, 0, 0}, NULL, {.routine = M_QuitPauseMenu}, 0, 0},
@ -128,6 +131,7 @@ void M_OpenPauseMenu(void)
PAUSE_Main[mpause_restartmap].status = IT_DISABLED; PAUSE_Main[mpause_restartmap].status = IT_DISABLED;
PAUSE_Main[mpause_tryagain].status = IT_DISABLED; PAUSE_Main[mpause_tryagain].status = IT_DISABLED;
PAUSE_Main[mpause_callvote].status = IT_DISABLED; PAUSE_Main[mpause_callvote].status = IT_DISABLED;
PAUSE_Main[mpause_admin].status = IT_DISABLED;
#ifdef HAVE_DISCORDRPC #ifdef HAVE_DISCORDRPC
PAUSE_Main[mpause_discordrequests].status = IT_DISABLED; PAUSE_Main[mpause_discordrequests].status = IT_DISABLED;
#endif #endif
@ -161,6 +165,11 @@ void M_OpenPauseMenu(void)
{ {
PAUSE_Main[mpause_addons].status = IT_STRING | IT_CALL; PAUSE_Main[mpause_addons].status = IT_STRING | IT_CALL;
} }
if (netgame)
{
PAUSE_Main[mpause_admin].status = IT_STRING | IT_CALL;
}
} }
} }
else if (!netgame && !demo.playback) else if (!netgame && !demo.playback)
@ -183,7 +192,7 @@ void M_OpenPauseMenu(void)
} }
} }
if (netgame) if (netgame && (PAUSE_Main[mpause_admin].status == IT_DISABLED))
{ {
menucallvote = K_GetNextAllowedMidVote(menucallvote, true); menucallvote = K_GetNextAllowedMidVote(menucallvote, true);

25
src/menus/transient/pause-kick.c
View file

@ -12,6 +12,8 @@ static void M_PlayerKickHandler(INT32 choice)
{ {
const UINT8 pid = 0; const UINT8 pid = 0;
UINT8 kicktype = UINT8_MAX;
(void)choice; (void)choice;
if (menucmd[pid].dpad_lr != 0) // symmetrical in this case if (menucmd[pid].dpad_lr != 0) // symmetrical in this case
@ -47,7 +49,17 @@ static void M_PlayerKickHandler(INT32 choice)
M_SetMenuDelay(pid); M_SetMenuDelay(pid);
} }
else if (M_MenuExtraPressed(pid) && playerkickmenu.adminpowered)
{
kicktype = KICK_MSG_BANNED;
}
else if (M_MenuConfirmPressed(pid)) else if (M_MenuConfirmPressed(pid))
{
kicktype = KICK_MSG_KICKED;
}
if (kicktype != UINT8_MAX)
{ {
M_SetMenuDelay(pid); M_SetMenuDelay(pid);
@ -57,7 +69,16 @@ static void M_PlayerKickHandler(INT32 choice)
&& playerkickmenu.player != serverplayer && playerkickmenu.player != serverplayer
) )
{ {
if ( if (playerkickmenu.adminpowered)
{
if (consoleplayer == serverplayer || IsPlayerAdmin(consoleplayer))
{
playerkickmenu.poke = (kicktype == KICK_MSG_BANNED) ? 16 : 12;
SendKick(playerkickmenu.player, kicktype);
return;
}
}
else if (
K_MinimalCheckNewMidVote(menucallvote) == true K_MinimalCheckNewMidVote(menucallvote) == true
#ifndef DEVELOP #ifndef DEVELOP
&& IsPlayerAdmin(playerkickmenu.player) == false && IsPlayerAdmin(playerkickmenu.player) == false
@ -107,6 +128,8 @@ menu_t PAUSE_KickHandlerDef = {
void M_KickHandler(INT32 choice) void M_KickHandler(INT32 choice)
{ {
playerkickmenu.adminpowered = (choice >= 0);
PAUSE_KickHandlerDef.prevMenu = currentMenu; PAUSE_KickHandlerDef.prevMenu = currentMenu;
M_SetupNextMenu(&PAUSE_KickHandlerDef, true); M_SetupNextMenu(&PAUSE_KickHandlerDef, true);
} }