From a8455ae24635053ced0ed091f306f3ca5eb76cdf Mon Sep 17 00:00:00 2001 From: blackhc Date: Sat, 2 Apr 2005 14:04:11 +0000 Subject: [PATCH] -Moved Weapon and Server to Create Game (now known as Game Settings and Weapon Settings) -Changed the width of the Create Game panel to 900 -Changed Arrangement to support Align_First (used in Weapon Settings) (BTW, look into creategame/weapon.menu to see the hack) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@348 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- scmenu/creategame.menu | 16 +- scmenu/creategame/basic.menu | 8 +- .../server.menu => creategame/game.menu} | 39 +-- scmenu/creategame/maplist.menu | 12 +- scmenu/creategame/weapon.menu | 280 ++++++++++++++++++ scmenu/options.menu | 24 -- scmenu/options/weapon.menu | 144 --------- scmenu/options/weapon2.menu | 139 --------- scmenu/source/control/window/arrangement.qc | 4 +- 9 files changed, 324 insertions(+), 342 deletions(-) rename scmenu/{options/server.menu => creategame/game.menu} (66%) create mode 100644 scmenu/creategame/weapon.menu delete mode 100644 scmenu/options/weapon.menu delete mode 100644 scmenu/options/weapon2.menu diff --git a/scmenu/creategame.menu b/scmenu/creategame.menu index fc2b5e557..fa2920057 100644 --- a/scmenu/creategame.menu +++ b/scmenu/creategame.menu @@ -3,13 +3,13 @@ // creategame.menu Item Layout CreateGame { - size '850 630' + size '900 630' alignment [AlignLeft] direction [Nex_DefaultVertDirection] Item Layout Bar { - size '850 20' + size '900 20' alignment [AlignLeft] direction [Nex_DefaultHorzDirection] @@ -18,7 +18,7 @@ Item Layout CreateGame normal " Basic Options " init Nex_Action_JumpToPage - target "Panel::BasicOptions" + target "Panel::Basic" } Derive TextButton MapList { @@ -30,18 +30,26 @@ Item Layout CreateGame Derive TextButton Configurations { normal " Game Settings " + + init Nex_Action_JumpToPage + target "Panel::Game" } Derive TextButton Advanced { normal " Weapon Settings " + + init Nex_Action_JumpToPage + target "Panel::Weapon" } } Item EventWindow Panel { - size '850 585' + size '900 585' reinit Nex_Action_MakeFirstVisible #include "menu/creategame/basic.menu" #include "menu/creategame/maplist.menu" + #include "menu/creategame/game.menu" + #include "menu/creategame/weapon.menu" } } diff --git a/scmenu/creategame/basic.menu b/scmenu/creategame/basic.menu index b3456c223..3ddec7967 100644 --- a/scmenu/creategame/basic.menu +++ b/scmenu/creategame/basic.menu @@ -1,9 +1,9 @@ // Property of Alientrap/AK // // creategame/basic.menu -Item Window BasicOptions +Item Window Basic { - size '850 585' + size '900 585' Item Window Map { @@ -55,8 +55,8 @@ Item Window BasicOptions Item Layout Settings { pos '400 0' - size '450 585' - origin '225 0' + size '500 585' + origin '250 0' alignment [AlignFirst] direction [Nex_DefaultVertDirection] flag [FlagEmbedded] diff --git a/scmenu/options/server.menu b/scmenu/creategame/game.menu similarity index 66% rename from scmenu/options/server.menu rename to scmenu/creategame/game.menu index 292cef4f6..6d57080f8 100644 --- a/scmenu/options/server.menu +++ b/scmenu/creategame/game.menu @@ -1,10 +1,11 @@ // Property of Alientrap/AK -// options/server.menu -Item Layout Server +// +// creategame/game.menu +Item Layout Game { direction [Nex_DefaultVertDirection] - size '600 600' - origin '300 50' + size '900 585' + origin '450 0' alignment [AlignFirst] DeriveTemplate Nex_Composition Nex_Option_EditBox @@ -24,76 +25,76 @@ Item Layout Server Derive Nex_Option_Switch Instagib { text "Instagib" - target "::Data::Server::Instagib::Switch" + target "::Data::Game::Instagib::Switch" } Derive Nex_Option_Switch Rocketarena { text "Rocket Arena" - target "::Data::Server::RocketArena::Switch" + target "::Data::Game::RocketArena::Switch" } Derive Nex_Option_Switch Casings { text "Bullet Casings" - target "::Data::Server::Casings::Switch" + target "::Data::Game::Casings::Switch" } Derive Nex_Option_EditBox Health { text "Starting Health" - target "Data::Server::Health::Text" + target "Data::Game::Health::Text" } Derive Nex_Option_EditBox Gravity { text "Level Gravity" - target "Data::Server::Gravity::Text" + target "Data::Game::Gravity::Text" } Derive Nex_Option_EditBox Maxspeed { text "Player Maxspeed" - target "Data::Server::Health::Text" + target "Data::Game::MaxSpeed::Text" } Derive Nex_Option_EditBox Gamespeed { text "Game Speed" - target "Data::Server::GameSpeed::Text" + target "Data::Game::GameSpeed::Text" } Derive Nex_Option_EditBox Maxairspeed { text "Max Air Speed" - target "Data::Server::MaxAirSpeed::Text" + target "Data::Game::MaxAirSpeed::Text" } Derive Nex_Option_EditBox JumpHeight { text "Jump height" - target "Data::Server::JumpHeight::Text" + target "Data::Game::JumpHeight::Text" } Derive Nex_Option_EditBox HealthRegeneration { text "Regeneration Speed" - target "Data::Server::HealthRegeneration::Text" + target "Data::Game::HealthRegeneration::Text" } Derive Nex_Option_EditBox ArmorRott { text "Armor Rott Speed" - target "Data::Server::ArmorRott::Text" + target "Data::Game::ArmorRott::Text" } Derive Nex_Option_EditBox SelfDamagePercent { text "Self Damage Percent" - target "Data::Server::SelfDamagePercent::Text" + target "Data::Game::SelfDamagePercent::Text" } Derive Nex_Option_EditBox WeaponSwitchDelay { text "Weapon Switch Delay" - target "Data::Server::WeaponSwitchDelay::Text" + target "Data::Game::WeaponSwitchDelay::Text" } Derive Nex_Option_EditBox Friction { text "Player Friction" - target "Data::Server::Friction::Text" + target "Data::Game::Friction::Text" } Derive Nex_Option_EditBox Accelerate { text "Player Accelerate" - target "Data::Server::Accelerate::Text" + target "Data::Game::Accelerate::Text" } } diff --git a/scmenu/creategame/maplist.menu b/scmenu/creategame/maplist.menu index f1f8eb6df..0452af97c 100644 --- a/scmenu/creategame/maplist.menu +++ b/scmenu/creategame/maplist.menu @@ -3,7 +3,7 @@ // creategame/maplist.menu Item Window MapList { - size '850 585' + size '900 585' Derive Label MapsLabel { @@ -13,25 +13,25 @@ Item Window MapList Derive List Maps { pos '0 20' - size '400 500' + size '425 500' target "::Data::Server::Map::List" } Derive Label CycleLabel { - pos '450 0' + pos '475 0' text "Cycle List or some other name:" } Derive List Cycle { - pos '450 20' - size '400 450' + pos '475 20' + size '425 450' target "::Data::Server::Map::Cycle" } Item Layout Panel { - pos '450 470' + pos '475 470' size '400 30' direction [Nex_DefaultHorzDirection] flag [FlagEmbedded] diff --git a/scmenu/creategame/weapon.menu b/scmenu/creategame/weapon.menu new file mode 100644 index 000000000..95c7ee910 --- /dev/null +++ b/scmenu/creategame/weapon.menu @@ -0,0 +1,280 @@ +// Property of Alientrap/AK +// +// creategame/weapon.menu +Item ScrollWindow Weapon +{ + size '900 585' + + Item Arrangement Arrangement + { + direction [Nex_DefaultVertDirection] + alignment [AlignFirst] + flag [FlagEmbedded] + + // hack to make the arrangement have a set width + Item Window FixWidth + { + size '900 0' + Derive Nex_Void Left + { + pos '0 0' + size '450 0' + } + Derive Nex_Void Right + { + pos '450 0' + size '450 0' + } + } + + DeriveTemplate Nex_Composition Nex_Option_EditBox + { + DeriveTemplate Nex_Automation_Option_EditBox Automation + {} + DeriveTemplate TextButton Description + {} + DeriveTemplate EditBox EditBox + { + size '260 12' + action Nex_Action_TestOnChange + select Nex_Action_TestOnSelect + } + } + + Derive Nex_Option_EditBox LaserDamage + { + text "Laser Damage" + target "Data::Weapon::LaserDamage::Text" + } + Derive Nex_Option_EditBox LaserEdgeDamage + { + text "Laser edge damage" + target "Data::Weapon::LaserEdgeDamage::Text" + } + Derive Nex_Option_EditBox LaserForce + { + text "Laser Push Force" + target "Data::Weapon::LaserForce::Text" + } + Derive Nex_Option_EditBox LaserRadius + { + text "Laser Radius" + target "Data::Weapon::LaserRadius::Text" + } + Derive Nex_Option_EditBox LaserSpeed + { + text "Laser Speed" + target "Data::Weapon::LaserSpeed::Text" + } + Derive Nex_Option_EditBox ShotgunDamage + { + text "Shotgun Damage" + target "Data::Weapon::ShotgunDamage::Text" + } + Derive Nex_Option_EditBox ShotgunBullets + { + text "Shotgun Bullets" + target "Data::Weapon::ShotgunBullets::Text" + } + Derive Nex_Option_EditBox UziDamage + { + text "Uzi Damage" + target "Data::Weapon::UziDamage::Text" + } + Derive Nex_Option_EditBox UziSpread + { + text "Uzi Spread" + target "Data::Weapon::UziSpread::Text" + } + Derive Nex_Option_EditBox UziSpread2 + { + text "Uzi Spread2" + target "Data::Weapon::UziSpread2::Text" + } + Derive Nex_Option_EditBox UziRefire + { + text "Uzi Refire" + target "Data::Weapon::UziRefire::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherDamage + { + text "Grenade Launcher Damage" + target "Data::Weapon::GrenadeLauncherDamage::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherEdgeDamage + { + text "GL Edge Damage" + target "Data::Weapon::GrenadeLauncherEdgeDamage::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherForce + { + text "Grenade Launcher Force" + target "Data::Weapon::GrenadeLauncherForce::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherRadius + { + text "Grenade Launcher Radius" + target "Data::Weapon::GrenadeLauncherRadius::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherSpeed + { + text "Grenade Launcher Speed" + target "Data::Weapon::GrenadeLauncherSpeed::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherSpeedUp + { + text "Grenade Launcher Speedup" + target "Data::Weapon::GrenadeLauncherSpeedUp::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherSpeed2 + { + text "Grenade Launcher Speed2" + target "Data::Weapon::GrenadeLauncherSpeed2::Text" + } + Derive Nex_Option_EditBox GrenadeLauncherSpeed2Up + { + text "Grenade Launcher Speed2up" + target "Data::Weapon::GrenadeLauncherSpeed2Up::Text" + } + Derive Nex_Option_EditBox ElectroDamage + { + text "Electro Damage" + target "Data::Weapon::ElectroDamage::Text" + } + Derive Nex_Option_EditBox ElectroEdgeDamage + { + text "Electro Edgedamage" + target "Data::Weapon::ElectroEdgeDamage::Text" + } + Derive Nex_Option_EditBox ElectroForce + { + text "Electro Force" + target "Data::Weapon::ElectroForce::Text" + } + Derive Nex_Option_EditBox ElectroRadius + { + text "Electro Radius" + target "Data::Weapon::ElectroRadius::Text" + } + Derive Nex_Option_EditBox ElectroRefire + { + text "Electro Refire" + target "Data::Weapon::ElectroRefire::Text" + } + Derive Nex_Option_EditBox ElectroSpeed + { + text "Electro Speed" + target "Data::Weapon::ElectroSpeed::Text" + } + Derive Nex_Option_EditBox ElectroBallSpeed + { + text "Electroball Speed" + target "Data::Weapon::ElectroBallSpeed::Text" + } + Derive Nex_Option_EditBox ElectroBallSpeedUp + { + text "Electroball Speed up" + target "Data::Weapon::ElectroBallSpeedUp::Text" + } + Derive Nex_Option_EditBox CryLinkDamage + { + text "CryLink Damage" + target "Data::Weapon::CryLinkDamage::Text" + } + Derive Nex_Option_EditBox CryLinkEdgeDamage + { + text "CryLink Edgedamage" + target "Data::Weapon::CryLinkEdgeDamage::Text" + } + Derive Nex_Option_EditBox CryLinkForce + { + text "CryLink Force" + target "Data::Weapon::CryLinkForce::Text" + } + Derive Nex_Option_EditBox CryLinkRadius + { + text "CryLink Radius" + target "Data::Weapon::CryLinkRadius::Text" + } + Derive Nex_Option_EditBox CryLinkSpeed + { + text "CryLink Speed" + target "Data::Weapon::CryLinkSpeed::Text" + } + Derive Nex_Option_EditBox CryLinkSpread + { + text "CryLink Spread" + target "Data::Weapon::CryLinkSpread::Text" + } + Derive Nex_Option_EditBox CryLinkRefire + { + text "CryLink Refire" + target "Data::Weapon::CryLinkRefire::Text" + } + Derive Nex_Option_EditBox NexDamage + { + text "Nex Damage" + target "Data::Weapon::NexDamage::Text" + } + Derive Nex_Option_EditBox HagarDamage + { + text "Hagar Damage" + target "Data::Weapon::HagarDamage::Text" + } + Derive Nex_Option_EditBox HagarEdgeDamage + { + text "Hagar Edge Damage" + target "Data::Weapon::HagarEdgeDamage::Text" + } + Derive Nex_Option_EditBox HagarForce + { + text "Hagar Force" + target "Data::Weapon::HagarForce::Text" + } + Derive Nex_Option_EditBox HagarRadius + { + text "Hagar Radius" + target "Data::Weapon::HagarRadius::Text" + } + Derive Nex_Option_EditBox HagarSpeed + { + text "Hagar Speed" + target "Data::Weapon::HagarSpeed::Text" + } + Derive Nex_Option_EditBox HagarSpeed2 + { + text "Hagar Speed2" + target "Data::Weapon::HagarSpeed2::Text" + } + Derive Nex_Option_EditBox HagarSpeed2Up + { + text "Hagar Speed2 up" + target "Data::Weapon::HagarSpeed2Up::Text" + } + Derive Nex_Option_EditBox RocketLauncherDamage + { + text "Rocket Launcher Damage" + target "Data::Weapon::RocketLauncherDamage::Text" + } + Derive Nex_Option_EditBox RocketLauncherEdgeDamage + { + text "RL Edge Damage" + target "Data::Weapon::RocketLauncherEdgeDamage::Text" + } + Derive Nex_Option_EditBox RocketLauncherForce + { + text "Rocket Launcher Force" + target "Data::Weapon::RocketLauncherForce::Text" + } + Derive Nex_Option_EditBox RocketLauncherRadius + { + text "Rocket Launcher Radius" + target "Data::Weapon::RocketLauncherRadius::Text" + } + Derive Nex_Option_EditBox RocketLauncherSpeed + { + text "Rocket Launcher Speed" + target "Data::Weapon::RocketLauncherSpeed::Text" + } + } +} diff --git a/scmenu/options.menu b/scmenu/options.menu index 439d93d19..dbb217409 100644 --- a/scmenu/options.menu +++ b/scmenu/options.menu @@ -66,27 +66,6 @@ Item Layout Options init Nex_Action_JumpToPage target "Panel::Input" } - Derive TextButton Server - { - normal "Gameplay" - - init Nex_Action_JumpToPage - target "Panel::Server" - } - Derive TextButton Weapon - { - normal "Weapons" - - init Nex_Action_JumpToPage - target "Panel::Weapon" - } - Derive TextButton Weapon2 - { - normal "More Weapons" - - init Nex_Action_JumpToPage - target "Panel::Weapon2" - } } Item EventWindow Panel { @@ -100,9 +79,6 @@ Item Layout Options #include "menu/options/color.menu" #include "menu/options/effects.menu" #include "menu/options/input.menu" - //#include "menu/options/server.menu" - //#include "menu/options/weapon.menu" - //#include "menu/options/weapon2.menu" } } } \ No newline at end of file diff --git a/scmenu/options/weapon.menu b/scmenu/options/weapon.menu deleted file mode 100644 index 760022d71..000000000 --- a/scmenu/options/weapon.menu +++ /dev/null @@ -1,144 +0,0 @@ -// Property of Alientrap/AK -// options/weapon.menu -Item Layout Weapon -{ - direction [Nex_DefaultVertDirection] - size '600 600' - origin '300 50' - alignment [AlignFirst] - - DeriveTemplate Nex_Composition Nex_Option_EditBox - { - DeriveTemplate Nex_Automation_Option_EditBox Automation - {} - DeriveTemplate TextButton Description - {} - DeriveTemplate EditBox EditBox - { - size '260 12' - action Nex_Action_TestOnChange - select Nex_Action_TestOnSelect - } - } - - Derive Nex_Option_EditBox laserdamage - { - text "Laser Damage" - target "Data::Weapon::LaserDamage::Text" - } - Derive Nex_Option_EditBox laseredgedamage - { - text "Laser edge damage" - target "Data::Weapon::LaserEdgeDamage::Text" - } - Derive Nex_Option_EditBox laserforce - { - text "Laser Push Force" - target "Data::Weapon::LaserForce::Text" - } - Derive Nex_Option_EditBox laserradius - { - text "Laser Radius" - target "Data::Weapon::LaserRadius::Text" - } - Derive Nex_Option_EditBox laserspeed - { - text "Laser Speed" - target "Data::Weapon::LaserSpeed::Text" - } - Derive Nex_Option_EditBox shotgundamage - { - text "Shotgun Damage" - target "Data::Weapon::ShotgunDamage::Text" - } - Derive Nex_Option_EditBox shotgunbullets - { - text "Shotgun Bullets" - target "Data::Weapon::ShotgunBullets::Text" - } - Derive Nex_Option_EditBox uzidamage - { - text "Uzi Damage" - target "Data::Weapon::UziDamage::Text" - } - Derive Nex_Option_EditBox uzispread - { - text "Uzi Spread" - target "Data::Weapon::UziSpread::Text" - } - Derive Nex_Option_EditBox uzispread2 - { - text "Uzi Spread2" - target "Data::Weapon::UziSpread2::Text" - } - Derive Nex_Option_EditBox uzirefire - { - text "Uzi Refire" - target "Data::Weapon::UziRefire::Text" - } - Derive Nex_Option_EditBox grenadelauncherdamage - { - text "Grenade Launcher Damage" - target "Data::Weapon::GrenadeLauncherDamage::Text" - } - Derive Nex_Option_EditBox grenadelauncheredgedamage - { - text "GL Edge Damage" - target "Data::Weapon::GrenadeLauncherEdgeDamage::Text" - } - Derive Nex_Option_EditBox grenadelauncherforce - { - text "Grenade Launcher Force" - target "Data::Weapon::GrenadeLauncherForce::Text" - } - Derive Nex_Option_EditBox grenadelauncherradius - { - text "Grenade Launcher Radius" - target "Data::Weapon::GrenadeLauncherRadius::Text" - } - Derive Nex_Option_EditBox grenadelauncherspeed - { - text "Grenade Launcher Speed" - target "Data::Weapon::GrenadeLauncherSpeed::Text" - } - Derive Nex_Option_EditBox grenadelauncherspeedup - { - text "Grenade Launcher Speedup" - target "Data::Weapon::GrenadeLauncherSpeedUp::Text" - } - Derive Nex_Option_EditBox grenadelauncherspeed2 - { - text "Grenade Launcher Speed2" - target "Data::Weapon::GrenadeLauncherSpeed2::Text" - } - Derive Nex_Option_EditBox grenadelauncherspeed2up - { - text "Grenade Launcher Speed2up" - target "Data::Weapon::GrenadeLauncherSpeed2Up::Text" - } - Derive Nex_Option_EditBox electrodamage - { - text "Electro Damage" - target "Data::Weapon::ElectroDamage::Text" - } - Derive Nex_Option_EditBox electroedgedamage - { - text "Electro Edgedamage" - target "Data::Weapon::ElectroEdgeDamage::Text" - } - Derive Nex_Option_EditBox electroforce - { - text "Electro Force" - target "Data::Weapon::ElectroForce::Text" - } - Derive Nex_Option_EditBox electroradius - { - text "Electro Radius" - target "Data::Weapon::ElectroRadius::Text" - } - Derive Nex_Option_EditBox electrorefire - { - text "Electro Refire" - target "Data::Weapon::ElectroRefire::Text" - } -} diff --git a/scmenu/options/weapon2.menu b/scmenu/options/weapon2.menu deleted file mode 100644 index 847fba046..000000000 --- a/scmenu/options/weapon2.menu +++ /dev/null @@ -1,139 +0,0 @@ -// Property of Alientrap/AK -// options/weapon2.menu -Item Layout Weapon2 -{ - direction [Nex_DefaultVertDirection] - size '600 600' - origin '300 50' - alignment [AlignFirst] - - DeriveTemplate Nex_Composition Nex_Option_EditBox - { - DeriveTemplate Nex_Automation_Option_EditBox Automation - {} - DeriveTemplate TextButton Description - {} - DeriveTemplate EditBox EditBox - { - size '260 12' - action Nex_Action_TestOnChange - select Nex_Action_TestOnSelect - } - } - - Derive Nex_Option_EditBox electrospeed - { - text "Electro Speed" - target "Data::Weapon::ElectroSpeed::Text" - } - Derive Nex_Option_EditBox electroballspeed - { - text "Electroball Speed" - target "Data::Weapon::ElectroBallSpeed::Text" - } - Derive Nex_Option_EditBox electroballspeedup - { - text "Electroball Speed up" - target "Data::Weapon::ElectroBallSpeedUp::Text" - } - Derive Nex_Option_EditBox crylinkdamage - { - text "CryLink Damage" - target "Data::Weapon::CryLinkDamage::Text" - } - Derive Nex_Option_EditBox crylinkedgedamage - { - text "CryLink Edgedamage" - target "Data::Weapon::CryLinkEdgeDamage::Text" - } - Derive Nex_Option_EditBox crylinkforce - { - text "CryLink Force" - target "Data::Weapon::CryLinkForce::Text" - } - Derive Nex_Option_EditBox crylinkradius - { - text "CryLink Radius" - target "Data::Weapon::CryLinkRadius::Text" - } - Derive Nex_Option_EditBox crylinkspeed - { - text "CryLink Speed" - target "Data::Weapon::CryLinkSpeed::Text" - } - Derive Nex_Option_EditBox crylinkspread - { - text "CryLink Spread" - target "Data::Weapon::CryLinkSpread::Text" - } - Derive Nex_Option_EditBox crylinkrefire - { - text "CryLink Refire" - target "Data::Weapon::CryLinkRefire::Text" - } - Derive Nex_Option_EditBox nexdamage - { - text "Nex Damage" - target "Data::Weapon::NexDamage::Text" - } - Derive Nex_Option_EditBox hagardamage - { - text "Hagar Damage" - target "Data::Weapon::HagarDamage::Text" - } - Derive Nex_Option_EditBox hagaredgedamage - { - text "Hagar Edge Damage" - target "Data::Weapon::HagarEdgeDamage::Text" - } - Derive Nex_Option_EditBox hagarforce - { - text "Hagar Force" - target "Data::Weapon::HagarForce::Text" - } - Derive Nex_Option_EditBox hagarradius - { - text "Hagar Radius" - target "Data::Weapon::HagarRadius::Text" - } - Derive Nex_Option_EditBox hagarspeed - { - text "Hagar Speed" - target "Data::Weapon::HagarSpeed::Text" - } - Derive Nex_Option_EditBox hagarspeed2 - { - text "Hagar Speed2" - target "Data::Weapon::HagarSpeed2::Text" - } - Derive Nex_Option_EditBox hagarspeed2up - { - text "Hagar Speed2 up" - target "Data::Weapon::HagarSpeed2Up::Text" - } - Derive Nex_Option_EditBox rocketlauncherdamage - { - text "Rocket Launcher Damage" - target "Data::Weapon::RocketLauncherDamage::Text" - } - Derive Nex_Option_EditBox rocketlauncheredgedamage - { - text "RL Edge Damage" - target "Data::Weapon::RocketLauncherEdgeDamage::Text" - } - Derive Nex_Option_EditBox rocketlauncherforce - { - text "Rocket Launcher Force" - target "Data::Weapon::RocketLauncherForce::Text" - } - Derive Nex_Option_EditBox rocketlauncherradius - { - text "Rocket Launcher Radius" - target "Data::Weapon::RocketLauncherRadius::Text" - } - Derive Nex_Option_EditBox rocketlauncherspeed - { - text "Rocket Launcher Speed" - target "Data::Weapon::RocketLauncherSpeed::Text" - } -} diff --git a/scmenu/source/control/window/arrangement.qc b/scmenu/source/control/window/arrangement.qc index 3143ce510..5d75b7c5b 100644 --- a/scmenu/source/control/window/arrangement.qc +++ b/scmenu/source/control/window/arrangement.qc @@ -42,7 +42,7 @@ void() Item_Arrangement_Update = if( self.direction_x ) { if( self.alignment == ITEM_ALIGN_LEFT ) self.origin_y = 0; - else if( self.alignment == ITEM_ALIGN_CENTER ) + else if( self.alignment == ITEM_ALIGN_CENTER || self.alignment == ITEM_ALIGN_FIRST ) self.origin_y = self.size_y / 2; else self.origin_y = self.size_y; @@ -51,7 +51,7 @@ void() Item_Arrangement_Update = if( self.direction_y ) { if( self.alignment == ITEM_ALIGN_LEFT ) self.origin_x = 0; - else if( self.alignment == ITEM_ALIGN_CENTER ) + else if( self.alignment == ITEM_ALIGN_CENTER || self.alignment == ITEM_ALIGN_FIRST ) self.origin_x = self.size_x / 2; else self.origin_x = self.size_x; -- 2.39.2