IAmChrisAMA
/
iw4x-rawfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from XLabsProject/revert-30-vote-menus 

Revert "add working vote menu files"
pull/3/head
Edo 2022-08-24 16:34:27 +02:00 committed by GitHub
parent 66642f15a8 3699b91661
commit 59dd587861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 868 additions and 1351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iw4x/iw4x_00/default_mp_controls.cfg
View File

@ -61,12 +61,8 @@ bind y "chatmodeteam"
//bind z "+talk" //bind z "+talk"
//bind x "openscriptmenu ingame changeweapon" //bind x "openscriptmenu ingame changeweapon"
// MULTIPLAYER VOTE CONTROLS
bind F1 "vote yes"
bind F2 "vote no"
// CLIENT ENVIRONMENT COMMANDS // CLIENT ENVIRONMENT COMMANDS
bind F12 "screenshotJPEG" bind F12 "screenshotJPEG"
// Default controller bindings // Default controller bindings
exec default_mp_controller.cfg exec default_mp_controller.cfg

141
iw4x/iw4x_00/ui_mp/controls_multi.menu
View File

@ -1,73 +1,70 @@
#include "ui/menudef.h" #include "ui/menudef.h"
#include "ui_mp/main.inc" #include "ui_mp/main.inc"
#include "ui_mp/pc_options.inc" #include "ui_mp/pc_options.inc"
#define MENU_NAME "controls_multi" #define MENU_NAME "controls_multi"
#define MENU_TITLE "@MENU_CHAT" #define MENU_TITLE "@MENU_CHAT"
#undef CHOICE_GROUP #undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME #define CHOICE_GROUP MENU_NAME
#define CLOSE_MENUS \ #define CLOSE_MENUS \
close "main_controls"; \ close "main_controls"; \
close "main_options"; \ close "main_options"; \
close "options_control_defaults"; \ close "options_control_defaults"; \
close "options_graphics"; \ close "options_graphics"; \
close "options_graphics_defaults"; \ close "options_graphics_defaults"; \
close "options_graphics_texture"; \ close "options_graphics_texture"; \
close "options_multi"; \ close "options_multi"; \
close "options_voice"; \ close "options_voice"; \
close "pc_options_actions"; \ close "pc_options_actions"; \
close "pc_options_advanced_video"; \ close "pc_options_advanced_video"; \
close "pc_options_audio"; \ close "pc_options_audio"; \
close "pc_options_controls"; \ close "pc_options_controls"; \
close "pc_options_game"; \ close "pc_options_game"; \
close "pc_options_look"; \ close "pc_options_look"; \
close "pc_options_movement"; \ close "pc_options_movement"; \
close "pc_options_multi"; \ close "pc_options_multi"; \
close "pc_options_video"; \ close "pc_options_video"; \
close "pc_options_voice"; close "pc_options_voice";
#define ON_MENU_OPEN \ #define ON_MENU_OPEN \
CLOSE_MENUS \ CLOSE_MENUS \
setLocalVarBool "ui_hideBack" (1); \ setLocalVarBool "ui_hideBack" (1); \
setLocalVarBool ui_hint_display 0; setLocalVarBool ui_hint_display 0;
#define ON_MENU_CLOSE \ #define ON_MENU_CLOSE \
setLocalVarBool "ui_hideBack" (0); \ setLocalVarBool "ui_hideBack" (0); \
open "pc_options_controls"; open "pc_options_controls";
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef menuDef
{ {
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR focusColor CHOICE_TEXTCOLOR
blurWorld 7 blurWorld 7
MENU_ON_OPEN(ON_MENU_OPEN) MENU_ON_OPEN(ON_MENU_OPEN)
MENU_ON_CLOSE(ON_MENU_CLOSE) MENU_ON_CLOSE(ON_MENU_CLOSE)
MENU_ON_ESC(ON_MENU_ESC) MENU_ON_ESC(ON_MENU_ESC)
#define BACKGROUND_PC_OPTIONS #define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4 #define BACKGROUND_IW4
#define DISABLE_SIDEBAR #define DISABLE_SIDEBAR
#define BACKGROUND_FULL #define BACKGROUND_FULL
#include "ui_mp/bg.inc" #include "ui_mp/bg.inc"
PC_OPTIONS_SECTION_TITLE(MENU_TITLE) PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic") PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic")
PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam") PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam")
PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage") PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage")
PC_OPTIONS_KEYBINDING( 4, "@MENU_VOTE_YES", "vote yes") PC_OPTIONS_KEYBINDSTATUS
PC_OPTIONS_KEYBINDING( 5, "@MENU_VOTE_NO", "vote no")
ITEM_BUTTON_BACK(ON_MENU_ESC)
PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC)
} }

57
iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu
View File

@ -1,57 +0,0 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "callvote"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
ITEM_BUTTON_BACK(close "self")
}
}

125
iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu
View File

@ -1,125 +0,0 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "changegametype"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("Change Gametype")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist2"
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
textscale 0.375
textfont 3
textalignx 6
visible 1
feeder FEEDER_GAMEMODES
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist2";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist2";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteTypeMap";
}
}
}
}

127
iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu
View File

@ -1,127 +0,0 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "changemap"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("@MENU_CHANGE_MAP")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist"
visible 1
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
textscale 0.375
textfont 3
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
textalignx 6
textaligny -1
forecolor 1 1 1 1
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
feeder FEEDER_ALLMAPS
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteTypeMap";
}
}
}
}

1638
iw4x/iw4x_00/ui_mp/scriptmenus/class.menu
View File

File diff suppressed because it is too large Load Diff

125
iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu
View File

@ -1,125 +0,0 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "kickplayer"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("@MPUI_KICK_PLAYER")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist"
visible 1
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
textscale 0.375
textfont 3
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
textalignx 6
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
feeder FEEDER_PLAYER_LIST
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteTypeMap";
}
}
}
}