From 10fd153b0ac3fc8ed88a2f262a0f8193f064d225 Mon Sep 17 00:00:00 2001 From: Timo Smit Date: Sun, 12 Feb 2017 11:53:10 +0100 Subject: [PATCH] Added max bots vote to menu (fixes #77) --- pk3/ui/ingame_vote_wolfadmin.menu | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pk3/ui/ingame_vote_wolfadmin.menu b/pk3/ui/ingame_vote_wolfadmin.menu index ba01edc..5689595 100644 --- a/pk3/ui/ingame_vote_wolfadmin.menu +++ b/pk3/ui/ingame_vote_wolfadmin.menu @@ -4,13 +4,13 @@ #define WINDOW_X 16 #define WINDOW_Y 16 #define WINDOW_WIDTH 296 -#define WINDOW_HEIGHT 134 +#define WINDOW_HEIGHT 148 #define GROUP_NAME "grpIngameVoteWolfAdmin" // Macros // #include "ui/menumacros.h" -// WolfAdmin Vote Menu // +// WolfAdmin vote menu // menuDef { name "ingame_vote_wolfadmin" visible 0 @@ -19,11 +19,10 @@ menuDef { style WINDOW_STYLE_FILLED onOpen { - } onEsc { - close ingame_vote_wolfadmin ; + close ingame_vote_wolfadmin; open ingame_vote } @@ -34,14 +33,14 @@ menuDef { BUTTONEXT( 6, 32, WINDOW_WIDTH-12, 14, "ENABLE BOTS", .24, 11, exec "cmd callvote poll enable bots"; uiScript closeingame, voteFlag CV_SVF_POLL ) BUTTONEXT( 6, 50, WINDOW_WIDTH-12, 14, "DISABLE BOTS", .24, 11, exec "cmd callvote poll disable bots"; uiScript closeingame, voteFlag CV_SVF_POLL ) - // left side buttons BUTTONEXT( 6, 68, .5*(WINDOW_WIDTH-18), 14, "PUTBOTS AXIS", .24, 11, exec "cmd callvote poll put bots axis"; uiScript closeingame, voteFlag CV_SVF_POLL ) - - // right side buttons BUTTONEXT( 6+.5*(WINDOW_WIDTH-18)+6, 68, .5*(WINDOW_WIDTH-18), 14, "PUTBOTS ALLIES", .24, 11, exec "cmd callvote poll put bots allies"; uiScript closeingame, voteFlag CV_SVF_POLL ) - MULTILEFT( 8, 86+2, .80*(WINDOW_WIDTH-18), 10, "Bot difficulty:", .2, 8, "ui_poll", cvarStrList { "Uber"; "set bot difficulty uber"; "Professional"; "set bot difficulty professional"; "Standard"; "set bot difficulty standard"; "Easy frag"; "set bot difficulty easy frag"; "Poor"; "set bot difficulty poor"; "Very poor"; "set bot difficulty very poor"; "Poorest"; "set bot difficulty poorest" } voteflag CV_SVF_POLL, "Select the difficulty to vote on" ) + MULTILEFT( 8, 86+2, .80*(WINDOW_WIDTH-18), 10, "Max bots:", .2, 8, "ui_poll", cvarStrList { "20"; "set bot max 20"; "16"; "set bot max 16"; "12"; "set bot max 12"; "10"; "set bot max 10"; "8"; "set bot max 8"; "6"; "set bot max 6"; "4"; "set bot max 4"; "2"; "set bot max 2" } voteflag CV_SVF_POLL, "Select the max bots to vote on" ) + NAMEDBUTTONEXT( "bttnextBotMax", 6+.80*(WINDOW_WIDTH-18)+6, 86, .20*(WINDOW_WIDTH-18), 14, "OK", .24, 11, uiScript votePoll; uiScript closeingame, voteflag CV_SVF_POLL ) + + MULTILEFT( 8, 100+2, .80*(WINDOW_WIDTH-18), 10, "Bot difficulty:", .2, 8, "ui_poll", cvarStrList { "Uber"; "set bot difficulty uber"; "Professional"; "set bot difficulty professional"; "Standard"; "set bot difficulty standard"; "Easy frag"; "set bot difficulty easy frag"; "Poor"; "set bot difficulty poor"; "Very poor"; "set bot difficulty very poor"; "Poorest"; "set bot difficulty poorest" } voteflag CV_SVF_POLL, "Select the difficulty to vote on" ) NAMEDBUTTONEXT( "bttnextBotDifficulty", 6+.80*(WINDOW_WIDTH-18)+6, 86, .20*(WINDOW_WIDTH-18), 14, "OK", .24, 11, uiScript votePoll; uiScript closeingame, voteflag CV_SVF_POLL ) - BUTTON( 6, WINDOW_HEIGHT-24, WINDOW_WIDTH-12, 18, "BACK", .3, 14, close ingame_vote_wolfadmin ; open ingame_vote ) + BUTTON( 6, WINDOW_HEIGHT-24, WINDOW_WIDTH-12, 18, "BACK", .3, 14, close ingame_vote_wolfadmin; open ingame_vote ) }