****************************************************************************

** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

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

Laptop/BobbyRMailOrder.cpp

@@ -30,6 +30,10 @@
 
 #include "Strategic Event Handler.h"
 #include "connect.h"
+#include "GameSettings.h"
+#include <vfs/Core/vfs.h>
+#include <vfs/Core/vfs_file_raii.h>
+#include <vfs/Core/File/vfs_file.h>
 
 /*
 typedef struct
@@ -334,7 +338,7 @@ MOUSE_REGION	gSelectedUpDownArrowOnScrollAreaRegion[2];
 void SelectUpDownArrowOnScrollAreaRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 
 //Dealtar's Airport Externalization.
-UINT16 gusCurShipmentDestinationID;
+INT16 gusCurShipmentDestinationID;
 extern CPostalService gPostalService;
 UINT8 guiNumOfDisplayedCities=0;
 vector<PDestinationStruct> gDestinationTable;
@@ -2219,15 +2223,29 @@ void AddJohnsGunShipment()
 
 	// want to add two guns (Automags, AUTOMAG_III), and four clips of ammo.
 
+	
+
+
 	Temp[0].usItemIndex = AUTOMAG_III;
 	Temp[0].ubNumberPurchased = 2;
 	Temp[0].bItemQuality = 100;
 	Temp[0].usBobbyItemIndex = 0;// does this get used anywhere???
 	Temp[0].fUsed = FALSE;
-
+	
 //	memcpy( &(LaptopSaveInfo.BobbyRayOrdersOnDeliveryArray[ cnt ].BobbyRayPurchase[0]), &Temp, sizeof(BobbyRayPurchaseStruct) );
 
-	Temp[1].usItemIndex = CLIP762N_5_AP;
+	// WANNE: We have to check if profile 1.13 is available or not, to get the correct ammo
+	BOOLEAN isData113ProfileAvailable = FALSE;
+	if(getVFS()->getProfileStack()->getProfile(L"v1.13") != NULL)	
+		isData113ProfileAvailable = TRUE;	
+	else
+		isData113ProfileAvailable = FALSE;
+
+	if (isData113ProfileAvailable)
+		Temp[1].usItemIndex = 557;
+	else
+		Temp[1].usItemIndex = CLIP762N_5_AP;
+
 	Temp[1].ubNumberPurchased = 2;
 	Temp[1].bItemQuality = 5;
 	Temp[1].usBobbyItemIndex = 0;// does this get used anywhere???

Laptop/CharProfile.cpp

@@ -117,6 +117,7 @@ void GameInitCharProfile()
 {
 	LaptopSaveInfo.iIMPIndex = 0;
 	iCurrentPortrait = 0;
+	iCurrentProfileMode = 0;
 //	iCurrentVoice = 0;
 	iPortraitNumber = 0;
 

Laptop/IMP Confirm.cpp

@@ -370,7 +370,7 @@ void	BtnIMPConfirmYes(GUI_BUTTON *btn,INT32 reason)
 
 			//Kaiden: And here is my Answer to the IMP E-mails only
 			// profiling the last IMP made. You get the results immediately
-			AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex );
+			AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex, -1 );
 
 			//RenderCharProfile( );
 
@@ -1526,6 +1526,7 @@ BOOLEAN LoadImpCharacter( STR nickName )
 			return FALSE;
 		}
 		
+		/*
 			//new camo face
 			if ( gGameExternalOptions.fShowCamouflageFaces == TRUE )
 				{
@@ -1534,7 +1535,7 @@ BOOLEAN LoadImpCharacter( STR nickName )
 					gCamoFace[iProfileId].gDesertCamoface = FALSE;
 					gCamoFace[iProfileId].gSnowCamoface = FALSE;
 				}
-
+		*/
 
 		// charge the player
 		// is the character male?

Laptop/IMP HomePage.cpp

@@ -444,7 +444,7 @@ void ProcessPlayerInputActivationString( void )
 				ResetActivationStringTextBox();
 
 				//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
-				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex );
+				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex, -1 );
 			}
 		}
 		else
@@ -470,7 +470,7 @@ void ProcessPlayerInputActivationString( void )
 				ResetActivationStringTextBox();
 
 				//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
-				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex );
+				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), LaptopSaveInfo.iIMPIndex, -1 );
 			}
 		}
 		else

Laptop/IMP Skill Trait.cpp

@@ -987,6 +987,7 @@ BOOLEAN ShouldTraitBeSkipped( UINT32 uiTrait )
 	}
 	else
 	{
+		// WANNE: No material arts selection allowed for big body types and females, because we don't have a material art animation on big body types!
 		if( uiTrait == IMP_SKILL_TRAITS__MARTIAL_ARTS && (!fCharacterIsMale || bBigBodySelected()) )
 			return( TRUE );
 		else
@@ -998,6 +999,13 @@ BOOLEAN DoesSkillHaveExpertLevel( UINT32 uiSkillTrait )
 {
 	if( gGameOptions.fNewTraitSystem )
 	{
+		// WANNE: Yes we have no animation, but the Trait bonus also works with the missing animations.
+		/*
+		// WANNE: No material arts allowed for big body types and females, because we don't have a material art animation on big body types!
+		if (uiSkillTrait == IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS && (!fCharacterIsMale || bBigBodySelected()))
+			return (FALSE);
+		*/
+		
 		return( TRUE );
 	}
 	else
@@ -1008,11 +1016,10 @@ BOOLEAN DoesSkillHaveExpertLevel( UINT32 uiSkillTrait )
 		{
 			return( FALSE );
 		}
-		else
-		{
-			return( TRUE );
-		}
+		
+		return( TRUE );		
 	}
+
 	return( TRUE );
 }
 

Laptop/Laptop_VS2005.vcproj

@@ -39,7 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
@@ -165,7 +165,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
@@ -226,7 +226,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

Laptop/PostalService.cpp

