# HG changeset patch # User nemo # Date 1424192967 18000 # Node ID f3e903ace2d3f236b865fde9632a4b4af19eb019 # Parent 158b5dd6b3c947a4675df98fbc2703110941196c Make hedgewars frontend not change scheme/weps to Default if script cfg doesn't match a known scheme. That is, will leave on whatever is selected. Also set a bunch of schemes where we don't care what the scheme/weps are to * diff -r 158b5dd6b3c9 -r f3e903ace2d3 QTfrontend/ui/widget/gamecfgwidget.cpp --- a/QTfrontend/ui/widget/gamecfgwidget.cpp Tue Feb 17 10:04:32 2015 -0500 +++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Tue Feb 17 12:09:27 2015 -0500 @@ -528,8 +528,8 @@ int num = GameSchemes->findText(pMapContainer->getCurrentScheme()); if (num != -1) GameSchemes->setCurrentIndex(num); - else - GameSchemes->setCurrentIndex(GameSchemes->findText("Default")); + //else + // GameSchemes->setCurrentIndex(GameSchemes->findText("Default")); } if (pMapContainer->getCurrentWeapons() == "locked") @@ -543,8 +543,8 @@ int num = WeaponsName->findText(pMapContainer->getCurrentWeapons()); if (num != -1) WeaponsName->setCurrentIndex(num); - else - WeaponsName->setCurrentIndex(WeaponsName->findText("Default")); + //else + // WeaponsName->setCurrentIndex(WeaponsName->findText("Default")); } if (pMapContainer->getCurrentScheme() != "locked" && pMapContainer->getCurrentWeapons() != "locked") @@ -629,8 +629,8 @@ int num = GameSchemes->findText(scheme); if (num != -1) GameSchemes->setCurrentIndex(num); - else - GameSchemes->setCurrentIndex(GameSchemes->findText("Default")); + //else + // GameSchemes->setCurrentIndex(GameSchemes->findText("Default")); } if (weapons == "locked") @@ -644,8 +644,8 @@ int num = WeaponsName->findText(weapons); if (num != -1) WeaponsName->setCurrentIndex(num); - else - WeaponsName->setCurrentIndex(WeaponsName->findText("Default")); + //else + // WeaponsName->setCurrentIndex(WeaponsName->findText("Default")); } if (scheme != "locked" && weapons != "locked") diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default +* locked diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/DiagonalMaze.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/DiagonalMaze.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/DiagonalMaze.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Gravity.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Gravity.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Gravity.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Highlander.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default +* Highlander diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default +* locked diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/ShoppaMap.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/ShoppaMap.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/ShoppaMap.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +locked diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Tumbler.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +* diff -r 158b5dd6b3c9 -r f3e903ace2d3 share/hedgewars/Data/Scripts/Multiplayer/Tunnels.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/Tunnels.cfg Tue Feb 17 10:04:32 2015 -0500 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Tunnels.cfg Tue Feb 17 12:09:27 2015 -0500 @@ -1,2 +1,2 @@ -Default -Default +* +*