From f7eed4ac86d4536a694fc664abd2120b39c0f161 Mon Sep 17 00:00:00 2001 From: FutureRave Date: Sat, 18 Mar 2023 11:08:23 +0000 Subject: [PATCH] fix: format --- iw4x/iw4x_00/common_scripts/utility.gsc | 8 +++---- iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc | 2 +- iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc | 2 +- iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc | 6 ++--- .../maps/mp/gametypes/_music_and_dialog.gsc | 2 +- .../maps/mp/gametypes/_playerlogic.gsc | 2 +- iw4x/iw4x_00/maps/mp/gametypes/dd.gsc | 4 ++-- iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc | 2 +- iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc | 14 ++++++------ .../maps/mp/killstreaks/_airstrike.gsc | 14 ++++++------ .../maps/mp/killstreaks/_helicopter.gsc | 4 ++-- iw4x/iw4x_00/maps/mp/mp_bloc.gsc | 2 +- iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc | 2 +- iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc | 2 +- iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc | 2 +- iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc | 2 +- iw4x/iw4x_00/ui/choices_setup_popmenu.menu | 2 +- iw4x/iw4x_00/ui_mp/mapmacros.inc | 4 ++-- iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu | 18 +++++++-------- iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu | 4 ++-- .../ui_mp/scriptmenus/changegametype.menu | 4 ++-- iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu | 2 +- .../iw4x_00/ui_mp/scriptmenus/kickplayer.menu | 4 ++-- iw4x/iw4x_00/ui_mp/settings_map.menu | 22 +++++++++---------- 24 files changed, 65 insertions(+), 65 deletions(-) diff --git a/iw4x/iw4x_00/common_scripts/utility.gsc b/iw4x/iw4x_00/common_scripts/utility.gsc index f59a6b5..1a01653 100644 --- a/iw4x/iw4x_00/common_scripts/utility.gsc +++ b/iw4x/iw4x_00/common_scripts/utility.gsc @@ -1983,7 +1983,7 @@ wait_for_flag_or_time_elapses( flagname, timer ) ============= ///ScriptDocBegin "Name: delayCall( , , , , )" -"Summary: delayCall is cool! It saves you from having to write extra script for once off commands. Note you don’t have to thread it off. delaycall is that smart!" +"Summary: delayCall is cool! It saves you from having to write extra script for once off commands. Note you don�t have to thread it off. delaycall is that smart!" "Module: Utility" "MandatoryArg: : The delay before the function occurs" "MandatoryArg: : The function to run." @@ -2859,8 +2859,8 @@ fileprint_launcher_end_file( file_relative_to_game, bIsPerforceEnabled ) if( !isdefined( bIsPerforceEnabled ) ) bIsPerforceEnabled = false; - setDevDvarIfUninitialized("LAUNCHER_PRINT_FAIL", "0"); - setDevDvarIfUninitialized("LAUNCHER_PRINT_SUCCESS", "0"); + setDevDvarIfUninitialized("LAUNCHER_PRINT_FAIL", "0"); + setDevDvarIfUninitialized("LAUNCHER_PRINT_SUCCESS", "0"); if( bIsPerforceEnabled ) fileprint_launcher( "GAMEPRINTENDFILE:GAMEPRINTP4ENABLED:"+file_relative_to_game ); @@ -2890,7 +2890,7 @@ fileprint_launcher_end_file( file_relative_to_game, bIsPerforceEnabled ) } setdevdvar("LAUNCHER_PRINT_FAIL", "0"); - setdevdvar( "LAUNCHER_PRINT_SUCCESS", "0" ); + setdevdvar( "LAUNCHER_PRINT_SUCCESS", "0" ); level.fileprint_launcher = undefined; return true; diff --git a/iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc b/iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc index 1a2c446..a8eff27 100644 --- a/iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc +++ b/iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc @@ -22,7 +22,7 @@ main() if(isdefined(oilspill) && oilspill.size > 0) { level.breakables_fx["oilspill"]["burn"] = loadfx ("props/barrel_fire"); - level.breakables_fx["oilspill"]["spark"] = loadfx("impacts/small_metalhit_1"); + level.breakables_fx["oilspill"]["spark"] = loadfx("impacts/small_metalhit_1"); } //------------------ diff --git a/iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc b/iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc index 0be71a1..5286068 100644 --- a/iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc +++ b/iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc @@ -4,7 +4,7 @@ main() { //level._effect["firelp_vhc_lrg_pm_farview"] = loadfx ("fire/firelp_vhc_lrg_pm_farview"); - //level._effect["lighthaze"] = loadfx ("misc/lighthaze"); + //level._effect["lighthaze"] = loadfx ("misc/lighthaze"); level._effect[ "firelp_med_pm" ] = loadfx( "fire/firelp_med_pm" ); level._effect[ "firelp_small_pm" ] = loadfx( "fire/firelp_small_pm" ); level._effect[ "firelp_small_pm_a" ] = loadfx( "fire/firelp_small_pm_a" ); diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc index e05552f..61b80b0 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc @@ -5,7 +5,7 @@ FACTION_REF_COL = 0; FACTION_NAME_COL = 1; FACTION_SHORT_NAME_COL = 1; -FACTION_WIN_GAME_COL = 3; +FACTION_WIN_GAME_COL = 3; FACTION_WIN_ROUND_COL = 4; FACTION_MISSION_ACCOMPLISHED_COL = 5; FACTION_ELIMINATED_COL = 6; @@ -1099,7 +1099,7 @@ timeUntilRoundEnd() timeRemaining = (getTimeLimit() * 60) - timePassed; if ( isDefined( level.timePaused ) ) - timeRemaining += level.timePaused; + timeRemaining += level.timePaused; return timeRemaining + level.postRoundTime; } @@ -1238,7 +1238,7 @@ Callback_StartGameType() levelFlagInit( "round_over", false ); levelFlagInit( "game_over", false ); - levelFlagInit( "block_notifies", false ); + levelFlagInit( "block_notifies", false ); level.prematchPeriod = 0; level.prematchPeriodEnd = 0; diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc index 1994535..66e33c7 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc @@ -492,7 +492,7 @@ suspenseMusic() { wait ( randomFloatRange( 60, 120 ) ); - playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] ); + playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] ); } } diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc index 68a1e16..f458708 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc @@ -619,7 +619,7 @@ spawnPlayer() self setClientDvar( "cg_thirdPerson", "0" ); self setDepthOfField( 0, 0, 512, 512, 4, 0 ); - //self setClientDvar( "cg_fov", "65" ); + //self setClientDvar( "cg_fov", "65" ); // Don't do this stuff for TI spawn points if ( isDefined( spawnPoint ) ) diff --git a/iw4x/iw4x_00/maps/mp/gametypes/dd.gsc b/iw4x/iw4x_00/maps/mp/gametypes/dd.gsc index 9b374ef..3fb230d 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/dd.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/dd.gsc @@ -692,7 +692,7 @@ bombPlanted( destroyedObj, player ) if ( level.destroyedObject.label == "_a" ) level.aPlanted = true; else - level.bPlanted = true; + level.bPlanted = true; level.destroyedObject.bombPlanted = true; @@ -719,7 +719,7 @@ bombHandler( player, destType ) if ( self.label == "_a" ) level.aPlanted = false; else - level.bPlanted = false; + level.bPlanted = false; self.bombPlanted = 0; diff --git a/iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc b/iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc index e6a7561..bc4f0e6 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc @@ -519,7 +519,7 @@ flagCaptured( winningTeam, endReasonText ) onTimeLimit() { if ( level.flagCaptured ) - return; + return; // TODO: change to "Flag Defended" or some such maps\mp\gametypes\_gamelogic::endGame( game["defenders"], game["strings"]["time_limit_reached"] ); diff --git a/iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc b/iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc index d4fea5b..2abaf44 100644 --- a/iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc +++ b/iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc @@ -185,21 +185,21 @@ init_sounds() add_context_sensative_dialog( "ai", "in_sight", 7, "ac130_fco_gonnagethim" ); // You gonna get him? add_context_sensative_dialog( "ai", "in_sight", 8, "ac130_fco_personnelthere" ); // Personnel right there. add_context_sensative_dialog( "ai", "in_sight", 9, "ac130_fco_nailthoseguys" ); // Nail those guys. - add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" ); // Light ‘em up. + add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" ); // Light �em up. add_context_sensative_dialog( "ai", "in_sight", 12, "ac130_fco_takehimout" ); // Yeah take him out. add_context_sensative_dialog( "ai", "in_sight", 14, "ac130_plt_yeahcleared" ); // Yeah, cleared to engage. - add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" ); // Copy, smoke ‘em. + add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" ); // Copy, smoke �em. add_context_sensative_dialog( "ai", "in_sight", 16, "ac130_fco_rightthere" ); // Right there...tracking. add_context_sensative_dialog( "ai", "in_sight", 17, "ac130_fco_tracking" ); // Tracking. - add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" ); // Ok he’s moving again. + add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" ); // Ok he�s moving again. add_context_sensative_timeout( "ai", "wounded_crawl", undefined, 6 ); add_context_sensative_dialog( "ai", "wounded_pain", 0, "ac130_fco_doveonground" ); // Yeah, he just dove on the ground. add_context_sensative_dialog( "ai", "wounded_pain", 1, "ac130_fco_knockedwind" ); // Probably just knocked the wind out of him. add_context_sensative_dialog( "ai", "wounded_pain", 2, "ac130_fco_downstillmoving" ); // That guy's down but still moving. add_context_sensative_dialog( "ai", "wounded_pain", 3, "ac130_fco_gettinbackup" ); // He's gettin' back up. - add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" ); // Yep, that guy’s still moving. + add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" ); // Yep, that guy�s still moving. add_context_sensative_dialog( "ai", "wounded_pain", 5, "ac130_fco_stillmoving" ); // He's still moving. add_context_sensative_timeout( "ai", "wounded_pain", undefined, 12 ); @@ -594,7 +594,7 @@ removeAC130Player( player, disconnected ) { player clearUsingRemote(); - player stopLocalSound( "missile_incoming" ); + player stopLocalSound( "missile_incoming" ); player show(); player unlink(); @@ -1673,7 +1673,7 @@ stingerProximityDetonate( player, missileTeam ) missileTarget = newTarget; if ( isDefined( level.ac130player ) ) - level.ac130player stopLocalSound( "missile_incoming" ); + level.ac130player stopLocalSound( "missile_incoming" ); } if ( curDist < minDist ) @@ -1699,7 +1699,7 @@ stingerProximityDetonate( player, missileTeam ) if ( isDefined( level.ac130player ) ) { - level.ac130player stopLocalSound( "missile_incoming" ); + level.ac130player stopLocalSound( "missile_incoming" ); if ( level.ac130player.team != missileTeam ) radiusDamage( self.origin, 1000, 1000, 1000, player ); diff --git a/iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc b/iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc index ce66808..ddab69b 100644 --- a/iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc +++ b/iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc @@ -417,7 +417,7 @@ airstrikeDamageEntsThread( sWeapon ) ent = level.airstrikeDamagedEnts[level.airstrikeDamagedEntsIndex]; if ( !isDefined( ent.entity ) ) - continue; + continue; if ( !ent.isPlayer || isAlive( ent.entity ) ) { @@ -533,7 +533,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin plane.angles = direction; forward = anglesToForward( direction ); - plane moveTo( pathEnd, flyTime, 0, 0 ); + plane moveTo( pathEnd, flyTime, 0, 0 ); thread stealthBomber_killCam( plane, pathEnd, flyTime, airStrikeType ); @@ -542,7 +542,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin // Delete the plane after its flyby wait ( flyTime ); plane notify( "delete" ); - plane delete(); + plane delete(); } @@ -693,11 +693,11 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint plane.angles = direction; forward = anglesToForward( direction ); plane thread playPlaneFx(); - plane moveTo( pathEnd, flyTime, 0, 0 ); + plane moveTo( pathEnd, flyTime, 0, 0 ); /# if ( getdvar("scr_airstrikedebug") == "1" ) - thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 ); + thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 ); #/ //thread callStrike_planeSound( plane, bombsite ); @@ -706,7 +706,7 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint // Delete the plane after its flyby wait flyTime; plane notify( "delete" ); - plane delete(); + plane delete(); } callStrike_bombEffect( plane, pathEnd, flyTime, launchTime, owner, requiredDeathCount, typeOfStrike ) @@ -1025,7 +1025,7 @@ targetisinfront(other, target) { forwardvec = anglestoforward(flat_angle(other.angles)); normalvec = vectorNormalize(flat_origin(target)-other.origin); - dot = vectordot(forwardvec,normalvec); + dot = vectordot(forwardvec,normalvec); if(dot > 0) return true; else diff --git a/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc b/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc index df795ba..34170a4 100644 --- a/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc +++ b/iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc @@ -813,7 +813,7 @@ makeGunShip() mgTurret makeTurretInoperable(); mgTurret.pers["team"] = self.team; mgTurret.killCamEnt = self; - self.mgTurretLeft = mgTurret; + self.mgTurretLeft = mgTurret; self.mgTurretLeft SetDefaultDropPitch( 0 ); mgTurret = spawnTurret( "misc_turret", self.origin, "pavelow_minigun_mp" ); @@ -825,7 +825,7 @@ makeGunShip() mgTurret makeTurretInoperable(); mgTurret.pers["team"] = self.team; mgTurret.killCamEnt = self; - self.mgTurretRight = mgTurret; + self.mgTurretRight = mgTurret; self.mgTurretRight SetDefaultDropPitch( 0 ); if ( level.teamBased ) diff --git a/iw4x/iw4x_00/maps/mp/mp_bloc.gsc b/iw4x/iw4x_00/maps/mp/mp_bloc.gsc index e5c9cc4..0e0956b 100644 --- a/iw4x/iw4x_00/maps/mp/mp_bloc.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_bloc.gsc @@ -8,7 +8,7 @@ main() setdvar( "compassmaxrange", "2000" ); - ambientPlay( "ambient_trainer_ext2" ); + ambientPlay( "ambient_trainer_ext2" ); game["attackers"] = "axis"; game["defenders"] = "allies"; diff --git a/iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc b/iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc index fda6459..2680dd8 100644 --- a/iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc @@ -10,7 +10,7 @@ main() setdvar( "compassmaxrange", "2000" ); - ambientPlay( "ambient_trainer_ext2" ); + ambientPlay( "ambient_trainer_ext2" ); game["attackers"] = "axis"; game["defenders"] = "allies"; diff --git a/iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc b/iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc index 9060e47..f822451 100644 --- a/iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc @@ -5,7 +5,7 @@ main() level._effect[ "leaves_ground_gentlewind_dust" ] = loadfx( "misc/leaves_ground_gentlewind_dust_sh" ); level._effect[ "dust_wind_slow_yel_loop" ] = loadfx( "dust/dust_wind_slow_yel_loop_sh" ); //level._effect[ "drips_player_hand" ] = loadfx( "water/drips_player_hand_sh" ); - level._effect["water_spill_fall"] = loadfx("maps/mp_maps/fx_mp_water_spill"); + level._effect["water_spill_fall"] = loadfx("maps/mp_maps/fx_mp_water_spill"); /# if ( getdvar( "clientSideEffects" ) != "1" ) diff --git a/iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc b/iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc index d052832..10595e3 100644 --- a/iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc @@ -1,4 +1,4 @@ -#include maps\mp\_utility; +#include maps\mp\_utility; // Scripted effects precache_scripted_fx() diff --git a/iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc b/iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc index 845be38..5e46ec1 100644 --- a/iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc @@ -1,4 +1,4 @@ -#include maps\mp\_utility; +#include maps\mp\_utility; // fx used by utility scripts precache_util_fx() diff --git a/iw4x/iw4x_00/ui/choices_setup_popmenu.menu b/iw4x/iw4x_00/ui/choices_setup_popmenu.menu index 93234ce..6da3e57 100644 --- a/iw4x/iw4x_00/ui/choices_setup_popmenu.menu +++ b/iw4x/iw4x_00/ui/choices_setup_popmenu.menu @@ -33,7 +33,7 @@ #endif #ifndef CENTER_POPUP_ON_CLOSE -#define CENTER_POPUP_ON_CLOSE play "mouse_click"; +#define CENTER_POPUP_ON_CLOSE play "mouse_click"; #endif #ifndef CHOICE_POPUP_BORDER_WIDTH diff --git a/iw4x/iw4x_00/ui_mp/mapmacros.inc b/iw4x/iw4x_00/ui_mp/mapmacros.inc index c99419e..7ace775 100644 --- a/iw4x/iw4x_00/ui_mp/mapmacros.inc +++ b/iw4x/iw4x_00/ui_mp/mapmacros.inc @@ -1,12 +1,12 @@ #define LOCAL_MAP_ACTION( mapname ) \ setdvar ui_mapname mapname; \ close "settings_map"; \ - close "self"; + close "self"; #define LOCAL_MAP_FOCUS( name, desc, icon ) \ setLocalVarString "ui_info_name" ( name ); \ setLocalVarString "ui_info_desc" ( desc ); \ - setLocalVarString "ui_info_icon" ( icon ); + setLocalVarString "ui_info_icon" ( icon ); #define LOCAL_MAP_NAME( name ) \ "@" + name diff --git a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu index ead6af0..5b0eda9 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu @@ -106,18 +106,18 @@ menuDef 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_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_DEFAULT"; "buttons_default"; + "@MENU_TACTICAL"; "buttons_tactical"; + "@MENU_LEFTY"; "buttons_lefty"; "@MENU_NOMAD"; "buttons_nomad"; - "@MENU_DEFAULT_ALT"; "buttons_default_alt"; - "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; - "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; + "@MENU_DEFAULT_ALT"; "buttons_default_alt"; + "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; + "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu index 14b5571..4f6ae11 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu @@ -18,8 +18,8 @@ blurWorld 7 onEsc { - close "self"; - open "class"; + close "self"; + open "class"; } #define BACKGROUND_PC_OPTIONS diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu index 29fb2ef..0dc1cc7 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu @@ -17,7 +17,7 @@ blurWorld 7 onEsc { - close "self"; + close "self"; open "class"; } @@ -117,7 +117,7 @@ } action { - close "self"; + close "self"; uiScript "voteGame"; } } diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu index 3411755..eb72530 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu @@ -119,7 +119,7 @@ } action { - close "self"; + close "self"; uiScript "voteMap"; } } diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu index 7107afb..1507bb0 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu @@ -18,7 +18,7 @@ blurWorld 7 onEsc { - close "self"; + close "self"; open "class"; } @@ -116,7 +116,7 @@ } action { - close "self"; + close "self"; uiScript "voteKick"; } } diff --git a/iw4x/iw4x_00/ui_mp/settings_map.menu b/iw4x/iw4x_00/ui_mp/settings_map.menu index 50807ff..34f53d2 100644 --- a/iw4x/iw4x_00/ui_mp/settings_map.menu +++ b/iw4x/iw4x_00/ui_mp/settings_map.menu @@ -165,23 +165,23 @@ visible when ( dvarint("iw4x_maps_dlc") == 99 ) onFocus { - play CHOICE_FOCUS_SOUND; - setItemColor self backcolor 0 0 0 1; - setLocalVarBool "ui_menuAButton" ( 1 ); + play CHOICE_FOCUS_SOUND; + setItemColor self backcolor 0 0 0 1; + setLocalVarBool "ui_menuAButton" ( 1 ); } leaveFocus { - setItemColor self backcolor 0 0 0 0; - setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); - setLocalVarBool "ui_menuAButton" ( 0 ); + setItemColor self backcolor 0 0 0 0; + setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); + setLocalVarBool "ui_menuAButton" ( 0 ); } action { - play "mouse_click"; - escape "self"; - uiScript "ApplyMap" - close "settings_map"; - close "self"; + play "mouse_click"; + escape "self"; + uiScript "ApplyMap"; + close "settings_map"; + close "self"; } }