1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: compile error

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-24 21:04:29 +00:00
parent 51c21c625a
commit b70fcbe5e6
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Profile.cpp
+14 -5
View File
@@ -2369,11 +2369,20 @@ BOOLEAN MercIsInTropicalSector( SOLDIERTYPE * pSoldier )
SOLDIERTYPE * SwapLarrysProfiles( SOLDIERTYPE * pSoldier ) SOLDIERTYPE * SwapLarrysProfiles( SOLDIERTYPE * pSoldier )
{ {
MERCPROFILESTRUCT* pNewProfile; UINT8 ubSrcProfile;
UINT8 ubSrcProfile = pSoldier->ubProfile; UINT8 ubDestProfile;
MERCPROFILESTRUCT * pNewProfile;
// need a stop criteria... ubSrcProfile = pSoldier->ubProfile;
if ( FALSE ) if ( ubSrcProfile == LARRY_NORMAL )
{
ubDestProfile = LARRY_DRUNK;
}
else if ( ubSrcProfile == LARRY_DRUNK )
{
ubDestProfile = LARRY_NORMAL;
}
else
{ {
// I don't think so! // I don't think so!
return( pSoldier ); return( pSoldier );
@@ -2449,7 +2458,7 @@ SOLDIERTYPE * SwapLarrysProfiles( SOLDIERTYPE * pSoldier )
pNewProfile->sTrueSalary = gMercProfiles[ ubSrcProfile ].sTrueSalary; pNewProfile->sTrueSalary = gMercProfiles[ ubSrcProfile ].sTrueSalary;
// the goodguy property is permanent and shouldn't carry over, so check for that // the goodguy property is permanent and shouldn't carry over, so check for that
BOOLEAN goodguy = ( gMercProfiles[ubDestProfile].ubMiscFlags3 & PROFILE_MISC_FLAG3_GOODGUY ) ? TRUE : FALSE; BOOLEAN goodguy = ( (gMercProfiles[ubDestProfile].ubMiscFlags3) & PROFILE_MISC_FLAG3_GOODGUY ) ? TRUE : FALSE;
pNewProfile->ubMiscFlags3 = gMercProfiles[ ubSrcProfile ].ubMiscFlags3; pNewProfile->ubMiscFlags3 = gMercProfiles[ ubSrcProfile ].ubMiscFlags3;