mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- Fixed compilation errors when trying to compile a UB-Version (#define JA2UB & define JA2UBMAPS)
o The compilation was broken when enabling Speck as a playable mercs in JA2 113 (revision 6215) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -123,8 +123,11 @@
|
||||
#include "ub_config.h"
|
||||
#endif
|
||||
|
||||
// anv: for playable Speck
|
||||
#include "mercs.h"
|
||||
#ifdef JA2UB
|
||||
#else
|
||||
// anv: for playable Speck
|
||||
#include "mercs.h"
|
||||
#endif
|
||||
|
||||
// OJW - 20090419
|
||||
UINT8 giMAXIMUM_NUMBER_OF_PLAYER_MERCS = CODE_MAXIMUM_NUMBER_OF_PLAYER_MERCS;
|
||||
@@ -3362,9 +3365,12 @@ void HandlePlayerTeamMemberDeath( SOLDIERTYPE *pSoldier )
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#ifdef JA2UB
|
||||
#else
|
||||
// anv: handle Speck witnessing his employee death
|
||||
if( pTeamSoldier->ubProfile == SPECK_PLAYABLE && pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__MERC )
|
||||
HandleSpeckWitnessingEmployeeDeath( pSoldier );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user