MERGED source code from development trunk revision 4545 up to latest current revision 4882

Development Trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

INFO: The source code for the official 2011 release (4870) has been branched here:
https://ja2svn.dyndns.org/source/ja2/branches/JA2_rev.4870_2011

This commit contains the following features:

*** Externalized Vehicles ***
o Now with this feature we can add/remove vehicles
o New XML File: TableData\Vehicles.xml
o Added a new function parameter to lua file Scripts\Overhead lua to set up the helicopter in method: SetUpHelicopterForPlayer()
o Added example mini (Docs\Externalized Vehicles Example.zip) mod which adds 2 additional vehicles (hummer and ice-cream truck to sector A9)

*** Up to 255 save slots ***
- There is a "Next" and "Prev" button where you can scroll through the save slots
- It is now possible to load the automatic save (SAVE_EVERY_N_HOURS) from the load screen. This is the first slot after the quickload slot
- Added the 2 alternate players end turn saves (which can be enabled/disabled in option screen) to the save/load game form

*** New Feature: Externalized emails from Emails.edt to XML***
o This feature can be enabled/disabled in the Source:
--> See email.cpp: If "ReadXMLEmail" == FALSE, then normal way (read from Email.edt) otherwise read from XML files
o 2 new XML files: TableData\Email\EmailMercAvailable.xml and EmailMercLevelUp.xml
o Renamed SenderNamesList.xml to EmailSenderNamesList.xml and moved from TableData folder to TableData\Email folder
o Names for mercenaries are get from the file MercProfiles.xml and different names get from the file EmailSenderNamesList.xml

*** Externalized Hidden Towns (Tixa, Orta) ***
o Now it is possible to add new hidden towns (locations)
o See file: TableData/Map/Cities.xml
o New variable in TableData/Map/Cities.xml
- hiddenTown:   0 = show on strategy map, 1 = Hide on strategy map
- townIcon:     1 = on, 0 = off (This is the icon you see on the strategy map)
- szIconFile:   The path to the sti icon file (eg: interface\prison.sti, interface\my_icon.sti)
- iconPosition: The x,y position of the icon on the strategy map

*** Encyclopedia and Briefing Room, reachable from the laptop ***
o 2 new ja2_options.ini properties: BRIEFING_ROOM, ENCYCLOPEDIA
o demonstration video: http://www.youtube.com/watch?v=7CIXdXWLrAo
o Added Example usage of the Briefing Room
- Extract it in your JA2 1.13 folder and use the latest development executable
- The briefing room can be reached from the laptop. Enter SN5631 for the code and then click the "Exit" button
- See "Info_BriefingRoom.txt" and "BriefingRoom_Mission1.png"

*** Improved interrupt system (IIS) ***
o This system changes the way interrupts work. See: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290787#Post290787
o Option system (see ja2_options.ini: IMPROVED_INTERRUPT_SYSTEM)
o A few more settings for the interrupt system in ja2_options.ini
o INFO: Multiplayer games always use the "old" interrupt system, not matter what the user selects in the ja2_options.ini

*** Walking and sidestepping with weapon raised ***
o Enable/disable the walking/sidestepping with raised weapon in ja2_options.ini: ALLOW_WALKING_WITH_WEAPON_RAISED
o You can set an AP/BP modifier when walking/sidestepping with weapon raised in APBPConstants.ini: AP_MODIFIER_WEAPON_READY
o The following feature apply when you walk/sidestep with weapon raised:
-> limited angle of view, but you can see more farther when the weapon has a scope
-> better change for interrupts if you see an enemy
-> less APs and BPs when shooting, because the weapon is already raised
-> It should cost more APs when walking. Maybe you can export the additional AP and BP modifier to the APBPConstants.ini

*** Increase squad size to 8 (800x600) and 8 and 10 (1024x768) ***
o Squad sizes (dependend on the screen resolution) can be selected in the start new game screen
o In a multiplayer game, the squad size will always be 6, because it does not work with more soldiers/squad

