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

Merged from revision: 7359

Browse Source 
Fixes (by Buggler)
- new error message when launching game in fullscreen beyond desktop resolution
- fixed cycling previous item hotkey in cheat mode
- refactored main menu button and hotkey code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-07-22 16:40:02 +00:00
parent 9f5aa4c227
commit a79be62f21
13 changed files with 129 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+6
View File
@@ -2527,6 +2527,12 @@ extern STR16 gszMPMapscreenText[];
enum
{
ADDTEXT_16BPP_REQUIRED,
ADDTEXT_LOWERRES_REQUIRED,
ERROR_MAX_MERCSVEHICLES,
ERROR_MAX_ENEMIES,
ERROR_MAX_CREATURES,
ERROR_MAX_MILITIA,
ERROR_MAX_CIVILIANS,
};
extern STR16 Additional113Text[];
extern STR16 ranks[];
Utils/_ChineseText.cpp
+1 -1
View File
@@ -7273,9 +7273,9 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 窗口模式需要一个16bpp或更少的颜色深度。",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// WANNE: Savegame slots validation against INI file
L"存盘文件内部读取错误：存盘文件的“%s”数量跟 Ja2_Options.ini 设置的（$d）不一致。", //L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"佣兵 (MAX_NUMBER_PLAYER_MERCS) / 交通工具 (MAX_NUMBER_PLAYER_VEHICLES)",
L"敌人 (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"动物 (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_DutchText.cpp
+1 -1
View File
@@ -7285,10 +7285,10 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 windowed modus vereist een kleurdiepte van 16 bits per pixel.",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// TODO.Translate
// WANNE: Savegame slots validation against INI file
L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"Mercenary (MAX_NUMBER_PLAYER_MERCS) / Vehicle (MAX_NUMBER_PLAYER_VEHICLES)",
L"Enemy (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Creature (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_EnglishText.cpp
+1 -1
View File
@@ -7273,9 +7273,9 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.",
// WANNE: Savegame slots validation against INI file
L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"Mercenary (MAX_NUMBER_PLAYER_MERCS) / Vehicle (MAX_NUMBER_PLAYER_VEHICLES)",
L"Enemy (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Creature (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_FrenchText.cpp
+1 -1
View File
@@ -7280,9 +7280,9 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 mode fenêtré exige une profondeur de couleur de 16 bit ou moins.",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// WANNE: Savegame slots validation against INI file
L"Erreur interne en lisant %s emplacements depuis la sauvegarde : Le nombre d'emplacements dans la sauvegarde (%d) diffère des emplacements définis dans les paramètres de ja2_options.ini (%d)",
L"Mercenaires (MAX_NUMBER_PLAYER_MERCS) / Véhicule (MAX_NUMBER_PLAYER_VEHICLES)",
L"Ennemis (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Créatures (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_GermanText.cpp
+1 -1
View File
@@ -7106,9 +7106,9 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Für die korrekte Arbeit im Fenster-Modus benötigt Jagged Alliance 2 v1.13 16-bit Farbmodus.", //Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// WANNE: Savegame slots validation against INI file
L"Interner Fehler beim Auslesen der %s Slots des zu ladenden Spielstandes: Die Anzahl der Slots im Spielstand (%d) unterscheidet sich mit den definierten Slots in der Datei ja2_options.ini (%d)",
L"Söldner (MAX_NUMBER_PLAYER_MERCS) / Fahrzeuge (MAX_NUMBER_PLAYER_VEHICLES)",
L"Gegner (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Monster (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_ItalianText.cpp
+1 -1
View File
@@ -7277,10 +7277,10 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 modalità finestra richiede una profondità di colore di 16bpp o meno.",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// TODO.Translate
// WANNE: Savegame slots validation against INI file
L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"Mercenary (MAX_NUMBER_PLAYER_MERCS) / Vehicle (MAX_NUMBER_PLAYER_VEHICLES)",
L"Enemy (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Creature (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_PolishText.cpp
+1 -1
View File
@@ -7292,10 +7292,10 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Jagged Alliance 2 v1.13 trybie okienkowym wymaga głębi koloru 16-bitowego lub mniej.",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// TODO.Translate
// WANNE: Savegame slots validation against INI file
L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"Mercenary (MAX_NUMBER_PLAYER_MERCS) / Vehicle (MAX_NUMBER_PLAYER_VEHICLES)",
L"Enemy (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Creature (MAX_NUMBER_CREATURES_IN_TACTICAL)",
Utils/_RussianText.cpp
+1 -1
View File
@@ -7276,9 +7276,9 @@ STR16 gzFacilityAssignmentStrings[]=
STR16 Additional113Text[]=
{
L"Для запуска Jagged Alliance 2 v1.13 в оконном режиме требуется установить 16-битное качество цветопередачи экрана",
L"Jagged Alliance 2 v1.13 fullscreen mode requires to run at your desktop resolution (%d x %d) or less.", // TODO.Translate
// WANNE: Savegame slots validation against INI file // TODO.Translate
L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"Mercenary (MAX_NUMBER_PLAYER_MERCS) / Vehicle (MAX_NUMBER_PLAYER_VEHICLES)",
L"Enemy (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
L"Creature (MAX_NUMBER_CREATURES_IN_TACTICAL)",