@@ -49,6 +49,8 @@ using namespace std;
 
 extern StrategicMapElement StrategicMap[];
 
+extern INT16 gusCurShipmentDestinationID;
+
 /////////////////////////////////////////////////////
 // CShipmentManipulator member implementation
 /////////////////////////////////////////////////////
@@ -528,10 +530,10 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
 
 			// Shipment from Bobby Ray
 			if (shs.sSenderID == BOBBYR_SENDER_ID)
-				AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );	
+				AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1, gusCurShipmentDestinationID);	
 			// Shipment from John Kulba
 			else
-				AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1 );
+				AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1, gusCurShipmentDestinationID);
 		}
 
 		shs.ShipmentPackages.clear();

Laptop/XML_ShippingDestinations.cpp

@@ -160,7 +160,7 @@ destinationEndElementHandle(void *userData, const XML_Char *name)
 		else if(strcmp(name, "sGridNo") == 0)
 		{
 			pData->curElement = ELEMENT;
-			pData->tempDest.sGridNo = (UINT16) atoi(pData->szCharData);
+			pData->tempDest.sGridNo = (UINT32) atoi(pData->szCharData);
 		}
 		else if(strcmp(name, "uiIndex") == 0)
 		{

Laptop/email.cpp

@@ -329,7 +329,7 @@ void PreProcessEmail( EmailPtr pMail );
 void ModifyInsuranceEmails( UINT16 usMessageId, INT32 *iResults, EmailPtr pMail, UINT8 ubNumberOfRecords );
 BOOLEAN ReplaceMercNameAndAmountWithProperData( CHAR16 *pFinishedString, EmailPtr pMail );
 BOOLEAN ReplaceBiffNameWithProperMercName( CHAR16 *pFinishedString, EmailPtr pMail, CHAR16 *pMercName );
-extern UINT16 gusCurShipmentDestinationID;
+extern INT16 gusCurShipmentDestinationID;
 extern CPostalService gPostalService;
 
 
@@ -415,7 +415,7 @@ BOOLEAN EnterEmail()
 	FilenameForBPP("LAPTOP\\maillistdivider.sti", VObjectDesc.ImageFile);
 	CHECKF(AddVideoObject(&VObjectDesc, &guiMAILDIVIDER));
 
-	//AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ) );
+	//AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), -1, -1 );
 	// initialize mouse regions
 	InitializeMouseRegions();
 
@@ -438,7 +438,7 @@ BOOLEAN EnterEmail()
 	RenderEmail();
 
 
-	//AddEmail( MERC_REPLY_GRIZZLY, MERC_REPLY_LENGTH_GRIZZLY, GRIZZLY_MAIL, GetWorldTotalMin() );
+	//AddEmail( MERC_REPLY_GRIZZLY, MERC_REPLY_LENGTH_GRIZZLY, GRIZZLY_MAIL, GetWorldTotalMin(), -1, -1 );
 	//RenderButtons( );
 
 
@@ -682,7 +682,7 @@ void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u
 	ReplaceMercNameAndAmountWithProperData( pSubject, &FakeEmail );
 
 	// add message to list
-	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, iFirstData, uiSecondData, -1 );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, iFirstData, uiSecondData, -1 , -1);
 
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -695,14 +695,22 @@ void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u
 	return;
 }
 
-void AddEmailWFMercLevelUp(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition)
+void AddEmailWFMercAvailable(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition)
 {
 	CHAR16 pSubject[320];
-	
-	UINT8 subjectLine = (170 - iMessageLength) * 2;
+
+	UINT8 subjectLine = 0;
+
+	// WF mercs
+	if (iMessageLength < 178) // -> see: New113AIMMercMailTexts	
+		subjectLine = (iMessageLength - 170) * 2;
+	// Generic mercs
+	else
+		subjectLine = 16;	// -> see: New113AIMMercMailTexts
+
 	wcscpy( pSubject, New113AIMMercMailTexts[subjectLine] );
 	
-	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, -1 );
 
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -715,7 +723,7 @@ void AddEmailWFMercLevelUp(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubS
 	return;
 }
 
-void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition)
+void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition, INT16 iCurrentShipmentDestinationID)
 {
 	CHAR16 pSubject[320];
 	//MessagePtr pMessageList;
@@ -726,7 +734,7 @@ void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32
 	LoadEncryptedDataFromFile("BINARYDATA\\Email.edt", pSubject, 640*(iMessageOffset), 640);
 
 	// add message to list
-	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, iCurrentShipmentDestinationID );
 
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -751,7 +759,7 @@ void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender,
 	LoadEncryptedDataFromFile("BINARYDATA\\Email.edt", pSubject, 640*(iMessageOffset), 640);
 
 	// add message to list
-	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, TRUE, 0, 0, -1 );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, TRUE, 0, 0, -1, -1 );
 
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -764,7 +772,7 @@ void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender,
 	return;
 }
 
