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

Editor/Editor Modes.cpp

@@ -113,6 +113,7 @@ void SetEditorBuildingTaskbarMode( UINT16 usNewMode )
 	UnclickEditorButton( BUILDING_COPY_BUILDING );
 	UnclickEditorButton( BUILDING_MOVE_BUILDING );
 	UnclickEditorButton( BUILDING_DRAW_ROOMNUM );
+	UnclickEditorButton( BUILDING_ERASE_ROOMNUM );
 	ClickEditorButton( usNewMode );
 
 	gfRenderDrawingMode = TRUE;

Editor/EditorItems.cpp

@@ -1169,8 +1169,16 @@ void DeleteSelectedItem()
 						gpCurrItemPoolNode = pIPHead;
 					if( gpCurrItemPoolNode )
 					{
+						//get the item pool at this node's gridno.
 						GetItemPoolFromGround( gpCurrItemPoolNode->sGridNo, &gpItemPool );
 						Assert( gpItemPool );
+
+						MarkMapIndexDirty( gpItemPool->sGridNo );
+						SpecifyItemToEdit( &gWorldItems[ gpItemPool->iItemIndex ].object, gpItemPool->sGridNo );
+						if( gsItemGridNo != -1 )
+						{
+							CenterScreenAtMapIndex( gsItemGridNo );
+						}
 					}
 					//remove node
 					HideItemCursor( sGridNo );

Editor/Item Statistics.cpp

@@ -398,7 +398,7 @@ void ExecuteItemStatsCmd( /*UINT8*/ UINT16  ubAction )
 		case ITEMSTATS_DEFAULT:
 			break;
 		case ITEMSTATS_DELETE:
-			if ( gbEditingMode != EDITING_NOTHING )
+			if( gbEditingMode != EDITING_NOTHING )
 				DeleteSelectedItem();
 			break;
 		case ITEMSTATS_SHOW:

Editor/editscreen.cpp

@@ -4375,8 +4375,18 @@ void ProcessAreaSelection( BOOLEAN fWithLeftButton )
 			DrawObjectsBasedOnSelectionRegion();
 			if( gusCurrRoomNumber > 0 )
 			{
-				gusCurrRoomNumber++;
+				if( gusCurrRoomNumber == gusMaxRoomNumber )
-				gusMaxRoomNumber++;
+					gusMaxRoomNumber++;
+				
+				//retain existing room number
+				if ( _KeyDown( SHIFT ) )
+				{
+					//Do nothing
+				}
+				else
+				{	
+					gusCurrRoomNumber = gusMaxRoomNumber;
+				}
 				if( iCurrentTaskbar == TASK_BUILDINGS && TextInputMode() )
 				{
 					CHAR16 str[4];

Editor/selectwin.cpp

@@ -194,33 +194,33 @@ void CreateJA2SelectionWindow( INT16 sWhat )
 	iSelectWin = CreateHotSpot(0, 0, 600, 360, MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, SelWinClkCallback);
 
-	iCancelWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_CANCEL_ICON], 0,
-														BUTTON_USE_DEFAULT, 600, 40,
-														40, 40, BUTTON_TOGGLE,
- 														MSYS_PRIORITY_HIGH,
-														DEFAULT_MOVE_CALLBACK, CnclClkCallback);
-	SetButtonFastHelpText(iCancelWin,L"Cancel selections");
-
 	iOkWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_OK_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 0,
 														40, 40, BUTTON_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, OkClkCallback);
