Merged from revision: 6824

Map Editor Fixes/Improvements (by Buggler)
- Better UI feedback after last item deleted from item stack in editor item mode
- Improved editor room number increment code. 'Shift + LMB' when drawing room numbers will reuse same room number on next input
- externalized hardcoded button tooltip text in editor tile selection window 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-26 08:15:40 +00:00
parent 405b073416
commit d4aa35a66e
16 changed files with 127 additions and 34 deletions
+10 -2
View File
@@ -619,7 +619,7 @@ STR16 iEditorBuildingsToolbarText[] =
L"Add/replace building's roof with new flat roof.",
L"Copy a building",
L"Move a building",
L"Draw room number",
L"Draw room number\n(Hold |S|h|i|f|t to reuse room number)",
L"Erase room numbers",
L"Toggle |Erase mode",
@@ -706,7 +706,7 @@ STR16 iEditorTaskbarInternalText[]=
L"Options",
L"|./|,: Cycle 'width: xx' dimensions\n|P|g |U|p/|P|g |D|n: Previous/Next tile for selected object(s)/in smart method", //Terrain fasthelp text
L"|./|,: Cycle 'width: xx' dimensions\n|P|g |U|p/|P|g |D|n: Previous/Next tile for selected object(s)/in smart method", //Buildings fasthelp text
L"|C|t|r|l+|/: Place new item under mouse cursor\n|/: Place same item under mouse cursor", //Items fasthelp text
L"|S|p|a|c|e: Select next item\n \n|C|t|r|l+|/: Place new item under mouse cursor\n|/: Place same item under mouse cursor", //Items fasthelp text
L"|1-|9: Set waypoints\n|C|t|r|l+|C/|C|t|r|l+|V: Copy/Paste merc", //Mercs fasthelp text
L"|C|t|r|l+|G: Go to grid no\n \n|I: Toggle overhead map\n|J: Toggle draw high ground\n|K: Toggle high ground markers\n|S|h|i|f|t+|L: Toggle map edge points\n|S|h|i|f|t+|T: Toggle treetops\n|U: Toggle world raise\n \n|./|,: Cycle 'width: xx' dimensions", //Map Info fasthelp text
L"|C|t|r|l+|N: Create new map\n \n|F|5: Show Summary Info/Country Map\n|F|1|0: Remove all lights\n|F|1|1: Reverse schedules\n|F|1|2: Clear schedules\n \n|S|h|i|f|t+|R: Toggle random placement based on quantity of selected object(s)", //Options fasthelp text
@@ -1497,6 +1497,14 @@ STR16 pDisplaySelectionWindowGraphicalInformationText[] =
L"Tileset: %s",
};
STR16 pDisplaySelectionWindowButtonText[] =
{
L"Accept selections (|E|n|t|e|r)",
L"Cancel selections (|E|s|c)\nClear selections (|S|p|a|c|e)",
L"Scroll window up (|U|p)",
L"Scroll window down (|D|o|w|n)",
};
//Cursor Modes.cpp
STR16 wszSelType[6] = {
L"Small",