- 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:
Wanne
2013-07-29 09:05:08 +00:00
parent 4982281ddb
commit 76d517be0c
7 changed files with 66 additions and 13 deletions
+10 -3
View File
@@ -64,9 +64,12 @@
#include "ub_config.h"
#include "XML.h"
// anv: for playable Speck
#include "Speck Quotes.h"
#include "LaptopSave.h"
#ifdef JA2UB
#else
// anv: for playable Speck
#include "Speck Quotes.h"
#include "LaptopSave.h"
#endif
#include "connect.h"
#ifdef JA2EDITOR
@@ -2346,6 +2349,9 @@ SOLDIERTYPE * SwapLarrysProfiles( SOLDIERTYPE * pSoldier )
if ( pSoldier->ubProfile == LARRY_DRUNK )
{
SetFactTrue( FACT_LARRY_CHANGED );
#ifdef JA2UB
#else
// anv: make speck whine about it immediately if on team
if( !IsSpeckComAvailable() )
{
@@ -2353,6 +2359,7 @@ SOLDIERTYPE * SwapLarrysProfiles( SOLDIERTYPE * pSoldier )
// don't bring this up again
LaptopSaveInfo.uiSpeckQuoteFlags |= SPECK_QUOTE__ALREADY_TOLD_PLAYER_THAT_LARRY_RELAPSED;
}
#endif
}
else
{