*** Added UB-1.13 source code ***
o Merged the UB-1.13 source code (Revision: 4721) from svn: http://subversion.assembla.com/svn/ub-source113
o If you want to build UB-EXE or UB-MapEditor, just enable the 2 defines (JA2UB and JA2UBMAPS) in "builddefines.h"
o The UB-Verion reads from "ja2_UB.ini" instead of "ja2.ini"
o There are 2 new XML files
- Layout\LayoutMainMenu.xml
- MapAction\ActionItems.xml
o There are 2 new LUA-Script files
- Scripts\ExplosionControl.lua
- Scripts\InterfaceDialogue.lua

*** Hide enemy health text / enemy hit count ***
o ja2_options.ini: HIDE_ENEMY_HEALTH_TEXT, HIDE_ENEMY_HIT_COUNT
o both new settings only have effect in a singleplayer game
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=128840&page=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4885 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/Text.h

@@ -4,9 +4,64 @@
 #include "items.h"
 #include "types.h"
 #include "mapscreen.h"
+#include "XML_Language.h"
+
+#include "Encyclopedia.h"
 
 #define STRING_LENGTH 255
 
+enum
+{
+	//TCTL_MSG__RANGE_TO_TARGET,
+	TCTL_MSG__ATTACH_TRANSMITTER_TO_LAPTOP,
+	TACT_MSG__CANNOT_AFFORD_MERC,
+	TACT_MSG__AIMMEMBER_FEE_TEXT,
+	TACT_MSG__AIMMEMBER_ONE_TIME_FEE,
+	TACT_MSG__FEE,
+	TACT_MSG__SOMEONE_ELSE_IN_SECTOR,
+	//TCTL_MSG__GUN_RANGE_AND_CTH,
+	TCTL_MSG__DISPLAY_COVER,
+	TCTL_MSG__LOS,
+	TCTL_MSG__INVALID_DROPOFF_SECTOR,
+	TCTL_MSG__PLAYER_LOST_SHOULD_RESTART,
+	TCTL_MSG__JERRY_BREAKIN_LAPTOP_ANTENA,
+	TCTL_MSG__END_GAME_POPUP_TXT_1,
+	TCTL_MSG__END_GAME_POPUP_TXT_2,
+	TCTL_MSG__IRON_MAN_CANT_SAVE_NOW,
+	TCTL_MSG__CANNOT_SAVE_DURING_COMBAT,
+	TCTL_MSG__CAMPAIGN_NAME_TOO_LARGE,
+	TCTL_MSG__CAMPAIGN_DOESN_T_EXIST,
+	TCTL_MSG__DEFAULT_CAMPAIGN_LABEL,
+	TCTL_MSG__CAMPAIGN_LABEL,
+	TCTL_MSG__NEW_CAMPAIGN_CONFIRM,
+	TCTL_MSG__CANT_EDIT_DEFAULT,
+
+};
+//Ja25 UB
+//enums used for zNewLaptopMessages
+enum
+{
+	LPTP_MSG__MERC_SPECIAL_OFFER,
+	LPTP_MSG__TEMP_UNAVAILABLE,
+	LPTP_MSG__PREVIEW_TEXT,
+};
+
+extern	CHAR16	XMLTacticalMessages[1000][MAX_MESSAGE_NAMES_CHARS];
+
+//Encyclopedia
+extern STR16 	pMenuStrings[];
+extern STR16	pLocationPageText[];
+extern STR16	pSectorPageText[];
+extern STR16	pEncyclopediaHelpText[];
+extern STR16	pEncyclopediaTypeText[];
+extern STR16	pEncyclopediaSkrotyText[];
+extern STR16	pEncyclopediaShortCharacterText[];
+extern STR16	pEncyclopediaHelpCharacterText[];
+extern STR16	pEncyclopediaShortInventoryText[];
+extern STR16	BoxFilter[];
+extern STR16	pOtherButtonsText[];
+extern STR16	pOtherButtonsHelpText[];
+
 //Editor
 //Editor Taskbar Creation.cpp
 extern STR16 iEditorItemStatsButtonsText[];
@@ -52,7 +107,7 @@ extern STR16 pWaitForHelpScreenResponseText[];
 extern STR16 pAutoLoadMapText[];
 extern STR16 pShowHighGroundText[];
 //Item Statistics.cpp
-extern CHAR16 gszActionItemDesc[ 34 ][ 30 ];	// NUM_ACTIONITEMS = 34
+//extern CHAR16 gszActionItemDesc[ 34 ][ 30 ];	// NUM_ACTIONITEMS = 34
 extern STR16 pUpdateItemStatsPanelText[];
 extern STR16 pSetupGameTypeFlagsText[];
 extern STR16 pSetupGunGUIText[];