-void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 iFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition )
+void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 iFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition, INT16 iCurrentShipmentDestinationID )
 {
 	// will add a message to the list of messages
 	EmailPtr pEmail=pEmailList;
@@ -832,6 +840,10 @@ void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject,
 
 	pTempEmail->iCurrentIMPPosition = iCurrentIMPPosition;
 
+	// WANNE.MAIL: Fix
+	pTempEmail->iCurrentShipmentDestinationID = iCurrentShipmentDestinationID;
+
+
 	// set date and sender, Id
 	if(pEmail)
 	pTempEmail->iId=iId+1;
@@ -3221,6 +3233,11 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
 
 			if (!pMessageRecordList)
 			{
+				// WANNE.MAIL: Fix
+				gusCurShipmentDestinationID = -1;	// Reset
+				gusCurShipmentDestinationID = pMail->iCurrentShipmentDestinationID;
+
+				// Loop through each line of the shipment EDT-file
 				for (int i = 0; i < BOBBYR_SHIPMENT_ARRIVED_LENGTH; i++)
 				{
 					wstrMail.clear();
@@ -3229,11 +3246,15 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
 
 					index = wstrMail.find(L"$DESTINATIONNAME$");
 
-					if (index != wstring::npos)
+					// WANNE.MAIL: Fix
+					if (gusCurShipmentDestinationID > 0)
 					{
-						wstrMail.erase(index, strlen("$DESTINATIONNAME$"));
-						RefToDestinationStruct ds = gPostalService.GetDestination(gusCurShipmentDestinationID);
-						wstrMail.insert(index, ds.wstrName.c_str());
+						if (index != wstring::npos)
+						{
+							wstrMail.erase(index, strlen("$DESTINATIONNAME$"));
+							RefToDestinationStruct ds = gPostalService.GetDestination(gusCurShipmentDestinationID);
+							wstrMail.insert(index, ds.wstrName.c_str());
+						}
 					}
 
 					AddEmailRecordToList((STR16)wstrMail.c_str());
@@ -3502,56 +3523,122 @@ void HandleIMPCharProfileResultsMessage( void)
 	// now the personality intro
 		iOffSet = IMP_RESULTS_ATTITUDE_INTRO;
 		iEndOfSection = IMP_RESULTS_ATTITUDE_LENGTH;
-	iCounter = 0;
+		iCounter = 0;
 
 		while(iEndOfSection > iCounter)
 		{
-		// read one record from email file
-		LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( iOffSet + iCounter ), MAIL_STRING_SIZE );
+			// read one record from email file
+			LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( iOffSet + iCounter ), MAIL_STRING_SIZE );
 
-		// add to list
-		AddEmailRecordToList( pString );
+			// add to list
+			AddEmailRecordToList( pString );
 
-		// increment email record counter
-		iCounter++;
+			// increment email record counter
+			iCounter++;
 		}
-
-			// personality itself
-		switch( gMercProfiles[ iCurrentIMPSlot ].bAttitude )
+		
+		// WANNE: Old trait system: attitudes
+		if (!gGameOptions.fNewTraitSystem)
 		{
-			// normal as can be
-		case( ATT_NORMAL ):
-		iOffSet = IMP_ATTITUDE_NORMAL;
-				break;
-			case( ATT_FRIENDLY ):
-				iOffSet = IMP_ATTITUDE_FRIENDLY;
-				break;
-		case( ATT_LONER ):
-				iOffSet = IMP_ATTITUDE_LONER;
-				break;
-			case( ATT_OPTIMIST ):
-				iOffSet = IMP_ATTITUDE_OPTIMIST;
-				break;
-			case( ATT_PESSIMIST ):
-				iOffSet = IMP_ATTITUDE_PESSIMIST;
-				break;
-			case( ATT_AGGRESSIVE ):
-				iOffSet = IMP_ATTITUDE_AGGRESSIVE;
-				break;
-			case( ATT_ARROGANT ):
-				iOffSet = IMP_ATTITUDE_ARROGANT;
-				break;
-		case( ATT_ASSHOLE ):
-				iOffSet = IMP_ATTITUDE_ASSHOLE;
-				break;
-			case( ATT_COWARD ):
-				iOffSet = IMP_ATTITUDE_COWARD;
-				break;
+			// personality itself
+			switch( gMercProfiles[ iCurrentIMPSlot ].bAttitude )
+			{
+				// normal as can be
+				case( ATT_NORMAL ):
+					iOffSet = IMP_ATTITUDE_NORMAL;
+					break;
+				case( ATT_FRIENDLY ):
+					iOffSet = IMP_ATTITUDE_FRIENDLY;
+					break;
+				case( ATT_LONER ):
+					iOffSet = IMP_ATTITUDE_LONER;
+					break;
+				case( ATT_OPTIMIST ):
+					iOffSet = IMP_ATTITUDE_OPTIMIST;
+					break;
+				case( ATT_PESSIMIST ):
+					iOffSet = IMP_ATTITUDE_PESSIMIST;
+					break;
+				case( ATT_AGGRESSIVE ):
+					iOffSet = IMP_ATTITUDE_AGGRESSIVE;
+					break;
+				case( ATT_ARROGANT ):
+					iOffSet = IMP_ATTITUDE_ARROGANT;
+					break;
+				case( ATT_ASSHOLE ):
+					iOffSet = IMP_ATTITUDE_ASSHOLE;
+					break;
+				case( ATT_COWARD ):
+					iOffSet = IMP_ATTITUDE_COWARD;
+					break;
+			}
 
+			// attitude title
+			LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( iOffSet ), MAIL_STRING_SIZE );
 		}
+		// WANNE: New trait system: Character traits
+		else
+		{
+			// WANNE: Try to map "new character traits" to matching old attitudes, so we have meaningful text in IMP mail
+			switch( gMercProfiles[ iCurrentIMPSlot ].bCharacterTrait )
+			{
+				case (CHAR_TRAIT_NORMAL):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_NORMAL]);
+					iOffSet = IMP_ATTITUDE_NORMAL;
+					break;
+				case (CHAR_TRAIT_SOCIABLE):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_SOCIABLE]);
+					iOffSet = IMP_ATTITUDE_FRIENDLY;
+					break;
+				case (CHAR_TRAIT_LONER):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_LONER]);
+					iOffSet = IMP_ATTITUDE_LONER;
+					break;
+				case (CHAR_TRAIT_OPTIMIST):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_OPTIMIST]);
+					iOffSet = IMP_ATTITUDE_OPTIMIST;
+					break;
+				case (CHAR_TRAIT_ASSERTIVE):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_ASSERTIVE]);
+					iOffSet = IMP_ATTITUDE_OPTIMIST;
+					break;
+				case (CHAR_TRAIT_INTELLECTUAL):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_INTELLECTUAL]);
+					iOffSet = IMP_ATTITUDE_FRIENDLY;
+					break;
+				case (CHAR_TRAIT_PRIMITIVE):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_PRIMITIVE]);
+					iOffSet = IMP_ATTITUDE_ARROGANT;
+					break;
+				case (CHAR_TRAIT_AGGRESSIVE):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_AGGRESSIVE]);
+					iOffSet = IMP_ATTITUDE_AGGRESSIVE;
+					break;
+				case (CHAR_TRAIT_PHLEGMATIC):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_PHLEGMATIC]);
+					iOffSet = IMP_ATTITUDE_PESSIMIST;
+					break;
+				case (CHAR_TRAIT_DAUNTLESS):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_DAUNTLESS]);
+					iOffSet = IMP_ATTITUDE_AGGRESSIVE;
+					break;
+				case (CHAR_TRAIT_PACIFIST):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_PACIFIST]);
+					iOffSet = IMP_ATTITUDE_COWARD;
+					break;
+				case (CHAR_TRAIT_MALICIOUS):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_MALICIOUS]);
+					iOffSet = IMP_ATTITUDE_ASSHOLE;
+					break;
+				case (CHAR_TRAIT_SHOWOFF):
+					wcscpy(pString, gzIMPCharacterTraitText[CHAR_TRAIT_SHOWOFF]);
+					iOffSet = IMP_ATTITUDE_ARROGANT;
+					break;
+			}
 
