From 9607922a078b6e4b91f0a033250f1c8b8531c0c3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 20 Nov 2013 07:13:11 +0000 Subject: [PATCH] Map Editor (by Buggler & Kriplo) - Added tile index no info to editor selection window git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6633 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Editor/selectwin.cpp | 6 ++++-- Utils/_ChineseText.cpp | 6 +++--- Utils/_DutchText.cpp | 6 +++--- Utils/_EnglishText.cpp | 6 +++--- Utils/_FrenchText.cpp | 6 +++--- Utils/_GermanText.cpp | 6 +++--- Utils/_ItalianText.cpp | 6 +++--- Utils/_PolishText.cpp | 6 +++--- Utils/_RussianText.cpp | 6 +++--- Utils/_TaiwaneseText.cpp | 6 +++--- 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Editor/selectwin.cpp b/Editor/selectwin.cpp index d29f540ec..eae53855b 100644 --- a/Editor/selectwin.cpp +++ b/Editor/selectwin.cpp @@ -1071,16 +1071,18 @@ void DisplaySelectionWindowGraphicalInformation() mprintf( 2, 2, pDisplaySelectionWindowGraphicalInformationText[0], gTilesets[0].TileSurfaceFilenames[ pNode->uiObjIndx ], pNode->uiIndex, gTilesets[0].zName, + gTileTypeStartIndex[pNode->uiObjIndx]+pNode->uiIndex, gTileSurfaceName[ pNode->uiObjIndx ] ); } else { mprintf( 2, 2, pDisplaySelectionWindowGraphicalInformationText[1], gTilesets[ giCurrentTilesetID ].TileSurfaceFilenames[ pNode->uiObjIndx ], - pNode->uiIndex, gTileSurfaceName[ pNode->uiObjIndx ] ); + pNode->uiIndex, gTileTypeStartIndex[pNode->uiObjIndx]+pNode->uiIndex, + gTileSurfaceName[ pNode->uiObjIndx ] ); } } - mprintf( 350, 2, pDisplaySelectionWindowGraphicalInformationText[2], gTilesets[ giCurrentTilesetID ].zName ); + mprintf( 390, 2, pDisplaySelectionWindowGraphicalInformationText[2], gTilesets[ giCurrentTilesetID ].zName ); } //---------------------------------------------------------------------------------------------- diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 84605e3cd..2645e8aa7 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -1492,9 +1492,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d]来自默认区块%s(%S)", //L"%S[%d] is from default tileset %s (%S)", - L"文件：%S，副版本：%d(%S)", //L"File: %S, subindex: %d (%S)", - L"当前分区：%s", //L"Current Tileset: %s", + L"%S[%d]来自默认区块%s(%d，%S)", //L"%S[%d] from default tileset %s (%d, %S)", + L"文件：%S，副版本：%d(%d，%S)", //L"File: %S, subindex: %d (%d, %S)", + L"当前分区： %s", //L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 9767b7181..405f57f4c 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -1494,9 +1494,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index f42e592d1..a0ac2b88a 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -1492,9 +1492,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index f1c91dcf2..3485c2459 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -1497,9 +1497,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] appartient à tileset def %s (%S)", - L"Fichier : %S, sousindex: %d (%S)", - L"Tileset utilisé: %s", + L"%S[%d] appartient à tileset def %s (%d, %S)", + L"Fichier : %S, sousindex: %d (%d, %S)", + L"Tileset : %s", }; //Cursor Modes.cpp diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index a678568c9..ae3597247 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -1515,9 +1515,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 45deacae7..4aa8417cf 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -1492,9 +1492,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 251eff176..6222d4c35 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -1500,9 +1500,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] pochodzi z domyŚlnego zestawu %s (%S)", - L"Plik: %S, podindeks: %d (%S)", - L"Aktualny zestaw: %s", + L"%S[%d] z domyŚlnego zestawu %s (%d, %S)", + L"Plik: %S, podindeks: %d (%d, %S)", + L"Zestaw: %s", }; //Cursor Modes.cpp diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 9936866e3..27a4cee6e 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -1493,9 +1493,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 769ffa865..77e36cbe7 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -1492,9 +1492,9 @@ STR16 pApologizeOverrideAndForceUpdateEverythingText[] = //selectwin.cpp STR16 pDisplaySelectionWindowGraphicalInformationText[] = { - L"%S[%d] is from default tileset %s (%S)", - L"File: %S, subindex: %d (%S)", - L"Current Tileset: %s", + L"%S[%d] from default tileset %s (%d, %S)", + L"File: %S, subindex: %d (%d, %S)", + L"Tileset: %s", }; //Cursor Modes.cpp