From bea62be6165d103e30948c576ebecc7fb6c78011 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 17 Sep 2006 13:51:20 +0000
Subject: [PATCH] - bugfix: The content of all the IMP analyze emails only show
 the statistics of last created character - removed some of my old unused
 comments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                                       | Bin 124416 -> 197632 bytes
 Laptop/BobbyRGuns.h                           |   2 -
 Laptop/IMP Confirm.cpp                        |   2 +-
 Laptop/IMP Confirm.h                          |   2 +-
 Laptop/email.cpp                              | 222 +++++++++++-------
 Laptop/email.h                                |   8 +-
 Laptop/laptop.cpp                             |   2 +-
 Laptop/laptop.h                               |   1 -
 Laptop/mercs.cpp                              |  10 +-
 Standard Gaming Platform/vobject.h            |   1 -
 Strategic/Game Clock.h                        |   3 -
 Strategic/Game Event Hook.cpp                 |   4 +-
 Strategic/Game Init.cpp                       |   4 +-
 Strategic/Map Screen Interface Border.h       |   1 -
 .../Map Screen Interface Map Inventory.h      |   2 -
 Strategic/Map Screen Interface Map.h          |  10 +-
 Strategic/Map Screen Interface.cpp            |   2 +-
 Strategic/Player Command.cpp                  |   2 +-
 Strategic/Strategic Event Handler.cpp         |  10 +-
 Strategic/Strategic Merc Handler.cpp          |   2 +-
 Strategic/Strategic Status.cpp                |  18 +-
 Tactical/Campaign.cpp                         |   2 +-
 Tactical/XML.h                                |   2 -
 TileEngine/Radar Screen.h                     |   2 -
 Utils/Text.h                                  |   2 +-
 Utils/_EnglishText.cpp                        |   2 +-
 Utils/_FrenchText.cpp                         |   2 +-
 Utils/_GermanText.cpp                         |   2 +-
 Utils/_ItalianText.cpp                        |   2 +-
 Utils/_PolishText.cpp                         |   2 +-
 Utils/_RussianText.cpp                        |   2 +-
 local.h                                       |   2 -
 32 files changed, 180 insertions(+), 150 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index de34c8d8b86cf7405013171930f08a1b0082c2cf..72eff7e581ebe49a59e74042bee232d8b9ad7b19 100644