-		// attitude title
-		LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( iOffSet ), MAIL_STRING_SIZE );
+			wcscat(pString, L". ±");
+		}
+		
 		// add to list
 		AddEmailRecordToList( pString );
 
@@ -3889,13 +3976,16 @@ void HandleIMPCharProfileResultsMessage( void)
 			// Ranger
 			if ( ProfileHasSkillTrait( iCurrentIMPSlot, RANGER_NT ) > 0 )
 			{
+				/*
 				if ( gGameExternalOptions.fShowCamouflageFaces == TRUE )
 				{
 					gCamoFace[iCurrentIMPSlot].gCamoface = TRUE;
 					gCamoFace[iCurrentIMPSlot].gUrbanCamoface = FALSE;
 					gCamoFace[iCurrentIMPSlot].gDesertCamoface = FALSE;
 					gCamoFace[iCurrentIMPSlot].gSnowCamoface = FALSE;
-				}	
+				}
+				*/
+
 				wcscpy(pString, MissingIMPSkillsDescriptions[2]);
 				AddEmailRecordToList( pString );
 			}
@@ -4964,34 +5054,39 @@ void PreProcessEmail( EmailPtr pMail )
 					{
 						wcscpy( pString, New113AIMMercMailTexts[1] );						
 					}
-					else if (iNew113MERCMerc == 171)
+					else if (iNew113AIMMerc == 171)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[3] );
 					}
-					else if (iNew113MERCMerc == 172)
+					else if (iNew113AIMMerc == 172)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[5] );
 					}
-					else if (iNew113MERCMerc == 173)
+					else if (iNew113AIMMerc == 173)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[7] );
 					}
-					else if (iNew113MERCMerc == 174)
+					else if (iNew113AIMMerc == 174)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[9] );
 					}
-					else if (iNew113MERCMerc == 175)
+					else if (iNew113AIMMerc == 175)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[11] );
 					}
-					else if (iNew113MERCMerc == 176)
+					else if (iNew113AIMMerc == 176)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[13] );
 					}
-					else if (iNew113MERCMerc == 177)
+					else if (iNew113AIMMerc == 177)
 					{
 						wcscpy( pString, New113AIMMercMailTexts[15] );
 					}
+					// Additional Generic Merc mail message
+					else
+					{
+						wcscpy( pString, New113AIMMercMailTexts[17] );
+					}
 				}
 			}
 			
@@ -5440,60 +5535,60 @@ void AddAllEmails()
 	UINT32 uiCnt;
 	UINT32 uiOffset;
 
-	AddEmail(IMP_EMAIL_INTRO,IMP_EMAIL_INTRO_LENGTH,CHAR_PROFILE_SITE,	GetWorldTotalMin(), -1 );
-	AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin(), -1 );
-	AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ), -1 );
-	AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1 );
-	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1 );
+	AddEmail(IMP_EMAIL_INTRO,IMP_EMAIL_INTRO_LENGTH,CHAR_PROFILE_SITE,	GetWorldTotalMin(), -1, -1 );
+	AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin(), -1, -1 );
+	AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ), -1, -1 );
+	AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1, -1 );
+	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1 );
 
-	AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), -1 );
+	AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), -1, -1 );
 
-	AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
-	AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
-	AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
-	AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
+	AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
+	AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
+	AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
+	AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
 
 	uiOffset = MERC_UP_LEVEL_BIFF;
 	for( uiCnt=0; uiCnt<10; uiCnt++)
 	{
-		AddEmail( uiOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin(), -1 );
+		AddEmail( uiOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1 );
 		uiOffset += MERC_UP_LEVEL_LENGTH_BIFF;
 	}
 
