mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Bugfix: Fixed gender mixed up in the IMP Analysis email at the Portrait section (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+50
-21
@@ -11,6 +11,7 @@
|
|||||||
#include "Encrypted File.h"
|
#include "Encrypted File.h"
|
||||||
#include "cursors.h"
|
#include "cursors.h"
|
||||||
#include "soldier profile.h"
|
#include "soldier profile.h"
|
||||||
|
#include "CharProfile.h"
|
||||||
#include "IMP Compile Character.h"
|
#include "IMP Compile Character.h"
|
||||||
#include "IMP Voices.h"
|
#include "IMP Voices.h"
|
||||||
#include "IMP Portraits.h"
|
#include "IMP Portraits.h"
|
||||||
@@ -3836,9 +3837,8 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr
|
|||||||
#define IMP_PORTRAIT_FEMALE_3 IMP_PORTRAIT_FEMALE_2 + 4
|
#define IMP_PORTRAIT_FEMALE_3 IMP_PORTRAIT_FEMALE_2 + 4
|
||||||
#define IMP_PORTRAIT_FEMALE_4 IMP_PORTRAIT_FEMALE_3 + 4
|
#define IMP_PORTRAIT_FEMALE_4 IMP_PORTRAIT_FEMALE_3 + 4
|
||||||
#define IMP_PORTRAIT_FEMALE_5 IMP_PORTRAIT_FEMALE_4 + 4
|
#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 IMP_PORTRAIT_FEMALE_5 + 5
|
||||||
#define IMP_RESULTS_END_LENGTH 3
|
#define IMP_RESULTS_END_LENGTH 3
|
||||||
|
|
||||||
#else
|
#else
|
||||||
@@ -5168,42 +5168,71 @@ void HandleIMPCharProfileResultsMessage( void)
|
|||||||
|
|
||||||
switch( iPortraitNumber )
|
switch( iPortraitNumber )
|
||||||
{
|
{
|
||||||
case( 0 ):
|
case( 0 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_1;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_1;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_1;
|
||||||
break;
|
break;
|
||||||
case( 1 ):
|
case( 1 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_2;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_2;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_2;
|
||||||
break;
|
break;
|
||||||
case( 2 ):
|
case( 2 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_3;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_3;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_3;
|
||||||
break;
|
break;
|
||||||
case( 3 ):
|
case( 3 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_4;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_4;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_4;
|
||||||
break;
|
break;
|
||||||
case( 4 ):
|
case( 4 ):
|
||||||
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_5;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_4;
|
||||||
|
break;
|
||||||
case( 5 ):
|
case( 5 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_5;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_5;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_5;
|
||||||
break;
|
break;
|
||||||
case( 6 ):
|
case( 6 ):
|
||||||
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_6;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_5;
|
||||||
|
break;
|
||||||
case( 7 ):
|
case( 7 ):
|
||||||
iOffSet = IMP_PORTRAIT_MALE_6;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_6;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_3;
|
||||||
break;
|
break;
|
||||||
case( 8 ):
|
case( 8 ):
|
||||||
iOffSet = IMP_PORTRAIT_FEMALE_1;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_4;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_4;
|
||||||
break;
|
break;
|
||||||
case( 9 ):
|
case( 9 ):
|
||||||
iOffSet = IMP_PORTRAIT_FEMALE_2;
|
if( fCharacterIsMale )
|
||||||
|
iOffSet = IMP_PORTRAIT_MALE_5;
|
||||||
|
else
|
||||||
|
iOffSet = IMP_PORTRAIT_FEMALE_5;
|
||||||
break;
|
break;
|
||||||
case( 10 ):
|
default:
|
||||||
iOffSet = IMP_PORTRAIT_FEMALE_3;
|
if( fCharacterIsMale )
|
||||||
break;
|
iOffSet = IMP_PORTRAIT_MALE_1;
|
||||||
case( 11 ):
|
else
|
||||||
case( 12 ):
|
iOffSet = IMP_PORTRAIT_FEMALE_1;
|
||||||
iOffSet = IMP_PORTRAIT_FEMALE_4;
|
|
||||||
break;
|
|
||||||
case( 13 ):
|
|
||||||
case( 14 ):
|
|
||||||
iOffSet = IMP_PORTRAIT_FEMALE_5;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user