mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +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:
@@ -17,8 +17,11 @@
|
||||
#include "Game Clock.h"
|
||||
#endif
|
||||
|
||||
// anv: for playable Speck
|
||||
#include "mercs.h"
|
||||
#ifdef JA2UB
|
||||
#else
|
||||
// anv: for playable Speck
|
||||
#include "mercs.h"
|
||||
#endif
|
||||
|
||||
StrategicMapElement StrategicMap[MAP_WORLD_X*MAP_WORLD_Y];
|
||||
|
||||
@@ -126,9 +129,13 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier )
|
||||
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