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

Add rawfile changes for controller support

Browse Source
This commit is contained in:
Jan committed 2021-08-31 18:11:48 +02:00
1 parent e6d42754d9
commit 403ef82a18
44 files changed
+376 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

iw4x/iw4x_00/ui_mp/leftside_options.inc
+4 -2
View File
@@ -26,6 +26,7 @@
close "pc_options_audio"; \
close "pc_options_controls"; \
close "pc_options_game"; \
close "pc_options_gamepad"; \
close "pc_options_look"; \
close "pc_options_movement"; \
close "pc_options_multi"; \
@@ -113,9 +114,10 @@ PC_OPTIONS_BUTTON(1, "buttonAudio", "@MENU_AUDIO", PC_OPTIONS_BUTTON_LEFT_ACTION
PC_OPTIONS_BUTTON(2, "buttonControls", "@MENU_CONTROLS", PC_OPTIONS_BUTTON_LEFT_ACTION(open "pc_options_controls";))
PC_OPTIONS_BUTTON(3, "buttonMulti", "@MENU_MULTIPLAYER", PC_OPTIONS_BUTTON_LEFT_ACTION(open "pc_options_multi";))
PC_OPTIONS_BUTTON(4, "buttonGame", "@MENU_GAME", PC_OPTIONS_BUTTON_LEFT_ACTION(open "pc_options_game";))
PC_OPTIONS_BUTTON(5, "buttonGamepad", "@MENU_GAMEPAD", PC_OPTIONS_BUTTON_LEFT_ACTION(open "pc_options_gamepad";))
MENU_CHOICE_HORIZONTAL_LINE(5)
PC_OPTIONS_BUTTON_RAW(5, "buttonDefaults", "@MENU_RESET_SYSTEM_DEFAULTS", open "options_graphics_defaults";, "@NULL_EMPTY", when (dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()), 1)
MENU_CHOICE_HORIZONTAL_LINE(6)
PC_OPTIONS_BUTTON_RAW(6, "buttonDefaults", "@MENU_RESET_SYSTEM_DEFAULTS", open "options_graphics_defaults";, "@NULL_EMPTY", when (dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()), 1)
itemDef
{
iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu
+100
View File
@@ -0,0 +1,100 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#include "ui_mp/pc_options.inc"
#define MENU_NAME "pc_options_gamepad"
#define MENU_TITLE "@MENU_GAMEPAD"
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
#define CLOSE_MENUS \
close "controls_multi"; \
close "main_controls"; \
close "main_options"; \
close "options_control_defaults"; \
close "options_graphics"; \
close "options_graphics_defaults"; \
close "options_graphics_texture"; \
close "options_multi"; \
close "options_voice"; \
close "pc_options_actions"; \
close "pc_options_advanced_video"; \
close "pc_options_audio"; \
close "pc_options_controls"; \
close "pc_options_look"; \
close "pc_options_movement"; \
close "pc_options_multi"; \
close "pc_options_video"; \
close "pc_options_voice";
#define ON_MENU_OPEN \
CLOSE_MENUS \
exec "setfromdvar ui_name name"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; \
setLocalVarBool ui_hint_display 1; \
execnow "profile_menuDvarsSetup; resetViewport"; \
setFocus "buttonGamepad";
#define ON_MENU_ESC \
close self; \
if (!(menuisopen("pc_options_advanced_video") || menuisopen("pc_options_video") || menuisopen("pc_options_Audio") || menuisopen("pc_options_controls") || menuisopen("pc_options_voice") ) && localvarbool("ui_showPicApply") && !localvarbool("ui_showApply") && !localvarbool("ui_showAudioApply")) \
{ \
execnow "setfromdvar r_picmip ui_r_picmip"; \
execnow "setfromdvar r_picmip_bump ui_r_picmip_bump"; \
execnow "setfromdvar r_picmip_spec ui_r_picmip_spec"; \
execnow "setfromdvar r_picmip_manual ui_r_picmip_manual"; \
exec "wait; wait; r_applyPicmip"; \
setLocalVarBool "ui_showPicApply" (0); \
} \
if (!(menuisopen("pc_options_advanced_video") || menuisopen("pc_options_video") || menuisopen("pc_options_Audio") || menuisopen("pc_options_controls") || menuisopen("pc_options_voice") ) && localvarbool("ui_showApply") || localvarbool("ui_showAudioApply")) \
{ \
open "all_restart_popmenu"; \
} \
execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY";
#define ON_GPAD_ENABLED when(dvarBool("gpad_enabled") == 1)
#define ON_GPAD_DISABLED when(dvarBool("gpad_enabled") == 0)
#define ON_GAMEPAD_ENABLED_TOGGLE \
if (dvarbool("gpad_enabled") && dvarstring("gpad_sticksConfig") == "") \
{ \
setdvar gpad_sticksConfig "thumbstick_default"; \
execnow "bindgpsticksconfigs"; \
} \
if (dvarbool("gpad_enabled") && dvarstring("gpad_buttonConfig") == "") \
{ \
setdvar gpad_buttonConfig "buttons_default"; \
execnow "bindgpbuttonsconfigs"; \
}
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
MENU_ON_OPEN(ON_MENU_OPEN)
MENU_ON_CLOSE(ON_MENU_CLOSE)
MENU_ON_ESC(ON_MENU_ESC)
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
#include "ui_mp/leftside_options.inc"
PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
PC_OPTIONS_DVARYESNO_RAW(0, "@MENU_GAMEPAD_ENABLED", "gpad_enabled", ON_GAMEPAD_ENABLED_TOGGLE;, "@MPUI_DESC_GAMEPAD_ENABLED", when(0), 1)
PC_OPTIONS_SEPERATOR(0)
PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", {"@MENU_DEFAULT"; "thumbstick_default"; "@MENU_SOUTHPAW"; "thumbstick_southpaw"; "@MENU_LEGACY"; "thumbstick_legacy"; "@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", {"@MENU_DEFAULT"; "buttons_default"; "@MENU_TACTICAL"; "buttons_tactical"; "@MENU_LEFTY"; "buttons_lefty"; "@MENU_NOMAD"; "buttons_nomad"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
PC_OPTIONS_DVARSLIDER_RAW(4, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 3, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED)
}