@@ -76,6 +131,8 @@ extern STR16 pDisplaySelectionWindowGraphicalInformationText[];
 extern STR16 wszSelType[6];
 //--
 
+extern	STR16	gzNewLaptopMessages[];
+extern	STR16	zNewTacticalMessages[];
 extern CHAR16  gszAimPages[ 6 ][ 20 ];
 extern CHAR16  zGrod[][500];
 extern STR16 pCreditsJA2113[];
@@ -361,12 +418,26 @@ enum
 	MSG_NORMAL_TURN_MODE,
 	MSG_FTM_EXIT_COMBAT,
 	MSG_FTM_ENTER_COMBAT,
-#ifdef JA2BETAVERSION
 	MSG_END_TURN_AUTO_SAVE,
-#endif
-	MSG_MPSAVEDIRECTORY,//84
+	MSG_MPSAVEDIRECTORY,//88
 	MSG_CLIENT,
-	MSG_NAS_AND_OIV_INCOMPATIBLE,
+	MSG_NAS_AND_OIV_INCOMPATIBLE,	// 90
+
+	MSG_SAVE_AUTOSAVE_TEXT,			// 91
+	MSG_SAVE_AUTOSAVE_TEXT_INFO,	// 92
+	MSG_SAVE_AUTOSAVE_EMPTY_TEXT,	// 93
+	MSG_SAVE_AUTOSAVE_FILENAME,		// 94
+	MSG_SAVE_END_TURN_SAVE_TEXT,	// 95
+	MSG_SAVE_AUTOSAVE_SAVING_TEXT,	// 96
+	MSG_SAVE_END_TURN_SAVE_SAVING_TEXT,	// 97
+	MSG_SAVE_AUTOSAVE_ENDTURN_EMPTY_TEXT,	//98
+	MSG_SAVE_AUTOSAVE_ENDTURN_TEXT_INFO,	//99
+	MSG_SAVE_QUICKSAVE_SLOT,				// 100
+	MSG_SAVE_AUTOSAVE_SLOT,					// 101
+	MSG_SAVE_AUTOSAVE_ENDTURN_SLOT,			// 102
+	MSG_SAVE_NORMAL_SLOT,					// 103
+	
+
 	TEXT_NUM_MSG,
 };
 extern STR16 pMessageStrings[];
@@ -565,6 +636,7 @@ extern STR16		szUDBAdvStatsExplanationsTooltipTextForWeapons[ 48 ];
 // Headrock: End Externs
 extern STR16		sKeyDescriptionStrings[2];
 extern CHAR16		zHealthStr[][13];
+extern STR16		gzHiddenHitCountStr[1];
 extern STR16		zVehicleName[ 6 ];
 
 enum
@@ -1319,6 +1391,7 @@ extern	STR16		zMarksMapScreenText[];
 
 
 //Weapon Name and Description size
+#define		ITEMSTRINGFILENAME				"BINARYDATA\\ITEMDESC.EDT"
 #define	SIZE_ITEM_NAME						160
 #define	SIZE_SHORT_ITEM_NAME			160
 #define	SIZE_ITEM_INFO						480
@@ -1539,7 +1612,9 @@ enum
 	SLG_BR_AWESOME_TEXT,
 
 	SLG_INV_RES_ERROR,
-	SLG_INV_CUSTUM_ERROR,	
+	SLG_INV_CUSTUM_ERROR,
+
+	SLG_SQUAD_SIZE_RES_ERROR,
 
 	TEXT_NUM_SLG_TEXT,
 };
@@ -1666,6 +1741,12 @@ enum
 	GIO_INV_SETTING_NEW_TEXT,
 	GIO_INV_SETTING_NEW_NAS_TEXT,
 
+	// WANNE: Squad size
+	GIO_SQUAD_SIZE_TITLE_TEXT,
+	GIO_SQUAD_SIZE_6_TEXT,
+	GIO_SQUAD_SIZE_8_TEXT,
+	GIO_SQUAD_SIZE_10_TEXT,
+
 	////////////////////////////////////
 	TEXT_NUM_GIO_TEXT
 };