HedgeEditor: Make toggle help and toggle gear info work everywhere
authorWuzzy <almikes@aol.com>
Wed, 20 Apr 2016 18:54:31 +0200
changeset 12037 7339122bad35
parent 12036 0b0578c25470
child 12038 cbd9c1d41e06
HedgeEditor: Make toggle help and toggle gear info work everywhere
share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua	Wed Apr 20 18:42:40 2016 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua	Wed Apr 20 18:54:31 2016 +0200
@@ -2845,6 +2845,7 @@
 
 	if helpDisabled == true then
 		HideMission()
+		hedgeEditorMissionPanelShown = false
 	end
 
 end
@@ -3182,23 +3183,19 @@
 			AddCaption(loc("The editor weapons and tools have been added!"))
 		end
 	elseif (preciseOn == true) and (s == 1) then
-		if (GetCurAmmoType() == amGirder) or  (GetCurAmmoType() == amRubber) or  (GetCurAmmoType() == amAirAttack) then
-			helpDisabled = not(helpDisabled)
-			if helpDisabled then
-				AddCaption(loc("Help Disabled"),0xffba00ff,capgrpVolume)
-			else
-				AddCaption(loc("Help Enabled"),0xffba00ff,capgrpVolume)
-			end
-			updateHelp()
+		helpDisabled = not(helpDisabled)
+		if helpDisabled then
+			AddCaption(loc("Help Disabled"),0xffba00ff,capgrpVolume)
+		else
+			AddCaption(loc("Help Enabled"),0xffba00ff,capgrpVolume)
 		end
+		updateHelp()
 	elseif (preciseOn == true) and (s == 3) then
-		if (GetCurAmmoType() == amGirder) or  (GetCurAmmoType() == amRubber) or  (GetCurAmmoType() == amAirAttack) then
-			showGearTags = not(showGearTags)
-			if showGearTags then
-				AddCaption(loc("Gear information shown"),0xffba00ff,capgrpVolume)
-			else
-				AddCaption(loc("Gear information hidden"),0xffba00ff,capgrpVolume)
-			end
+		showGearTags = not(showGearTags)
+		if showGearTags then
+			AddCaption(loc("Gear information shown"),0xffba00ff,capgrpVolume)
+		else
+			AddCaption(loc("Gear information hidden"),0xffba00ff,capgrpVolume)
 		end
 
 	elseif (cat[cIndex] == loc("Sprite Placement Mode")) or (cat[cIndex] == loc("Girder Placement Mode")) or (cat[cIndex] == loc("Rubber Placement Mode")) or (cat[cIndex] == loc("Sprite Modification Mode")) then
@@ -3442,10 +3439,10 @@
 		loc("Place Girder: Girder") .. "|" ..
 		loc("Place Rubber: Rubber") .. "|" ..
 		loc("Place Gears (and more): Air Attack") .. "|" ..
-		loc("Change Selection: [Up], [Down], [Left], [Right]") .. "|" ..
-		loc("Toggle Help: [Precise]+[1] (While a tool is selected)") .. "|" ..
+		loc("Toggle Help: [Precise]+[1]") .. "|" ..
+		loc("Toggle Gear Information: [Precise]+[3]") .. "|" ..
 		" " .. "|" ..
-		loc("COMMANDS: (Use while no weapon is selected)") .. "|" ..
+		loc("Editing Commands: (Use while no weapon is selected)") .. "|" ..
 		loc("Save Level: [Precise]+[4]") .. "|" ..
 		loc("Toggle Editing Weapons and Tools: [Precise]+[2]")
 		, 4, 5000