-	SetButtonFastHelpText(iOkWin,L"Accept selections");
+	SetButtonFastHelpText(iOkWin,pDisplaySelectionWindowButtonText[0]);
+
+	iCancelWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_CANCEL_ICON], 0,
+														BUTTON_USE_DEFAULT, 600, 40,
+														40, 40, BUTTON_TOGGLE,
+ 														MSYS_PRIORITY_HIGH,
+														DEFAULT_MOVE_CALLBACK, CnclClkCallback);
+	SetButtonFastHelpText(iCancelWin,pDisplaySelectionWindowButtonText[1]);
 
 	iScrollUp = CreateIconButton((INT16)iButtonIcons[SEL_WIN_UP_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 80,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, UpClkCallback);
-	SetButtonFastHelpText(iScrollUp,L"Scroll window up");
+	SetButtonFastHelpText(iScrollUp,pDisplaySelectionWindowButtonText[2]);
 
 	iScrollDown = CreateIconButton((INT16)iButtonIcons[SEL_WIN_DOWN_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 240,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, DwnClkCallback);
-	SetButtonFastHelpText(iScrollDown,L"Scroll window down");
+	SetButtonFastHelpText(iScrollDown,pDisplaySelectionWindowButtonText[3]);
 
 	fButtonsPresent = TRUE;
 

GameVersion.cpp

@@ -15,9 +15,9 @@
 #ifdef JA2EDITOR
 	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.6670 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.6823 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.6670 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.6823 (Development Build)" }; 
 	#endif
 
 // ------------------------------

Utils/Text.h

@@ -133,6 +133,7 @@ extern STR16 pSummaryUpdateCallbackText[];
 extern STR16 pApologizeOverrideAndForceUpdateEverythingText[];
 //selectwin.cpp
 extern STR16 pDisplaySelectionWindowGraphicalInformationText[];
+extern STR16 pDisplaySelectionWindowButtonText[];
 //Cursor Modes.cpp
 extern STR16 wszSelType[6];
 //--

Utils/_ChineseText.cpp

@@ -619,7 +619,7 @@ STR16 iEditorBuildingsToolbarText[] =
 	L"添加平屋顶或替换已有屋顶", //L"Add/replace building's roof with new flat roof.",
 	L"复制建筑", //L"Copy a building",
 	L"移动建筑", //L"Move a building",
-	L"房间编号", //L"Draw room number",
+	L"房间编号", //L"Draw room number\n(Hold |S|h|i|f|t to reuse room number)",	// TODO.Translate
 	L"清除房间编号", //L"Erase room numbers",
 
 	L"切换擦除模式(|E)", //L"Toggle |Erase mode",
@@ -706,7 +706,7 @@ STR16 iEditorTaskbarInternalText[]=
 	L"选项", //L"Options",
 	L"\n|./|,:切换width:xx选项大小\n \n|P|g|U|p/|P|g|D|n:智能模式选择前/后一个模板", //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",
 	L"\n|./|,:切换width:xx选项大小\n \n|P|g|U|p/|P|g|D|n:智能模式选择前/后一个模板", //Buildings 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",
-	L"|C|t|r|l+|/:光标处放置新物品\n|/:光标下放置同样物品", //Items fasthelp text //L"|C|t|r|l+|/: Place new item under mouse cursor\n|/: Place same item under mouse cursor",
+	L"|C|t|r|l+|/:光标处放置新物品\n|/:光标下放置同样物品", //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",
 	L"|1-|9:设置路标 \n|C|t|r|l+|C/|C|t|r|l+|V:复制/粘贴佣兵", //Mercs fasthelp text //L"|1-|9: Set waypoints\n|C|t|r|l+|C/|C|t|r|l+|V: Copy/Paste merc",
 	L"|C|t|r|l+|G:转到某格\n \n|I:查看小地图\n|J:切换房顶绘制\n|K:显示房顶标记\n|S|h|i|f|t+|L:显示地图边界\n|S|h|i|f|t+|T:显示树顶\n|U:切换地图高度\n \n|./|,:切换width:xx选项大小", //Map Info 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",
 	L"|C|t|r|l+|N:创造新地图\n \n|F|5:显示总信息/大地图\n|F|1|0:移除所有光源\n|F|1|1:取消修改\n|F|1|2:清空所有\n \n|S|h|i|f|t+|R:随机放置选定数量的物品", //Options 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)",
@@ -1496,6 +1496,14 @@ STR16 pDisplaySelectionWindowGraphicalInformationText[] =
 	L"文件：%S，副版本：%d(%d，%S)", //L"File: %S, subindex: %d (%d, %S)",
 	L"当前分区： %s", //L"Tileset:  %s",
 };
+// TODO.Translate
+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] = {

Utils/_DutchText.cpp

@@ -620,7 +620,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",
@@ -707,7 +707,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
@@ -1499,6 +1499,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", 

Utils/_EnglishText.cpp

@@ -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", 

Utils/_FrenchText.cpp

@@ -623,7 +623,7 @@ STR16 iEditorBuildingsToolbarText[] =
 	L"Ajouter/remplacer le toit de la construction par un nouveau toit plat.",
 	L"Copier une construction",
 	L"Bouger une construction",
-	L"Dessiner le numéro de pièce",
+	L"Dessiner le numéro de pièce\n(Hold |S|h|i|f|t to reuse room number)",	// TODO.Translate
 	L"Supprimer le numéro de pièce",
 
 	L"Activer le mode supprimer (|E)",
@@ -710,7 +710,7 @@ STR16 iEditorTaskbarInternalText[]=
 	L"Options",
 	L"|./|, : Cycle entre les dimensions 'largeur : xx'\n|P|g |U|p/|P|g |D|n : case précédente/suivante pour l(es)'objet(s) sélectionné(s)/en méthode intelligente", //Terrain fasthelp text
 	L"|./|, : Cycle entre les dimensions 'largeur : xx'\n|P|g |U|p/|P|g |D|n : case précédente/suivante pour l(es)'objet(s) sélectionné(s)/en méthode intelligente", //Buildings fasthelp text
-	L"", //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	// TODO.Translate
 	L"|1-|9 : Pose de waypoints\n|C|t|r|l+|C/|C|t|r|l+|V : Copie/colle mercenaire", //Mercs fasthelp text
 	L"|C|t|r|l+|G : Va à la case\n \n|I : (dés)active la carte vue de dessus\n|J : (dés)active l'affichage des terrains élevés\n|K : (dés)active les marqueurs de terrain élevé\n|M|A|J+|L : (dés)active les points d'angle de la carte\n|M|A|J+|T : (dés)active les feuillages\n|U : (dés)active la montée du monde\n \n|./|, : Cycle entre les dimensions 'largeur : xx'", //Map Info fasthelp text
 	L"|C|t|r|l+|N : Crée une nouvelle carte\n \n|F|5 : Montre le résumé des informations/Carte du monde\n|F|1|0 : Retire toutes les lumières\n|F|1|1 : recule les horaires\n|F|1|2 : Efface les horaires\n \n|M|A|J+|R : (dés)active les placements aléatoires basés sur la quantité du/des objet(s) sélectionné(s).", //Options fasthelp text
@@ -1500,6 +1500,14 @@ STR16 pDisplaySelectionWindowGraphicalInformationText[] =
 	L"Fichier :  %S, sousindex :  %d (%S)",
 	L"Tileset utilisé :  %s",
 };
