1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 6965 from branches/ja2_source_official_2014:

Browse Source 
- [CTRL] + [i] in tactical calls a dialogue for sector inventory manipulations (by Sevenfm)
- [CTRL] + [c] in tactical calls a dialogue for cover/trap display modes (by Sevenfm)
- changed min value for SCOPE_RANGE_MULTIPLIER from 0.5 to 0.1 (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-22 19:32:13 +00:00
parent 71d85d8bb5
commit 916bf88b9d
14 changed files with 1015 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+7
View File
@@ -2670,6 +2670,13 @@ enum
extern STR16 szCampaignHistoryWebpageString[];
extern STR16 szTacticalInventoryDialogString[];
extern STR16 szTacticalCoverDialogString[];
extern STR16 szTacticalCoverDialogPrintString[];
#define TACTICAL_INVENTORY_DIALOG_NUM 16
#define TACTICAL_COVER_DIALOG_NUM 16
// Enumeration support
typedef struct Str8EnumLookupType {
int value;
Utils/_ChineseText.cpp
+74
View File
@@ -8433,6 +8433,80 @@ STR16 szCampaignHistoryWebpageString[]=
L"天",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
// WANNE: Some Chinese specific strings that needs to be in unicode!
STR16 ChineseSpecString1 = L"%％"; //defined in _ChineseText.cpp as this file is already unicode
STR16 ChineseSpecString2 = L"*%3d%％%%"; //defined in _ChineseText.cpp as this file is already unicode
Utils/_DutchText.cpp
+74
View File
@@ -8447,4 +8447,78 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //DUTCH
Utils/_EnglishText.cpp
+75
View File
@@ -8431,4 +8431,79 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //ENGLISH
Utils/_FrenchText.cpp
+74
View File
@@ -8429,4 +8429,78 @@ STR16 szCampaignHistoryWebpageString[]=
L"Jour",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //FRENCH
Utils/_GermanText.cpp
+74
View File
@@ -8257,4 +8257,78 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //GERMAN
Utils/_ItalianText.cpp
+74
View File
@@ -8439,4 +8439,78 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //ITALIAN
Utils/_PolishText.cpp
+75
View File
@@ -8457,4 +8457,79 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //POLISH
Utils/_RussianText.cpp
+75
View File
@@ -8435,4 +8435,79 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //RUSSIAN
Utils/_TaiwaneseText.cpp
+75
View File
@@ -8447,4 +8447,79 @@ STR16 szCampaignHistoryWebpageString[]=
L"Day",
};
STR16 szTacticalInventoryDialogString[]=
{
L"Inventory Manipulations",
L"NVG",
L"Reload All",
L"",
L"",
L"Sort",
L"Merge",
L"Separate",
L"Organize",
L"Crates",
L"Boxes",
L"Drop B/P",
L"Pickup B/P",
L"",
L"",
L"",
L"",
};
STR16 szTacticalCoverDialogString[]=
{
L"Cover Display Mode",
L"Off",
L"Enemy",
L"Merc",
L"",
L"",
L"",
L"",
L"",
L"Traps",
L"Network",
L"Detector",
L"",
L"Net A",
L"Net B",
L"Net C",
L"Net D",
};
STR16 szTacticalCoverDialogPrintString[]=
{
L"Turning off cover/traps display",
L"Showing danger zones",
L"Showing merc view",
L"",
L"",
L"",
L"",
L"",
L"Display trap network",
L"Display trap network colouring",
L"Display nearby traps",
L"",
L"Display trap network A",
L"Display trap network B",
L"Display trap network C",
L"Display trap network D",
};
#endif //TAIWANESE