diff --git a/JA2.suo b/JA2.suo index af6fff78..aaacf37e 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/JA2.vcproj b/JA2.vcproj index 23db1d90..e8b1b0fb 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ iFourthData; SavedEmail.uiFifthData = pEmail->uiFifthData; SavedEmail.uiSixData = pEmail->uiSixData; + // WANNE NEW + SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition; // write the email header to the saved game file @@ -3666,7 +3668,8 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile ) pTempEmail->iFourthData = SavedEmail.iFourthData; pTempEmail->uiFifthData = SavedEmail.uiFifthData; pTempEmail->uiSixData = SavedEmail.uiSixData; - + // WANNE NEW + pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition; //add the current email in pEmail->Next = pTempEmail; diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index 54219f27..806a53b7 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -3591,6 +3591,7 @@ UINT16 GetSoldierAnimationSurface( SOLDIERTYPE *pSoldier, UINT16 usAnimState ) if ( usAnimSurface != INVALID_ANIMATION_SURFACE ) { + // WANNE NEW 2 // Ensure that it's loaded! if ( gAnimSurfaceDatabase[ usAnimSurface ].hVideoObject == NULL ) { diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 1dfe5ccc..a2c263af 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -181,12 +181,12 @@ UINT16 WeaponType[MAXITEMS][30] = { L"Other", L"Pistol", - L"Machine pistol", - L"Submachine gun", + L"MP", + L"SMG", L"Rifle", L"Sniper rifle", L"Assault rifle", - L"Light machine gun", + L"LMG", L"Shotgun", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index f708d170..a228be8b 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -174,12 +174,12 @@ UINT16 WeaponType[][30] = { L"Andere", L"Pistole", - L"Maschinenpistole", + L"MP", L"Schwere MP", L"Gewehr", - L"Scharfschützengewehr", - L"Sturmgewehr", - L"Leichtes MP", + L"SSG", + L"SG", + L"LMG", L"Schrotflinte", };