GIT binary patch
literal 197632
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
Z<dt4a0`i@vY!6M4SDxNqx|xi?{{yyB&e{L~

delta 7009
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
aCx{fQl<j>5nEw-oAyb4pp;!1m6Z{vj;H6gp

diff --git a/Laptop/BobbyRGuns.h b/Laptop/BobbyRGuns.h
index 2b210864..9d3a084a 100644
--- a/Laptop/BobbyRGuns.h
+++ b/Laptop/BobbyRGuns.h
@@ -38,7 +38,6 @@ void ExitBobbyRGuns();
 void HandleBobbyRGuns();
 void RenderBobbyRGuns();
 
-// WANNE
 BOOLEAN DeleteBobbyRGunsFilter();
 BOOLEAN DeleteBobbyRAmmoFilter();
 BOOLEAN DeleteBobbyRUsedFilter();
@@ -59,7 +58,6 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter);
 void DeleteMouseRegionForBigImage();
 void UpdateButtonText(UINT32	uiCurPage);
 
-// WANNE
 void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton);
 void UpdateGunFilterButtons(INT32 iNewButton, INT32 iOldButton);
 void UpdateUsedFilterButtons();
diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp
index 84ab0977..d866f695 100644
--- a/Laptop/IMP Confirm.cpp	
+++ b/Laptop/IMP Confirm.cpp	
@@ -353,7 +353,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
 			// But they should become different per different IMP.
-			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( ), PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId );
 
 			//RenderCharProfile( );
 
diff --git a/Laptop/IMP Confirm.h b/Laptop/IMP Confirm.h
index 52e3e8f4..7dd898e7 100644
--- a/Laptop/IMP Confirm.h	
+++ b/Laptop/IMP Confirm.h	
@@ -15,7 +15,7 @@ void ResetIMPCharactersEyesAndMouthOffsets( UINT8 ubMercProfileID );
 
 BOOLEAN ImpExists ( STR fileName );
 
-// WANNE 10:
+// WANNE: Determines the free and current slot of the imp in the gMercProfiles array
 INT32 GetNextFreeIMPSlot( void );
 INT32 GetCurrentIMPSlot( void );
 
diff --git a/Laptop/email.cpp b/Laptop/email.cpp
index 83fd1d61..d99a01bf 100644
--- a/Laptop/email.cpp
+++ b/Laptop/email.cpp
@@ -237,6 +237,9 @@ UINT32 guiEmailIndicator;
 UINT32 guiEmailMessage;
 UINT32 guiMAILDIVIDER;
 
+// WANNE 10:
+INT16 giCurrentIMPSlot = PLAYER_GENERATED_CHARACTER_ID;
+
 
 
 // the enumeration of headers
@@ -674,7 +677,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 );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, iFirstData, uiSecondData, -1 );
 	
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -687,7 +690,7 @@ void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u
 	return;
 }
 
-void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate)
+void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition)
 {
 	wchar_t pSubject[320];
 	//MessagePtr pMessageList;
@@ -701,7 +704,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 );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition );
 	
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -728,7 +731,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 );
+	AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, TRUE, 0, 0, -1 );
 	
 	// if we are in fact int he laptop, redraw icons, might be change in mail status
 
@@ -741,7 +744,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 )
+void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 iFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition )
 {
 	// will add a message to the list of messages
 	EmailPtr pEmail=pEmailList;
@@ -794,6 +797,8 @@ void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject,
 	// null out last byte of subject
   pTempEmail->pSubject[wcslen(pSubject)+1]=0;
 	
+	// WANNE 10:
+    pTempEmail->iCurrentIMPPosition = iCurrentIMPPosition;
 	
 	// set date and sender, Id
 	if(pEmail)
@@ -1731,6 +1736,9 @@ INT32 DisplayEmailMessage(EmailPtr pMail)
 	
 	// we KNOW the player is going to "read" this, so mark it as so
 	pMail->fRead=TRUE;
+
+	// WANNE 10
+	giCurrentIMPSlot = pMail->iCurrentIMPPosition;
 	
 	// draw text for title bar
   //swprintf(pString, L"%s / %s", pSenderNameList[pMail->ubSender],pMail->pSubject);
@@ -3253,6 +3261,11 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
 #define IMP_SKILLS_SPECIAL_MARTIAL IMP_SKILLS_SPECIAL_THIEF + 1
 #define IMP_SKILLS_SPECIAL_KNIFE IMP_SKILLS_SPECIAL_MARTIAL + 1
 
+// WANNE: These 2 skills are missing in the email!
+// The problem is, that there is no description in binarydata\impass.edt
+#define IMP_SKILLS_SPECIAL_ONROOF IMP_SKILLS_SPECIAL_KNIFE + 1
+#define IMP_SKILLS_SPECIAL_CAMOUFLAGED IMP_SKILLS_SPECIAL_ONROOF + 1
+
 #define IMP_RESULTS_PHYSICAL IMP_SKILLS_SPECIAL_KNIFE + 1
 #define IMP_RESULTS_PHYSICAL_LENGTH 7
 
@@ -3309,14 +3322,10 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
 #define IMP_PORTRAIT_FEMALE_5 IMP_PORTRAIT_FEMALE_4 + 4
 #define IMP_PORTRAIT_FEMALE_6 IMP_PORTRAIT_FEMALE_5 + 4
  
-
-
 #define IMP_RESULTS_END IMP_PORTRAIT_FEMALE_6 + 1
 #define IMP_RESULTS_END_LENGTH 3
 
 
-
-
 void HandleIMPCharProfileResultsMessage( void)
 {
   // special case, IMP profile return
@@ -3336,6 +3345,8 @@ void HandleIMPCharProfileResultsMessage( void)
 	BOOLEAN fSufficientMechSkill = FALSE, fSufficientMarkSkill = FALSE, fSufficientMedSkill = FALSE, fSufficientExplSkill = FALSE;
 	BOOLEAN fSufficientHlth = FALSE, fSufficientStr = FALSE, fSufficientWis = FALSE, fSufficientAgi = FALSE, fSufficientDex = FALSE, fSufficientLdr = FALSE; 
 	
+	INT16 iCurrentIMPSlot = -1;
+	
 	iRand = Random( 32767 );
 
 	// set record ptr to head of list
@@ -3361,7 +3372,9 @@ void HandleIMPCharProfileResultsMessage( void)
 			{
 				wchar_t	zTemp[512];
 
-				swprintf( zTemp, L" %s", gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].zName );
+				iCurrentIMPSlot = giCurrentIMPSlot;
+
+				swprintf( zTemp, L" %s", gMercProfiles[ iCurrentIMPSlot ].zName );
 				wcscat( pString, zTemp );
 			}
 			
@@ -3390,7 +3403,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		}
 
 		// personality itself
-		switch( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bPersonalityTrait)
+		switch( gMercProfiles[ iCurrentIMPSlot ].bPersonalityTrait)
 		{
 			// normal as can be
 		  case( NO_PERSONALITYTRAIT ):
@@ -3432,7 +3445,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		AddEmailRecordToList( pString );
 
 		// extra paragraph for bugs
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bPersonalityTrait == FEAR_OF_INSECTS )
+		if( gMercProfiles[ iCurrentIMPSlot ].bPersonalityTrait == FEAR_OF_INSECTS )
 		{
       // persoanlity paragraph
 			LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( iOffSet + IMP_PERSONALITY_LENGTH + 1 ), MAIL_STRING_SIZE );
@@ -3459,7 +3472,8 @@ void HandleIMPCharProfileResultsMessage( void)
 		}
 
 			// personality itself
-		switch( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bAttitude )
+		// WANNE 10:
+		switch( gMercProfiles[ iCurrentIMPSlot ].bAttitude )
 		{
 			// normal as can be
 		  case( ATT_NORMAL ):
@@ -3544,27 +3558,27 @@ void HandleIMPCharProfileResultsMessage( void)
     iCounter = 0;
 
 		// marksmanship
-		if ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMarksmanship >= SUPER_SKILL_VALUE )
+	if ( gMercProfiles[ iCurrentIMPSlot ].bMarksmanship >= SUPER_SKILL_VALUE )
     {
 			fSufficientMarkSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// medical
-		if ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMedical >= SUPER_SKILL_VALUE )
+		if ( gMercProfiles[ iCurrentIMPSlot ].bMedical >= SUPER_SKILL_VALUE )
 		{
 			fSufficientMedSkill = TRUE;	
 			iEndOfSection = 1;
 		}
 
 		// mechanical
-		if ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMechanical >= SUPER_SKILL_VALUE )
+		if ( gMercProfiles[ iCurrentIMPSlot ].bMechanical >= SUPER_SKILL_VALUE )
 		{
 			fSufficientMechSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bExplosive >= SUPER_SKILL_VALUE )
+		if ( gMercProfiles[ iCurrentIMPSlot ].bExplosive >= SUPER_SKILL_VALUE )
 		{
 			fSufficientExplSkill = TRUE;
 			iEndOfSection = 1;
@@ -3632,27 +3646,26 @@ void HandleIMPCharProfileResultsMessage( void)
     iCounter = 0;
 
 		
-
 		// now the needs training values
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMarksmanship > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMarksmanship <= NEEDS_TRAINING_SKILL_VALUE ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bMarksmanship > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ iCurrentIMPSlot ].bMarksmanship <= NEEDS_TRAINING_SKILL_VALUE ) )
     {
 			fSufficientMarkSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMedical > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMedical <= NEEDS_TRAINING_SKILL_VALUE ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bMedical > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ iCurrentIMPSlot ].bMedical <= NEEDS_TRAINING_SKILL_VALUE ) )
     {
 			fSufficientMedSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMechanical > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMechanical <= NEEDS_TRAINING_SKILL_VALUE ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bMechanical > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ iCurrentIMPSlot ].bMechanical <= NEEDS_TRAINING_SKILL_VALUE ) )
     {
 			fSufficientMechSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bExplosive > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bExplosive <= NEEDS_TRAINING_SKILL_VALUE ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bExplosive > NO_CHANCE_IN_HELL_SKILL_VALUE ) &&( gMercProfiles[ iCurrentIMPSlot ].bExplosive <= NEEDS_TRAINING_SKILL_VALUE ) )
     {
 			fSufficientExplSkill = TRUE;
 			iEndOfSection = 1;
@@ -3718,25 +3731,25 @@ void HandleIMPCharProfileResultsMessage( void)
 		iEndOfSection = 0;
     iCounter = 0;	
 
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMarksmanship <= NO_CHANCE_IN_HELL_SKILL_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bMarksmanship <= NO_CHANCE_IN_HELL_SKILL_VALUE )
 		{
 			fSufficientMarkSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMedical <= NO_CHANCE_IN_HELL_SKILL_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bMedical <= NO_CHANCE_IN_HELL_SKILL_VALUE )
 		{
 			fSufficientMedSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bMechanical <= NO_CHANCE_IN_HELL_SKILL_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bMechanical <= NO_CHANCE_IN_HELL_SKILL_VALUE )
 		{
 			fSufficientMechSkill = TRUE;
 			iEndOfSection = 1;
 		}
 
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bExplosive <= NO_CHANCE_IN_HELL_SKILL_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bExplosive <= NO_CHANCE_IN_HELL_SKILL_VALUE )
 		{
 			fSufficientExplSkill = TRUE;
 			iEndOfSection = 1;
@@ -3807,7 +3820,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		   iCounter++;
 		}
 		
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == KNIFING )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == KNIFING ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == KNIFING )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == KNIFING ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_KNIFE ), MAIL_STRING_SIZE );
@@ -3817,7 +3830,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		}
 
     // lockpick     
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == LOCKPICKING)||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == LOCKPICKING) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == LOCKPICKING)||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == LOCKPICKING) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_LOCK ), MAIL_STRING_SIZE );
@@ -3827,7 +3840,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		}
 
 		// hand to hand
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == HANDTOHAND )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == HANDTOHAND ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == HANDTOHAND )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == HANDTOHAND ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_HAND ), MAIL_STRING_SIZE );
@@ -3837,7 +3850,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		}
     
 		// electronics
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == ELECTRONICS )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == ELECTRONICS ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == ELECTRONICS )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == ELECTRONICS ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_ELEC ), MAIL_STRING_SIZE );
@@ -3846,7 +3859,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == NIGHTOPS )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == NIGHTOPS ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == NIGHTOPS )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == NIGHTOPS ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_NIGHT ), MAIL_STRING_SIZE );
@@ -3855,7 +3868,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == THROWING)||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == THROWING) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == THROWING)||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == THROWING) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_THROW ), MAIL_STRING_SIZE );
@@ -3864,7 +3877,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == TEACHING )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == TEACHING ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == TEACHING )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == TEACHING ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_TEACH ), MAIL_STRING_SIZE );
@@ -3873,7 +3886,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == HEAVY_WEAPS )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == HEAVY_WEAPS ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == HEAVY_WEAPS )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == HEAVY_WEAPS ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_HEAVY ), MAIL_STRING_SIZE );
@@ -3882,7 +3895,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == AUTO_WEAPS )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == AUTO_WEAPS ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == AUTO_WEAPS )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == AUTO_WEAPS ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_AUTO ), MAIL_STRING_SIZE );
@@ -3891,7 +3904,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == STEALTHY )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == STEALTHY ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == STEALTHY )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == STEALTHY ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_STEALTH ), MAIL_STRING_SIZE );
@@ -3900,7 +3913,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == AMBIDEXT)||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == AMBIDEXT) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == AMBIDEXT)||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == AMBIDEXT) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_AMBI ), MAIL_STRING_SIZE );
@@ -3909,7 +3922,7 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == THIEF )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == THIEF ) )
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == THIEF )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == THIEF ) )
     {
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_THIEF ), MAIL_STRING_SIZE );
@@ -3918,8 +3931,8 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
-		if( ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait == MARTIALARTS )||( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bSkillTrait2 == MARTIALARTS ) )
-    {
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == MARTIALARTS )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == MARTIALARTS ) )
+		{
       	// read one record from email file
 		  LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_MARTIAL ), MAIL_STRING_SIZE );
 		 
@@ -3927,6 +3940,39 @@ void HandleIMPCharProfileResultsMessage( void)
 		  AddEmailRecordToList( pString );
 		}
 
+		// rooftop
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == ONROOF )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == ONROOF ) )
+		{
+			// WANNE: No entry in the Impass.edt for rooftop, so add any static text here
+      	// read one record from email file
+		  //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_ONROOF ), MAIL_STRING_SIZE );
+		 
+			wcscpy(pString, L"Rooftop: <No description yet>");
+
+			#ifdef GERMAN
+			wcscpy(pString, L"Scharfschütze: <Noch keine Beschreibung vorhanden>");
+			#endif
+
+		  // add to list
+		  AddEmailRecordToList( pString );
+		}
+
+		// camouflage
+		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == CAMOUFLAGED )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == CAMOUFLAGED ) )
+		{
+			// WANNE: No entry in the Impass.edt for camouflage, so add any static text here
+      	// read one record from email file
+		  //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_CAMOUFLAGED ), MAIL_STRING_SIZE );
+		 
+			wcscpy(pString, L"Camouflaged: <No description yet>");
+
+			#ifdef GERMAN
+			wcscpy(pString, L"Tarnung: <Noch keine Beschreibung vorhanden>");
+			#endif
+
+		  // add to list
+		  AddEmailRecordToList( pString );
+		}
 
 		// now the physical
 		// imperial physical
@@ -3953,42 +3999,42 @@ void HandleIMPCharProfileResultsMessage( void)
 
 		
 		// health
-		if(  gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLife >= SUPER_STAT_VALUE )
+		if(  gMercProfiles[ iCurrentIMPSlot ].bLife >= SUPER_STAT_VALUE )
     {
 			fSufficientHlth = TRUE;
 			iEndOfSection = 1;
 		}
    
 		// dex
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bDexterity >= SUPER_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bDexterity >= SUPER_STAT_VALUE )
 		{
 			fSufficientDex = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// agility
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bAgility >= SUPER_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bAgility >= SUPER_STAT_VALUE )
 		{
 			fSufficientAgi  = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// strength
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bStrength >= SUPER_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bStrength >= SUPER_STAT_VALUE )
 		{
 			fSufficientStr = TRUE;	
 			iEndOfSection = 1;
 		}
 
 		// wisdom
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bWisdom >= SUPER_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bWisdom >= SUPER_STAT_VALUE )
 		{
 			fSufficientWis = TRUE;
 			iEndOfSection =1;
 		}
 
 		// leadership
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLeadership >= SUPER_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bLeadership >= SUPER_STAT_VALUE )
 		{
 			fSufficientLdr = TRUE;
 			iEndOfSection = 1;
@@ -4075,42 +4121,42 @@ void HandleIMPCharProfileResultsMessage( void)
     iCounter = 0;
 	
 		// health
-		if(  ( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLife < NEEDS_TRAINING_STAT_VALUE ) &&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLife > NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if(  ( gMercProfiles[ iCurrentIMPSlot ].bLife < NEEDS_TRAINING_STAT_VALUE ) &&( gMercProfiles[ iCurrentIMPSlot ].bLife > NO_CHANCE_IN_HELL_STAT_VALUE ) )
     {
 			fSufficientHlth = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// strength
-		if( (gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bStrength < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bStrength > NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if( (gMercProfiles[ iCurrentIMPSlot ].bStrength < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ iCurrentIMPSlot ].bStrength > NO_CHANCE_IN_HELL_STAT_VALUE ) )
 		{
 			fSufficientStr = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// agility
-		if( (gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bAgility < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bAgility <= NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if( (gMercProfiles[ iCurrentIMPSlot ].bAgility < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ iCurrentIMPSlot ].bAgility <= NO_CHANCE_IN_HELL_STAT_VALUE ) )
 		{
 			fSufficientAgi = TRUE;
 			iEndOfSection = 1;
 		}
 		
 		// wisdom
-		if( (gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bWisdom < NEEDS_TRAINING_STAT_VALUE)&&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bWisdom > NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if( (gMercProfiles[ iCurrentIMPSlot ].bWisdom < NEEDS_TRAINING_STAT_VALUE)&&( gMercProfiles[ iCurrentIMPSlot ].bWisdom > NO_CHANCE_IN_HELL_STAT_VALUE ) )
 		{
 			fSufficientWis = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// leadership
-		if( (gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLeadership < NEEDS_TRAINING_STAT_VALUE)&&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLeadership > NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if( (gMercProfiles[ iCurrentIMPSlot ].bLeadership < NEEDS_TRAINING_STAT_VALUE)&&( gMercProfiles[ iCurrentIMPSlot ].bLeadership > NO_CHANCE_IN_HELL_STAT_VALUE ) )
 		{
 			fSufficientLdr = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// dex
-		if( (gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bDexterity < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bDexterity > NO_CHANCE_IN_HELL_STAT_VALUE ) )
+		if( (gMercProfiles[ iCurrentIMPSlot ].bDexterity < NEEDS_TRAINING_STAT_VALUE )&&( gMercProfiles[ iCurrentIMPSlot ].bDexterity > NO_CHANCE_IN_HELL_STAT_VALUE ) )
 		{
 			fSufficientDex = TRUE;
 			iEndOfSection = 1;
@@ -4206,35 +4252,35 @@ void HandleIMPCharProfileResultsMessage( void)
 		fSufficientLdr = FALSE; 
 		
 		// health
-		if(  gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLife <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if(  gMercProfiles[ iCurrentIMPSlot ].bLife <= NO_CHANCE_IN_HELL_STAT_VALUE )
     {
 			fSufficientHlth = TRUE;
 			iEndOfSection =1;
 		}
     
 		// dex
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bDexterity <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bDexterity <= NO_CHANCE_IN_HELL_STAT_VALUE )
 		{
 			fSufficientDex = TRUE;
 			iEndOfSection =1;
 		}
 
 		// strength
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bStrength <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bStrength <= NO_CHANCE_IN_HELL_STAT_VALUE )
 		{
 			fSufficientStr = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// agility
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bAgility <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bAgility <= NO_CHANCE_IN_HELL_STAT_VALUE )
 		{
 			fSufficientAgi = TRUE;
 			iEndOfSection = 1;
 		}
 
 		// wisdom
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bWisdom <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bWisdom <= NO_CHANCE_IN_HELL_STAT_VALUE )
 		{
 			fSufficientWis = TRUE;
 			iEndOfSection =1;
@@ -4305,7 +4351,7 @@ void HandleIMPCharProfileResultsMessage( void)
 
 
 		// leadership
-		if( gMercProfiles[ PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId ].bLeadership <= NO_CHANCE_IN_HELL_STAT_VALUE )
+		if( gMercProfiles[ iCurrentIMPSlot ].bLeadership <= NO_CHANCE_IN_HELL_STAT_VALUE )
 		{
 			fSufficientLdr = TRUE;	
 		}
@@ -5096,23 +5142,23 @@ void AddAllEmails()
 	UINT32 uiCnt;
 	UINT32 uiOffset;
 
-	AddEmail(IMP_EMAIL_INTRO,IMP_EMAIL_INTRO_LENGTH,CHAR_PROFILE_SITE,  GetWorldTotalMin() );
-	AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin() );
-	AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ) );
-	AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ) );
-	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin() );
+	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_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 );
 
-	AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin());
-	AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin());
-	AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin());
-	AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin());
+	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);
 
 	uiOffset = MERC_UP_LEVEL_BIFF;
 	for( uiCnt=0; uiCnt<10; uiCnt++)
 	{
-		AddEmail( uiOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin() );
+		AddEmail( uiOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin(), -1 );
 		uiOffset += MERC_UP_LEVEL_LENGTH_BIFF;
 	}
 
@@ -5121,35 +5167,35 @@ void AddAllEmails()
 	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() );
+		AddEmail( ( UINT8 )( uiOffset + ( uiCnt * AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, ( UINT8 )( 6 + uiCnt ), GetWorldTotalMin(), -1 );
 	}
 
-	AddEmail(OLD_ENRICO_1,OLD_ENRICO_1_LENGTH,MAIL_ENRICO,  GetWorldTotalMin() );
-	AddEmail(OLD_ENRICO_2,OLD_ENRICO_2_LENGTH,MAIL_ENRICO,  GetWorldTotalMin() );
-	AddEmail(OLD_ENRICO_3,OLD_ENRICO_3_LENGTH,MAIL_ENRICO,  GetWorldTotalMin() );
-	AddEmail(RIS_REPORT,RIS_REPORT_LENGTH,RIS_EMAIL,  GetWorldTotalMin() );
+	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( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin() );
-	AddEmail(ENRICO_PROG_20, ENRICO_PROG_20_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(ENRICO_PROG_55, ENRICO_PROG_55_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(ENRICO_PROG_80, ENRICO_PROG_80_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(ENRICO_SETBACK, ENRICO_SETBACK_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(ENRICO_SETBACK_2, ENRICO_SETBACK_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(LACK_PLAYER_PROGRESS_1, LACK_PLAYER_PROGRESS_1_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(LACK_PLAYER_PROGRESS_2, LACK_PLAYER_PROGRESS_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(LACK_PLAYER_PROGRESS_3, LACK_PLAYER_PROGRESS_3_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
-	AddEmail(ENRICO_CREATURES, ENRICO_CREATURES_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+	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);
 
 
 	//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());
-	AddEmail( KING_PIN_LETTER, KING_PIN_LETTER_LENGTH, KING_PIN, GetWorldTotalMin() );
-	AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin() );
+	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( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin() );
+	AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1 );
 
 	AddEmailWithSpecialData(MERC_DIED_ON_OTHER_ASSIGNMENT, MERC_DIED_ON_OTHER_ASSIGNMENT_LENGTH, AIM_SITE, GetWorldTotalMin(), 0, 0 );
 
diff --git a/Laptop/email.h b/Laptop/email.h
index 64ca48c7..0aa09e3a 100644
--- a/Laptop/email.h
+++ b/Laptop/email.h
@@ -163,6 +163,10 @@ struct email
 	UINT32	uiFifthData;
 	UINT32	uiSixData;
 
+	// WANNE: A reference to the IMP position in the gMercProfiles array. 
+	// So we know which analyse email belongs to the imp
+	INT32		iCurrentIMPPosition;
+
 	struct	email *Next;
 	struct	email *Prev;
 };
@@ -272,11 +276,11 @@ void RenderEmail();
 
 
 // message manipulation
-void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 uiFirstData, UINT32 uiSecondData );
+void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject, INT32 iDate, UINT8 ubSender, BOOLEAN fAlreadyRead, INT32 uiFirstData, UINT32 uiSecondData, INT32 iCurrentIMPPosition );
 void RemoveEmailMessage(INT32 iId);
 EmailPtr GetEmailMessage(INT32 iId);
 void LookForUnread();
-void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate);
+void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition);
 void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate);
 BOOLEAN DisplayNewMailBox();
 void CreateDestroyNewMailButton();
diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp
index 7e821f3b..effad3eb 100644
--- a/Laptop/laptop.cpp
+++ b/Laptop/laptop.cpp
@@ -2645,7 +2645,7 @@ void HaventMadeImpMercEmailCallBack()
 	if( ( LaptopSaveInfo.fIMPCompletedFlag == FALSE ) && ( LaptopSaveInfo.fSentImpWarningAlready == FALSE ) )
 	{
 		LaptopSaveInfo.fSentImpWarningAlready = TRUE;
-		AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ) );
+		AddEmail(IMP_EMAIL_AGAIN,IMP_EMAIL_AGAIN_LENGTH,1, GetWorldTotalMin( ), -1 );
 	}
 }
 
diff --git a/Laptop/laptop.h b/Laptop/laptop.h
index 72a874a8..aa48d416 100644
--- a/Laptop/laptop.h
+++ b/Laptop/laptop.h
@@ -47,7 +47,6 @@ void ClearOutTempLaptopFiles( void );
 
 void HaventMadeImpMercEmailCallBack();
 
-// WANNE
 extern INT32 guiCurrentGunFilterMode;
 extern INT32 guiPrevGunFilterMode;
 
diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp
index d35fa8a5..936a8922 100644
--- a/Laptop/mercs.cpp
+++ b/Laptop/mercs.cpp
@@ -786,7 +786,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());
+			AddEmail( MERC_INVALID, MERC_INVALID_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
 		}
 	}
 	else if( iNumDays > MERC_NUM_DAYS_TILL_ACCOUNT_SUSPENDED )
@@ -794,7 +794,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());
+			AddEmail( MERC_WARNING, MERC_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
 
 			// Have speck complain next time player come to site
 			LaptopSaveInfo.uiSpeckQuoteFlags |= SPECK_QUOTE__SENT_EMAIL_ABOUT_LACK_OF_PAYMENT;
@@ -805,7 +805,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());
+			AddEmail( MERC_FIRST_WARNING, MERC_FIRST_WARNING_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
 
 			// Have speck complain next time player come to site
 			LaptopSaveInfo.uiSpeckQuoteFlags |= SPECK_QUOTE__SENT_EMAIL_ABOUT_LACK_OF_PAYMENT;
@@ -2325,7 +2325,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() );
+	AddEmail( MERC_NEW_SITE_ADDRESS, MERC_NEW_SITE_ADDRESS_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -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;
@@ -2631,7 +2631,7 @@ void NewMercsAvailableAtMercSiteCallBack( )
 	}
 
 	if( fSendEmail )
-		AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin());
+		AddEmail( NEW_MERCS_AT_MERC, NEW_MERCS_AT_MERC_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
 
 	//new mercs are available
 	LaptopSaveInfo.fNewMercsAvailableAtMercSite = TRUE;
diff --git a/Standard Gaming Platform/vobject.h b/Standard Gaming Platform/vobject.h
index 2fdc0d53..8bf02b8f 100644
--- a/Standard Gaming Platform/vobject.h	
+++ b/Standard Gaming Platform/vobject.h	
@@ -138,7 +138,6 @@ extern "C" {
 // Creates a list to contain video objects
 BOOLEAN InitializeVideoObjectManager( );
 
-// WANNE
 int filter(unsigned int code, struct _EXCEPTION_POINTERS *ep);
 
 // Deletes any video object placed into list
diff --git a/Strategic/Game Clock.h b/Strategic/Game Clock.h
index 18069183..a586b9dc 100644
--- a/Strategic/Game Clock.h	
+++ b/Strategic/Game Clock.h	
@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifndef __WORLD_CLOCK
 #define __WORLD_CLOCK
 
@@ -6,11 +5,9 @@
 
 
 // where the time string itself is rendered
-// WANNE 2
 #define			CLOCK_X							(SCREEN_WIDTH - 86)			//554
 #define			CLOCK_Y							(SCREEN_HEIGHT - 21)		//459
 
-// WANNE 2
 // the mouse region around the clock (bigger)
 #define			CLOCK_REGION_START_X			(SCREEN_WIDTH - 88)								//552
 #define			CLOCK_REGION_START_Y			(SCREEN_HEIGHT - 24)							//456
diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp
index bb1e1d56..3a1b2305 100644
--- a/Strategic/Game Event Hook.cpp	
+++ b/Strategic/Game Event Hook.cpp	
@@ -189,11 +189,11 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
     case EVENT_DAY3_ADD_EMAIL_FROM_SPECK:
 			if(!bMercDayOne)
 			{
-				AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ) );
+				AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1 );
 			}
 			break;
 		case EVENT_DAY2_ADD_EMAIL_FROM_IMP:
-			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 );
 			break;
 		//If a merc gets hired and they dont show up immediately, the merc gets added to the queue and shows up
 		// uiTimeTillMercArrives  minutes later
diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp
index 5c7e8730..e30ce51f 100644
--- a/Strategic/Game Init.cpp	
+++ b/Strategic/Game Init.cpp	
@@ -403,11 +403,11 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
 		AddPreReadEmail(OLD_ENRICO_2,OLD_ENRICO_2_LENGTH,MAIL_ENRICO,  GetWorldTotalMin() );
 		AddPreReadEmail(RIS_REPORT,RIS_REPORT_LENGTH,RIS_EMAIL,  GetWorldTotalMin() );
 		AddPreReadEmail(OLD_ENRICO_3,OLD_ENRICO_3_LENGTH,MAIL_ENRICO,  GetWorldTotalMin() );
-		AddEmail(IMP_EMAIL_INTRO,IMP_EMAIL_INTRO_LENGTH,CHAR_PROFILE_SITE,  GetWorldTotalMin() );
+		AddEmail(IMP_EMAIL_INTRO,IMP_EMAIL_INTRO_LENGTH,CHAR_PROFILE_SITE,  GetWorldTotalMin(), -1);
 		//AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin() );
 		if(gGameExternalOptions.fMercDayOne)
 		{
-			AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ) );
+			AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1 );
 		}
 
 
diff --git a/Strategic/Map Screen Interface Border.h b/Strategic/Map Screen Interface Border.h
index f4ff1611..4d07c281 100644
--- a/Strategic/Map Screen Interface Border.h	
+++ b/Strategic/Map Screen Interface Border.h	
@@ -41,7 +41,6 @@ enum{
 */
 
 
-// WANNE 2
 #define MAP_LEVEL_MARKER_X			(MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 + 114))	//MAP_BORDER_X + MAP_BORDER_X_OFFSET + 384		//(SCREEN_WIDTH - 75)			//565
 #define MAP_LEVEL_MARKER_Y			(SCREEN_HEIGHT - 160)						//(SCREEN_HEIGHT - 157)		//323
 #define MAP_LEVEL_MARKER_DELTA		8
diff --git a/Strategic/Map Screen Interface Map Inventory.h b/Strategic/Map Screen Interface Map Inventory.h
index 6d44eb36..a956032b 100644
--- a/Strategic/Map Screen Interface Map Inventory.h	
+++ b/Strategic/Map Screen Interface Map Inventory.h	
@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifndef _MAP_INTERFACE_MAP_INVEN_H
 #define _MAP_INTERFACE_MAP_INVEN_H
 
@@ -53,7 +52,6 @@ extern INT16 sObjectSourceGridNo;
 extern WORLDITEM *pInventoryPoolList;
 extern INT32 iCurrentInventoryPoolPage;
 extern BOOLEAN fMapInventoryItemCompatable[ ];
-// WANNE 2
 extern INT32 MAP_INVENTORY_POOL_SLOT_COUNT; 
 
 BOOLEAN IsMapScreenWorldItemInvisibleInMapInventory( WORLDITEM *pWorldItem );
diff --git a/Strategic/Map Screen Interface Map.h b/Strategic/Map Screen Interface Map.h
index bd2a7d98..cd91f90d 100644
--- a/Strategic/Map Screen Interface Map.h	
+++ b/Strategic/Map Screen Interface Map.h	
@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifndef _MAP_SCREEN_INTERFACE_MAP_H
 #define _MAP_SCREEN_INTERFACE_MAP_H
 
@@ -156,19 +155,16 @@ enum {
 #define SOUTH_ZOOM_BOUND 324
 #define NORTH_ZOOM_BOUND 36
 
-// WANNE 2 <change THIS>
-// WANNE 2 (the starting top/left position of the background image
+// WANNE: The starting top/left position of the background image
 #define MAP_BORDER_X						261
 #define MAP_BORDER_Y						0
 
 
-// WANNE 2 <change THIS>
-// WANNE 2 (the offset of the map border)
+// WANNE: The offset of the map border
 #define MAP_BORDER_X_OFFSET					(((SCREEN_WIDTH - 261) - 380) / 2)
 #define MAP_BORDER_Y_OFFSET					(((SCREEN_HEIGHT - 121) - 360) / 2)
 
-// WANNE 2 <THE MAP IMAGE PCX>
-// map view region
+// WANNE: The map view region (map image pcx)
 #define			MAP_VIEW_START_X			(MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9)
 #define			MAP_VIEW_START_Y			(MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10)
 #define			MAP_VIEW_WIDTH				336
diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp
index 4a15a627..12cf4b05 100644
--- a/Strategic/Map Screen Interface.cpp	
+++ b/Strategic/Map Screen Interface.cpp	
@@ -5613,7 +5613,7 @@ BOOLEAN HandleTimeCompressWithTeamJackedInAndGearedToGo( void )
 	SetUpShutDownMapScreenHelpTextScreenMask( );
 
 	// Add e-mail message
-	AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin() );
+	AddEmail(ENRICO_CONGRATS,ENRICO_CONGRATS_LENGTH,MAIL_ENRICO, GetWorldTotalMin(), -1);
 
 
 	return( TRUE );
diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp
index 337ba723..6fb9528c 100644
--- a/Strategic/Player Command.cpp	
+++ b/Strategic/Player Command.cpp	
@@ -142,7 +142,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
 			//If the player has been to Bobbyr when it was down, and we havent already sent email, send him an email
 			if( LaptopSaveInfo.ubHaveBeenToBobbyRaysAtLeastOnceWhileUnderConstruction == BOBBYR_BEEN_TO_SITE_ONCE &&  LaptopSaveInfo.ubHaveBeenToBobbyRaysAtLeastOnceWhileUnderConstruction != BOBBYR_ALREADY_SENT_EMAIL )
 			{
-				AddEmail( BOBBYR_NOW_OPEN, BOBBYR_NOW_OPEN_LENGTH, BOBBY_R, GetWorldTotalMin());
+				AddEmail( BOBBYR_NOW_OPEN, BOBBYR_NOW_OPEN_LENGTH, BOBBY_R, GetWorldTotalMin(), -1);
 				LaptopSaveInfo.ubHaveBeenToBobbyRaysAtLeastOnceWhileUnderConstruction = BOBBYR_ALREADY_SENT_EMAIL;
 			}
 		}
diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp
index dbd5e65a..2147e1e4 100644
--- a/Strategic/Strategic Event Handler.cpp	
+++ b/Strategic/Strategic Event Handler.cpp	
@@ -379,14 +379,14 @@ void BobbyRayPurchaseEventCallback( UINT8 ubOrderID )
 	if( !fThisShipmentIsFromJohnKulba )
 	{
 		//Add an email from Bobby r telling the user the shipment 'Should' be there
-		AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin() );
+		AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
 	}
 	else
 	{
 		//if the shipment is from John Kulba
 
 		//Add an email from kulba telling the user the shipment is there
-		AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin() );
+		AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1 );
 	}
 }
 
@@ -661,7 +661,7 @@ void HandleNPCSystemEvent( UINT32 uiEvent )
 					{
 						// KP knows money is gone, hasn't told player, if this event is called then the 2
 						// days are up... send email
-						AddEmail( KING_PIN_LETTER, KING_PIN_LETTER_LENGTH, KING_PIN, GetWorldTotalMin() );
+						AddEmail( KING_PIN_LETTER, KING_PIN_LETTER_LENGTH, KING_PIN, GetWorldTotalMin(), -1 );
 						StartQuest( QUEST_KINGPIN_MONEY, 5, MAP_ROW_D );
 						// add event to send terrorists two days from now
 						AddFutureDayStrategicEvent( EVENT_SET_BY_NPC_SYSTEM, Random( 120 ), FACT_KINGPIN_KNOWS_MONEY_GONE, 2 );
@@ -758,7 +758,7 @@ void HandleNPCSystemEvent( UINT32 uiEvent )
 				break;
 
 			case NPC_ACTION_SEND_ENRICO_MIGUEL_EMAIL:
-				AddEmail( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin() );
+				AddEmail( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1 );
 				break;
 
 			case NPC_ACTION_TIMER_FOR_VEHICLE:
@@ -1185,5 +1185,5 @@ void DropOffItemsInMeduna( UINT8 ubOrderNum )
 	gpNewBobbyrShipments[ ubOrderNum ].fActive = FALSE;
 
 	//Add an email from kulba telling the user the shipment is there
-	AddEmail( BOBBY_R_MEDUNA_SHIPMENT, BOBBY_R_MEDUNA_SHIPMENT_LENGTH, BOBBY_R, GetWorldTotalMin() );
+	AddEmail( BOBBY_R_MEDUNA_SHIPMENT, BOBBY_R_MEDUNA_SHIPMENT_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
 }
\ No newline at end of file
diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp
index 7c641f0a..5d8f0dfd 100644
--- a/Strategic/Strategic Merc Handler.cpp	
+++ b/Strategic/Strategic Merc Handler.cpp	
@@ -442,7 +442,7 @@ void MercDailyUpdate()
 						pProfile->ubMiscFlags3 &= ~PROFILE_MISC_FLAG3_PLAYER_LEFT_MSG_FOR_MERC_AT_AIM;
 
 						// TO DO: send E-mail to player telling him the merc has returned from an assignment
-						AddEmail( ( UINT8 )( iOffset + ( cnt * AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, ( UINT8 )( 6 + cnt ), GetWorldTotalMin() );
+						AddEmail( ( UINT8 )( iOffset + ( cnt * AIM_REPLY_LENGTH_BARRY ) ), AIM_REPLY_LENGTH_BARRY, ( UINT8 )( 6 + cnt ), GetWorldTotalMin(), -1 );
 					}
 				}
 			}
diff --git a/Strategic/Strategic Status.cpp b/Strategic/Strategic Status.cpp
index 15f605ff..e1bfc46e 100644
--- a/Strategic/Strategic Status.cpp	
+++ b/Strategic/Strategic Status.cpp	
@@ -205,7 +205,7 @@ void HandleEnricoEmail(void)
 	// if creatures have attacked a mine (doesn't care if they're still there or not at the moment)
 	if (HasAnyMineBeenAttackedByMonsters() && !(gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_SENT_CREATURES))
 	{
-		AddEmail(ENRICO_CREATURES, ENRICO_CREATURES_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_CREATURES, ENRICO_CREATURES_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_CREATURES;
 		return;	// avoid any other E-mail at the same time
 	}
@@ -213,21 +213,21 @@ void HandleEnricoEmail(void)
 
 	if ((ubCurrentProgress >= SOME_PROGRESS_THRESHOLD) && !(gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_SENT_SOME_PROGRESS))
 	{
-		AddEmail(ENRICO_PROG_20, ENRICO_PROG_20_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_PROG_20, ENRICO_PROG_20_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_SOME_PROGRESS;
 		return;	// avoid any setback E-mail at the same time
 	}
 
 	if ((ubCurrentProgress >= ABOUT_HALFWAY_THRESHOLD) && !(gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_SENT_ABOUT_HALFWAY))
 	{
-		AddEmail(ENRICO_PROG_55, ENRICO_PROG_55_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_PROG_55, ENRICO_PROG_55_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_ABOUT_HALFWAY;
 		return;	// avoid any setback E-mail at the same time
 	}
 
 	if ((ubCurrentProgress >= NEARLY_DONE_THRESHOLD) && !(gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_SENT_NEARLY_DONE))
 	{
-		AddEmail(ENRICO_PROG_80, ENRICO_PROG_80_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_PROG_80, ENRICO_PROG_80_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_NEARLY_DONE;
 		return;	// avoid any setback E-mail at the same time
 	}
@@ -237,7 +237,7 @@ void HandleEnricoEmail(void)
 	    (((ubHighestProgress - ubCurrentProgress) >= MINOR_SETBACK_THRESHOLD) && (gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_FLAG_SETBACK_OVER))) &&
 			!(gStrategicStatus.usEnricoEmailFlags & ENRICO_EMAIL_SENT_MAJOR_SETBACK))
 	{
-		AddEmail(ENRICO_SETBACK, ENRICO_SETBACK_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_SETBACK, ENRICO_SETBACK_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_MAJOR_SETBACK;
 	}
 	else
@@ -245,7 +245,7 @@ void HandleEnricoEmail(void)
 	if (((ubHighestProgress - ubCurrentProgress) >= MINOR_SETBACK_THRESHOLD) &&
 		  !(gStrategicStatus.usEnricoEmailFlags & (ENRICO_EMAIL_SENT_MINOR_SETBACK | ENRICO_EMAIL_SENT_MAJOR_SETBACK)))
 	{
-		AddEmail(ENRICO_SETBACK_2, ENRICO_SETBACK_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+		AddEmail(ENRICO_SETBACK_2, ENRICO_SETBACK_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 		gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_MINOR_SETBACK;
 	}
 	else
@@ -308,15 +308,15 @@ void HandleEnricoEmail(void)
 				switch( bComplaint )
 				{
 					case 3:
-						AddEmail(LACK_PLAYER_PROGRESS_3, LACK_PLAYER_PROGRESS_3_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+						AddEmail(LACK_PLAYER_PROGRESS_3, LACK_PLAYER_PROGRESS_3_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 						gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_LACK_PROGRESS3;
 						break;
 					case 2:
-						AddEmail(LACK_PLAYER_PROGRESS_2, LACK_PLAYER_PROGRESS_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+						AddEmail(LACK_PLAYER_PROGRESS_2, LACK_PLAYER_PROGRESS_2_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 						gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_LACK_PROGRESS2;
 						break;
 					default:
-						AddEmail(LACK_PLAYER_PROGRESS_1, LACK_PLAYER_PROGRESS_1_LENGTH, MAIL_ENRICO, GetWorldTotalMin());
+						AddEmail(LACK_PLAYER_PROGRESS_1, LACK_PLAYER_PROGRESS_1_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1);
 						gStrategicStatus.usEnricoEmailFlags |= ENRICO_EMAIL_SENT_LACK_PROGRESS1;
 						break;
 
diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp
index 9ea13a22..3c698532 100644
--- a/Tactical/Campaign.cpp
+++ b/Tactical/Campaign.cpp
@@ -1573,5 +1573,5 @@ void MERCMercWentUpALevelSendEmail( UINT8 ubMercMercIdValue )
 	UINT8 ubEmailOffset = 0;
 
 	ubEmailOffset = MERC_UP_LEVEL_BIFF + MERC_UP_LEVEL_LENGTH_BIFF * ( ubMercMercIdValue ); 
-	AddEmail( ubEmailOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin() );
+	AddEmail( ubEmailOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin(), -1);
 }
\ No newline at end of file
diff --git a/Tactical/XML.h b/Tactical/XML.h
index 2d729dda..f2c87253 100644
--- a/Tactical/XML.h
+++ b/Tactical/XML.h
@@ -17,11 +17,9 @@ typedef PARSE_STAGE;
 
 #define TABLEDATA_DIRECTORY						"TableData\\"
 
-// WANNE: Removed the prefix, because it does not work correct.
 #define GERMAN_PREFIX							"German."
 #define RUSSIAN_PREFIX							"Russian."
 
-
 #define	ATTACHMENTSFILENAME						"Attachments.xml"
 #define	ATTACHMENTINFOFILENAME					"AttachmentInfo.xml"
 #define	ITEMSFILENAME							"Items.xml"
diff --git a/TileEngine/Radar Screen.h b/TileEngine/Radar Screen.h
index f0f64cb3..a6392d64 100644
--- a/TileEngine/Radar Screen.h	
+++ b/TileEngine/Radar Screen.h	
@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifndef __RADAR_SCREEN_H
 #define __RADAR_SCREEN_H
 
@@ -10,7 +9,6 @@ void RadarRegionButtonCallback( MOUSE_REGION * pRegion, INT32 iReason );
 
 BOOLEAN LoadRadarScreenBitmap( CHAR8 * aFilename );
 
-// WANNE 2
 // RADAR WINDOW DEFINES
 #define	RADAR_WINDOW_X				(SCREEN_WIDTH - 97)				//543
 #define RADAR_WINDOW_TM_Y				INTERFACE_START_Y + 13
diff --git a/Utils/Text.h b/Utils/Text.h
index 555b3395..abc2ec36 100644
--- a/Utils/Text.h
+++ b/Utils/Text.h
@@ -566,7 +566,7 @@ enum
 };
 extern		STR16			MercAccountText[];
 
-// WANNE 3
+// WANNE: The "Next" and "Prev" button text of the merc account page
 extern	STR16 MercAccountPageText[];
 
 
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index cea7ae4b..800a756e 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -2582,7 +2582,7 @@ STR16			MercAccountText[] =
 	L"Are you sure you want to authorize the payment of %s?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index e6bbaebd..27ab5954 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -2570,7 +2570,7 @@ STR16			MercAccountText[] =
 	L"Désirez-vous autoriser le versement de %s ?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index 9420e8e4..b24ebd5e 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -2470,7 +2470,7 @@ STR16 MercAccountText[] =
 	L"Zahlung von %s wirklich genehmigen?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 60ef8d51..39f67bcb 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -2564,7 +2564,7 @@ STR16			MercAccountText[] =
 	L"Conferma il pagamento di %s?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index 3b1e692f..02a217f6 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -2565,7 +2565,7 @@ STR16			MercAccountText[] =
 	L"Czy na pewno chcesz zatwierdziæ p³atnoœæ: %s?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 7518515e..460bae7f 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -2573,7 +2573,7 @@ STR16			MercAccountText[] =
 	L"Âû óâåðåíû, ÷òî õîòèòå ïîäòâåðäèòü âûïëàòó %s?",		//the %s is a string that contains the dollar amount ( ex. "$150" )
 };
 
-// WANNE 3
+// WANNE:
 // Merc Account Page buttons
 STR16			MercAccountPageText[] = 
 {
diff --git a/local.h b/local.h
index 65d32f79..d92dc5f4 100644
--- a/local.h
+++ b/local.h
@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifndef __LOCAL_DEFINES_
 #define __LOCAL_DEFINES_
 
@@ -33,7 +32,6 @@ extern int iResolution;			// Resolution id from the ini file
 extern int iScreenWidthOffset;
 extern int iScreenHeightOffset;
 
-// WANNE 2
 extern BOOLEAN fDisplayOverheadMap;
 
 #define PIXEL_DEPTH           16