-//	AddEmail( ( UINT8 )( AIM_REPLY_BARRY + ( AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, AIM_REPLY_BARRY, GetWorldTotalMin() );
+//	AddEmail( ( UINT8 )( AIM_REPLY_BARRY + ( AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, AIM_REPLY_BARRY, GetWorldTotalMin(), -1, -1 );
 
 	uiOffset = AIM_REPLY_BARRY;
 	for( uiCnt=0; uiCnt<40; uiCnt++)
 	{
-		AddEmail( ( UINT8 )( uiOffset + ( uiCnt * AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, ( UINT8 )( 6 + uiCnt ), GetWorldTotalMin(), -1 );
+		AddEmail( ( UINT8 )( uiOffset + ( uiCnt * AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, ( UINT8 )( 6 + uiCnt ), GetWorldTotalMin(), -1, -1 );
 	}
 
-	AddEmail(OLD_ENRICO_1,OLD_ENRICO_1_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1 );
-	AddEmail(OLD_ENRICO_2,OLD_ENRICO_2_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1 );
-	AddEmail(OLD_ENRICO_3,OLD_ENRICO_3_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1 );
-	AddEmail(RIS_REPORT,RIS_REPORT_LENGTH,RIS_EMAIL,	GetWorldTotalMin(), -1 );
+	AddEmail(OLD_ENRICO_1,OLD_ENRICO_1_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1, -1 );
+	AddEmail(OLD_ENRICO_2,OLD_ENRICO_2_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1, -1 );
+	AddEmail(OLD_ENRICO_3,OLD_ENRICO_3_LENGTH,MAIL_ENRICO,	GetWorldTotalMin(), -1, -1 );
+	AddEmail(RIS_REPORT,RIS_REPORT_LENGTH,RIS_EMAIL,	GetWorldTotalMin(), -1, -1 );
 
-	AddEmail( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1 );
-	AddEmail(ENRICO_PROG_20, ENRICO_PROG_20_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(ENRICO_PROG_55, ENRICO_PROG_55_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(ENRICO_PROG_80, ENRICO_PROG_80_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(ENRICO_SETBACK, ENRICO_SETBACK_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(ENRICO_SETBACK_2, ENRICO_SETBACK_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(LACK_PLAYER_PROGRESS_1, LACK_PLAYER_PROGRESS_1_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(LACK_PLAYER_PROGRESS_2, LACK_PLAYER_PROGRESS_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(LACK_PLAYER_PROGRESS_3, LACK_PLAYER_PROGRESS_3_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
-	AddEmail(ENRICO_CREATURES, ENRICO_CREATURES_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
+	AddEmail( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1 );
+	AddEmail(ENRICO_PROG_20, ENRICO_PROG_20_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(ENRICO_PROG_55, ENRICO_PROG_55_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(ENRICO_PROG_80, ENRICO_PROG_80_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(ENRICO_SETBACK, ENRICO_SETBACK_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(ENRICO_SETBACK_2, ENRICO_SETBACK_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(LACK_PLAYER_PROGRESS_1, LACK_PLAYER_PROGRESS_1_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(LACK_PLAYER_PROGRESS_2, LACK_PLAYER_PROGRESS_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(LACK_PLAYER_PROGRESS_3, LACK_PLAYER_PROGRESS_3_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
+	AddEmail(ENRICO_CREATURES, ENRICO_CREATURES_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1);
 
 
 	//Add an email telling the user that he received an insurance payment
 	AddEmailWithSpecialData( INSUR_PAYMENT, INSUR_PAYMENT_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), 20, 0 );
 	AddEmailWithSpecialData( INSUR_SUSPIC, INSUR_SUSPIC_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), 20, 0 );
 	AddEmailWithSpecialData( INSUR_SUSPIC_2, INSUR_SUSPIC_2_LENGTH, INSURANCE_COMPANY, GetWorldTotalMin(), 20, 0 );
-	AddEmail( BOBBYR_NOW_OPEN, BOBBYR_NOW_OPEN_LENGTH, BOBBY_R, GetWorldTotalMin(), -1);
-	AddEmail( KING_PIN_LETTER, KING_PIN_LETTER_LENGTH, KING_PIN, GetWorldTotalMin(), -1 );
-	AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
+	AddEmail( BOBBYR_NOW_OPEN, BOBBYR_NOW_OPEN_LENGTH, BOBBY_R, GetWorldTotalMin(), -1, -1);
+	AddEmail( KING_PIN_LETTER, KING_PIN_LETTER_LENGTH, KING_PIN, GetWorldTotalMin(), -1, -1 );
+	AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1, -1 );
 
-	AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1 );
+	AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1, -1 );
 
 	AddEmailWithSpecialData(MERC_DIED_ON_OTHER_ASSIGNMENT, MERC_DIED_ON_OTHER_ASSIGNMENT_LENGTH, AIM_SITE, GetWorldTotalMin(), 0, 0 );
 

Laptop/email.h

@@ -182,6 +182,9 @@ struct email
 	// So we know which analyse email belongs to the imp
 	INT32		iCurrentIMPPosition;
 
+	// WANNE.MAIL: Fix
+	INT16		iCurrentShipmentDestinationID;
+
 	struct	email *Next;
 	struct	email *Prev;
 };
@@ -211,6 +214,9 @@ typedef struct
 
 	INT32		iCurrentIMPPosition;
 
+	// WANNE.MAIL: Fix
+	INT16		iCurrentShipmentDestinationID;
+
 } SavedEmailStruct;
 
 
@@ -294,14 +300,14 @@ void RenderEmail();
 
 
 // message manipulation
-void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 uiFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition );
+void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 uiFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition, INT16 iCurrentShipmentDestinationID );
 void RemoveEmailMessage(INT32 iId);
 EmailPtr GetEmailMessage(INT32 iId);
 void LookForUnread();
-void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition);
+void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition, INT16 iCurrentShipmentDestinationID);
 
-// WANNE: For the new WF merc
-void AddEmailWFMercLevelUp(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition);
+// WANNE: For the new WF merc, when they available again
+void AddEmailWFMercAvailable(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition);
 
 void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate);
 BOOLEAN DisplayNewMailBox();

Laptop/history.cpp

@@ -950,7 +950,7 @@ void DisplayPageNumberAndDateRange( void )
 
 	if( !pCurrentHistory )
 	{
-	swprintf( sString, L"%s	%d / %d",pHistoryHeaders[1], 1, 1 );
+	swprintf( sString, L"%s %d / %d",pHistoryHeaders[1], 1, 1 );
 	mprintf( PAGE_NUMBER_X, PAGE_NUMBER_Y, sString );
 
 	swprintf( sString, L"%s %d - %d",pHistoryHeaders[2], 1 , 1 );
@@ -997,7 +997,7 @@ void DisplayPageNumberAndDateRange( void )
 
 	// get the last page
 
-	swprintf( sString, L"%s	%d / %d",pHistoryHeaders[1], iCurrentHistoryPage , iLastPage +1 );
+	swprintf( sString, L"%s %d / %d",pHistoryHeaders[1], iCurrentHistoryPage , iLastPage +1 );
 	mprintf( PAGE_NUMBER_X, PAGE_NUMBER_Y, sString );
 
 	swprintf( sString, L"%s %d - %d",pHistoryHeaders[2], pCurrentHistory->uiDate / ( 24 * 60 ) , uiLastDate/( 24 * 60 ) );

Laptop/laptop.cpp

@@ -2655,7 +2655,7 @@ void HaventMadeImpMercEmailCallBack()
 	if( ( LaptopSaveInfo.fIMPCompletedFlag == FALSE ) && ( LaptopSaveInfo.fSentImpWarningAlready == FALSE ) )
 	{
 		LaptopSaveInfo.fSentImpWarningAlready = TRUE;
-		AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ), -1 );
+		AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ), -1, -1 );
 	}
 }
 

Laptop/mercs.cpp

@@ -806,7 +806,7 @@ void DailyUpdateOfMercSite( UINT16 usDate)
 		if( LaptopSaveInfo.gubPlayersMercAccountStatus != MERC_ACCOUNT_INVALID )
 		{
 			LaptopSaveInfo.gubPlayersMercAccountStatus = MERC_ACCOUNT_INVALID;
-			AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
+			AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
 		}
 	}
 	else if( iNumDays > MERC_NUM_DAYS_TILL_ACCOUNT_SUSPENDED )
@@ -814,7 +814,7 @@ void DailyUpdateOfMercSite( UINT16 usDate)
 		if( LaptopSaveInfo.gubPlayersMercAccountStatus != MERC_ACCOUNT_SUSPENDED )
 		{
 			LaptopSaveInfo.gubPlayersMercAccountStatus = MERC_ACCOUNT_SUSPENDED;
-			AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
+			AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
 
 			// Have speck complain next time player come to site
 			LaptopSaveInfo.uiSpeckQuoteFlags |= SPECK_QUOTE__SENT_EMAIL_ABOUT_LACK_OF_PAYMENT;
@@ -825,7 +825,7 @@ void DailyUpdateOfMercSite( UINT16 usDate)
 		if( LaptopSaveInfo.gubPlayersMercAccountStatus != MERC_ACCOUNT_VALID_FIRST_WARNING )
 		{
 			LaptopSaveInfo.gubPlayersMercAccountStatus = MERC_ACCOUNT_VALID_FIRST_WARNING;
-			AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
+			AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
 
 			// Have speck complain next time player come to site
 			LaptopSaveInfo.uiSpeckQuoteFlags |= SPECK_QUOTE__SENT_EMAIL_ABOUT_LACK_OF_PAYMENT;
@@ -2352,7 +2352,7 @@ BOOLEAN ShouldTheMercSiteServerGoDown()
 void GetMercSiteBackOnline()
 {
 	//Add an email telling the user the site is back up
-	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1 );
+	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1 );
 
 	//Set a flag indicating that the server just went up ( so speck can make a comment when the player next visits the site )
 	LaptopSaveInfo.fFirstVisitSinceServerWentDown = TRUE;
@@ -2491,108 +2491,31 @@ BOOLEAN AreAnyOfTheNewMercsAvailable()
 }
 
 void ShouldAnyNewMercMercBecomeAvailable()
-{
-	BOOLEAN fNewMercAreAvailable = FALSE;
-
-	UINT8 i;
-	BOOLEAN Stop = FALSE;
-	
+{	
 	//Kaiden: Added this if test to make sure that the "New Mercs Available"
 	// e-mail doesn't show up and no unneccessary checks are made when you
 	// have the ALL_MERCS_AT_MERC set to TRUE in the INI file.
 	if(!gGameExternalOptions.fAllMercsAvailable)
 	{
-		for(i=0; i<NUM_PROFILES; i++)
+		for(UINT8 i=0; i<NUM_PROFILES; i++)
 		{
-			if ( Stop == FALSE )
-			{	
 			if ( gConditionsForMercAvailability[i].ProfilId != 0 && gConditionsForMercAvailability[i].NewMercsAvailable == FALSE && gConditionsForMercAvailability[i].StartMercsAvailable == FALSE )
 			{
-				
 				if( CanMercBeAvailableYet( gConditionsForMercAvailability[i].uiIndex ) )
-					{
-						fNewMercAreAvailable = TRUE;
-						Stop = TRUE;
-					}
-			}
+				{
+					//Set up an event to add the merc in x days
+					AddStrategicEvent( EVENT_MERC_SITE_NEW_MERC_AVAILABLE, GetMidnightOfFutureDayInMinutes( 1 ) + 420 + Random( 3 * 60 ), 0 );
+				}
 			}
 		}	
 	}
-	
-	
-/*	if(!gGameExternalOptions.fAllMercsAvailable)
-		{
-			//for bubba
-			//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == GUMPY )
-			{
-				if( CanMercBeAvailableYet( MERC_ARRIVES_BUBBA ) )
-				{
-					fNewMercAreAvailable = TRUE;
-				}
-			}
-
-			//for Larry
-			//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == LARRY_NORMAL ||
-			//		GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == LARRY_DRUNK )
-			{
-				if( CanMercBeAvailableYet( MERC_ARRIVES_LARRY ) )
-				{
-					fNewMercAreAvailable = TRUE;
-				}
-			}
-
-			//for Numb
-			//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == NUMB )
-			{
-				if( CanMercBeAvailableYet( MERC_ARRIVES_NUMB ) )
-				{
-					fNewMercAreAvailable = TRUE;
-				}
-			}
-
-			if( CanMercBeAvailableYet( MERC_ARRIVES_TEX ) )
-			{
-				fNewMercAreAvailable = TRUE;
-			}
-
-			if( CanMercBeAvailableYet( MERC_ARRIVES_BIGGENS ) )
-			{
-				fNewMercAreAvailable = TRUE;
-			}
-
-			//for COUGAR
-			//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == COUGAR )
-			{
-				if( CanMercBeAvailableYet( MERC_ARRIVES_COUGAR ) )
-				{
-					fNewMercAreAvailable = TRUE;
-				}
-			}
-
-			if( CanMercBeAvailableYet( MERC_ARRIVES_GASTON ) )
-			{
-				fNewMercAreAvailable = TRUE;
-			}
-
-			if( CanMercBeAvailableYet( MERC_ARRIVES_STOGIE ) )
-			{
-				fNewMercAreAvailable = TRUE;
-			}
-*/
-			//if there is a new merc available
-			if( fNewMercAreAvailable )
-			{
-				//Set up an event to add the merc in x days
-				AddStrategicEvent( EVENT_MERC_SITE_NEW_MERC_AVAILABLE, GetMidnightOfFutureDayInMinutes( 1 ) + 420 + Random( 3 * 60 ), 0 );
-			}
-	//	}
 }
 
 BOOLEAN CanMercBeAvailableYet( UINT8 ubMercToCheck )
 {
-	//if the merc is already available
-	if( gConditionsForMercAvailability[ ubMercToCheck ].ubMercArrayID ) //<= LaptopSaveInfo.gubLastMercIndex )
-		return( FALSE );
+	// WANNE: If we have a drunken profile, skip
+	if (gConditionsForMercAvailability[ ubMercToCheck ].Drunk)
+		return ( FALSE );
 
 	//if the merc is already hired
 	if( !IsMercHireable( GetMercIDFromMERCArray( gConditionsForMercAvailability[ ubMercToCheck ].ubMercArrayID ) ) )
@@ -2610,121 +2533,34 @@ BOOLEAN CanMercBeAvailableYet( UINT8 ubMercToCheck )
 
 void NewMercsAvailableAtMercSiteCallBack( )
 {
-	BOOLEAN fSendEmail=FALSE;
-	
-	BOOLEAN Stop = FALSE;
-	UINT8 i;
-
-		for(i=0; i<NUM_PROFILES; i++)
-		{
-		
-		if ( Stop == FALSE )
-		{			
+	for(UINT8 i=0; i<NUM_PROFILES; i++)
+	{			
 		if ( gConditionsForMercAvailability[i].ProfilId != 0 && gConditionsForMercAvailability[i].NewMercsAvailable == FALSE && gConditionsForMercAvailability[i].StartMercsAvailable == FALSE )
+		{
+			gConditionsForMercAvailability[i].NewMercsAvailable = TRUE;
+			
+			if( CanMercBeAvailableYet( gConditionsForMercAvailability[i].uiIndex ) )
 			{
-				gConditionsForMercAvailability[i].NewMercsAvailable = TRUE;
-				
-				if( CanMercBeAvailableYet( gConditionsForMercAvailability[i].uiIndex ) )
-					{
-					
-					if ( gConditionsForMercAvailability[ gConditionsForMercAvailability[i].uiIndex ].Drunk == TRUE )
-					{
-						LaptopSaveInfo.gubLastMercIndex = gConditionsForMercAvailability[gConditionsForMercAvailability[i].uiAlternateIndex].uiIndex;
-					}
-					else
-					{
-						LaptopSaveInfo.gubLastMercIndex++;
-					}
+				if ( gConditionsForMercAvailability[ gConditionsForMercAvailability[i].uiIndex ].Drunk == TRUE )
+				{
+					LaptopSaveInfo.gubLastMercIndex = gConditionsForMercAvailability[gConditionsForMercAvailability[i].uiAlternateIndex].uiIndex;
+				}
+				else
+				{
+					LaptopSaveInfo.gubLastMercIndex++;
+				}
 
-				//	LaptopSaveInfo.gubLastMercIndex++;
-					gConditionsForMercAvailability[gConditionsForMercAvailability[i].uiIndex].NewMercsAvailable = TRUE;
-					LaptopSaveInfo.ubLastMercAvailableId = gConditionsForMercAvailability[i].uiIndex;
-					gConditionsForMercAvailability[i].StartMercsAvailable = TRUE;
-					fSendEmail = TRUE;
-					Stop = TRUE;
-					}
+				gConditionsForMercAvailability[gConditionsForMercAvailability[i].uiIndex].NewMercsAvailable = TRUE;
+				LaptopSaveInfo.ubLastMercAvailableId = gConditionsForMercAvailability[i].uiIndex;
+				gConditionsForMercAvailability[i].StartMercsAvailable = TRUE;
+				
+				AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1, -1);
+
+				//new mercs are available
+				LaptopSaveInfo.fNewMercsAvailableAtMercSite = TRUE;
 			}
 		}
 	}
-		
-//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == BUBBA )
-		
-/*	{
-		if( CanMercBeAvailableYet( MERC_ARRIVES_BUBBA ) )
-		{
-			LaptopSaveInfo.gubLastMercIndex++;
-			LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_BUBBA;
-			fSendEmail = TRUE;
-		}
-	}
-
-	//for Larry
-//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == LARRY_NORMAL ||
-//			GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == LARRY_DRUNK )
-	{
-		if( CanMercBeAvailableYet( MERC_ARRIVES_LARRY ) )
-		{
-			LaptopSaveInfo.gubLastMercIndex++;
-			LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_LARRY;
-			fSendEmail = TRUE;
-		}
-	}
-
-	//for Numb
-//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == NUMB )
-	{
-		if( CanMercBeAvailableYet( MERC_ARRIVES_NUMB ) )
-		{
-			LaptopSaveInfo.gubLastMercIndex = 9;
-			LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_NUMB;
-			fSendEmail = TRUE;
-		}
-	}
-
-	if( CanMercBeAvailableYet( MERC_ARRIVES_TEX ) )
-	{
-		LaptopSaveInfo.gubLastMercIndex++;
-		LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_TEX;
-		fSendEmail = TRUE;
-	}
-
-	if( CanMercBeAvailableYet( MERC_ARRIVES_BIGGENS ) )
-	{
-		LaptopSaveInfo.gubLastMercIndex++;
-		LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_BIGGENS;
-		fSendEmail = TRUE;
-	}
-
-//for COUGAR
-//	if( GetMercIDFromMERCArray( LaptopSaveInfo.gubLastMercIndex ) == COUGAR )
-	{
-		if( CanMercBeAvailableYet( MERC_ARRIVES_COUGAR ) )
-		{
-			LaptopSaveInfo.gubLastMercIndex++;
-			LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_COUGAR;
-			fSendEmail = TRUE;
-		}
-	}
-
-	if( CanMercBeAvailableYet( MERC_ARRIVES_GASTON ) )
-	{
-		LaptopSaveInfo.gubLastMercIndex++;
-		LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_GASTON;
-		fSendEmail = TRUE;
-	}
-
-	if( CanMercBeAvailableYet( MERC_ARRIVES_STOGIE ) )
-	{
-		LaptopSaveInfo.gubLastMercIndex++;
-		LaptopSaveInfo.ubLastMercAvailableId = MERC_ARRIVES_STOGIE;
-		fSendEmail = TRUE;
-	}
-*/
-	if( fSendEmail )
-		AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
-
-	//new mercs are available
-	LaptopSaveInfo.fNewMercsAvailableAtMercSite = TRUE;
 }
 
 //used for older saves

Laptop/personnel.cpp

@@ -1636,8 +1636,17 @@ void DisplayCharStats(INT32 iId, INT32 iSlot)
 		// Added by SANDRO
 		case 15:
 		// Character Trait
-			mprintf((INT16)(pPersonnelScreenPoints[23].x+(iSlot*TEXT_BOX_WIDTH)),(pPersonnelScreenPoints[23].y + 15),pPersonnelRecordsHelpTexts[43]); //L"Character:"
-			swprintf(sString, gzIMPCharacterTraitText[gMercProfiles[Menptr[iId].ubProfile].bCharacterTrait]);
+
+			// WANNE: With old trait system, display "Attitudes" instead of "Character"
+			if (gGameOptions.fNewTraitSystem)			
+				mprintf((INT16)(pPersonnelScreenPoints[23].x+(iSlot*TEXT_BOX_WIDTH)),(pPersonnelScreenPoints[23].y + 15),pPersonnelRecordsHelpTexts[43]); //L"Character:"
+			else
+				mprintf((INT16)(pPersonnelScreenPoints[23].x+(iSlot*TEXT_BOX_WIDTH)),(pPersonnelScreenPoints[23].y + 15),pPersonnelRecordsHelpTexts[45]); //L"Attitudes:"
+
+			if ( gGameOptions.fNewTraitSystem)
+				swprintf(sString, gzIMPCharacterTraitText[gMercProfiles[Menptr[iId].ubProfile].bCharacterTrait]);
+			else
+				swprintf(sString, gzIMPAttitudesText[gMercProfiles[Menptr[iId].ubProfile].bAttitude]);
 
 			FindFontRightCoordinates((INT16)(pPersonnelScreenPoints[23].x+(iSlot*TEXT_BOX_WIDTH)),0,TEXT_BOX_WIDTH-20,0,sString, PERS_FONT,	&sX, &sY);
 			mprintf(sX,(pPersonnelScreenPoints[23].y + 15),sString);
@@ -1650,8 +1659,8 @@ void DisplayCharStats(INT32 iId, INT32 iSlot)
 			{
 				MSYS_RemoveRegion( &gSkillTraitHelpTextRegion[5] );
 			}
-			MSYS_DefineRegion( &gSkillTraitHelpTextRegion[5], ( sX - 3 ), (UINT16)( pPersonnelScreenPoints[23].y + 10),
-							( sX + StringPixLength(sString,PERS_FONT) + 3 ), (UINT16)( pPersonnelScreenPoints[23].y + 17 ), MSYS_PRIORITY_HIGH,
+			MSYS_DefineRegion( &gSkillTraitHelpTextRegion[5], ( sX - 3 ), (UINT16)( pPersonnelScreenPoints[23].y + 15),	// 10
+							( sX + StringPixLength(sString,PERS_FONT) + 3 ), (UINT16)( pPersonnelScreenPoints[23].y + 23 ), MSYS_PRIORITY_HIGH,	// 17
 								MSYS_NO_CURSOR, MSYS_NO_CALLBACK, NULL );
 			//MSYS_DefineRegion( &gSkillTraitHelpTextRegion[3], (UINT16)( pPersonnelScreenPoints[23].x + 147 ), (UINT16)(pPersonnelScreenPoints[23].y + 4),
 			//				(UINT16)( pPersonnelScreenPoints[23].x + 166 ), (UINT16)(pPersonnelScreenPoints[23].y + 15), MSYS_PRIORITY_HIGH,
@@ -1659,7 +1668,10 @@ void DisplayCharStats(INT32 iId, INT32 iSlot)
 			MSYS_AddRegion( &gSkillTraitHelpTextRegion[5] );
 			fAddedTraitRegion[5] = TRUE;
 			// Assign the text
-			AssignPersonnelCharacterTraitHelpText( gMercProfiles[Menptr[iId].ubProfile].bCharacterTrait );
+
+			// Only new traits have help text
+			if (gGameOptions.fNewTraitSystem)
+				AssignPersonnelCharacterTraitHelpText( gMercProfiles[Menptr[iId].ubProfile].bCharacterTrait );
 
 		break;
 
@@ -8069,6 +8081,8 @@ void AssignPersonnelCharacterTraitHelpText( UINT8 ubCharacterNumber )
 
 	return;
 }
+
+
 // SANDRO - Popup text windows for disability 
 void AssignPersonnelDisabilityHelpText( UINT8 ubDisabilityNumber )
 {