+// TODO.Translate
+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] = {
@@ -5096,7 +5104,8 @@ STR16			AimAlumniText[] =
 	L"Anciens",	// Title of the page
 
 	L"OK",			// Stops displaying information on selected merc
-	L"Page suiv.",
+	L"Page suiv.",
+
 };
 
 

Utils/_GermanText.cpp

@@ -642,7 +642,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",
@@ -729,7 +729,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
@@ -1520,6 +1520,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", 

Utils/_ItalianText.cpp

@@ -618,7 +618,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",
@@ -705,7 +705,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", 

Utils/_PolishText.cpp

@@ -626,7 +626,7 @@ STR16 iEditorBuildingsToolbarText[] =
 	L"Dodaj/zastąp dach budynku nowym płaskim dachem.",
 	L"kopiuj budynek",
 	L"Przesuń budynek",
-	L"Rysuj numer pomieszczenia",
+	L"Rysuj numer pomieszczenia\n(Hold |S|h|i|f|t to reuse room number)",	// TODO.Translate
 	L"Usuń numer pomieszczenia",
 
 	L"Przełącz tryb wymazywania (|E)",
@@ -713,7 +713,7 @@ STR16 iEditorTaskbarInternalText[]=
 	L"Opcje",
 	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 // TODO.Translate
 	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 // TODO.Translate
-	L"|C|t|r|l+|/: Place new item under mouse cursor\n|/: Place same item under mouse cursor", //Items fasthelp text // TODO.Translate
+	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 // TODO.Translate
 	L"|1-|9: Set waypoints\n|C|t|r|l+|C/|C|t|r|l+|V: Copy/Paste merc", //Mercs fasthelp text // TODO.Translate
 	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 // TODO.Translate
 	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 // TODO.Translate
@@ -1504,6 +1504,14 @@ STR16 pDisplaySelectionWindowGraphicalInformationText[] =
 	L"Plik: %S, podindeks: %d (%d, %S)",
 	L"Zestaw:  %s",
 };
+// TODO.Translate
+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] = {

Utils/_RussianText.cpp

@@ -620,7 +620,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",
@@ -707,7 +707,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
@@ -1498,6 +1498,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", 

Utils/_TaiwaneseText.cpp

@@ -618,7 +618,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",
@@ -705,7 +705,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",