1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed compilation error for JA2UB define (by anv)

Browse Source 
- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-12-28 18:27:09 +00:00
parent 5bf82b9d82
commit 44cf72a2e0
37 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Auto Resolve.cpp
+1 -1
View File
@@ -2049,7 +2049,7 @@ void RenderAutoResolve()
SetFactTrue( FACT_FIRST_BATTLE_WON );
}
SetTheFirstBattleSector( ( INT16 ) (gpAR->ubSectorX + gpAR->ubSectorY * MAP_WORLD_X ) );
#if (defined JA2UB)
#ifdef JA2UB
//Ja25: no loyalty
#else
HandleFirstBattleEndingWhileInTown( gpAR->ubSectorX, gpAR->ubSectorY, 0, TRUE );
Strategic/Campaign Init.cpp
+1 -1
View File
@@ -641,7 +641,7 @@ void InitNewCampaign()
//InitKnowFacilitiesFlags( );
BuildUndergroundSectorInfoList();
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
if (!is_networked)
Strategic/Creature Spreading.cpp
+2 -2
View File
@@ -298,7 +298,7 @@ void InitCreatureQuest()
fPlayMeanwhile = TRUE;
#endif
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles && no creatures
#else
if( fPlayMeanwhile && !gfCreatureMeanwhileScenePlayed && gModSettings.CreatureMeanwhileCutscene == TRUE )
@@ -1568,7 +1568,7 @@ BOOLEAN LoadCreatureDirectives( HWFILE hFile, UINT32 uiSavedGameVersion )
if( gfClearCreatureQuest && giLairID != -1 )
{
giLairID = 0;
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
gfCreatureMeanwhileScenePlayed = FALSE;
Strategic/Game Event Hook.cpp
+2 -2
View File
@@ -220,7 +220,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
// WANNE: This fixes the bug, that Speck did not sent the email on Day 3, when MERC_WEBSITE_ALL_MERCS_AVAILABLE = TRUE!
if ( gGameExternalOptions.fMercDayOne == FALSE /* && gGameExternalOptions.fAllMercsAvailable == FALSE */ )
{
#if (defined JA2UB)
#ifdef JA2UB
//No JA25 UB
#else
AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1, -1 ,TYPE_EMAIL_EMAIL_EDT );
@@ -366,7 +366,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
// BeginAirRaid( );
// break;
#if (defined JA2UB)
#ifdef JA2UB
// Ja25 No meanwhiles
#else
case EVENT_MEANWHILE:
Strategic/Game Init.cpp
+2 -2
View File
@@ -552,7 +552,7 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
AutoSaveToSlot[4] = FALSE;
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 no meanwhiles
#else
// reset meanwhile flags
@@ -715,7 +715,7 @@ fFirstTimeInMapScreen = TRUE;
InitCustomStrategicLayer ( );
#endif
#else
#if (defined JA2UB)
#ifdef JA2UB
#else
INT32 iStartingCash;
Strategic/Hourly Update.cpp
+11 -7
View File
@@ -42,13 +42,13 @@ void HourlyStealUpdate(); // Flugente: certain characters might steal equipment
extern INT32 GetCurrentBalance( void );
extern void PayOffSkyriderDebtIfAny( );
#if (defined JA2UB)
#ifdef JA2UB
//no UB
#else
void HourlyCheckIfSlayAloneSoHeCanLeave();
#endif
#if (defined JA2UB)
#ifdef JA2UB
//no UB
#else
void HourlyHelicopterRepair();
@@ -113,7 +113,7 @@ CHAR16 zString[128];
HourlyStealUpdate();
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
HourlyCheckIfSlayAloneSoHeCanLeave();
@@ -121,13 +121,17 @@ CHAR16 zString[128];
// WDS - New AI
HourlyCheckStrategicAI();
#ifdef JA2UB
// no UB
#else
PayOffSkyriderDebtIfAny();
HourlyHelicopterRepair();
#endif
if ( GetWorldHour() % 6 == 0 ) // 4 times a day
{
UpdateRegenCounters();
{ UpdateRegenCounters();
}
// WANNE: This check should avoid the resaving of a loaded auto-save game, when entering tactical
@@ -548,7 +552,7 @@ void HourlyStealUpdate()
}
}
#if (defined JA2UB)
#ifdef JA2UB
// no JA25 UB
#else
void HourlyCheckIfSlayAloneSoHeCanLeave()
@@ -578,7 +582,7 @@ void HourlyCheckIfSlayAloneSoHeCanLeave()
}
#endif
#if (defined JA2UB)
#ifdef JA2UB
// no JA25 UB
#else
void HourlyHelicopterRepair()
Strategic/Map Screen Helicopter.cpp
+1 -1
View File
@@ -1281,7 +1281,7 @@ void LandHelicopter( void )
}
else
{
#if (defined JA2UB)
#ifdef JA2UB
Assert( 0 );
//No meanwhiles
#else
Strategic/Map Screen Interface Bottom.cpp
+2 -2
View File
@@ -1322,7 +1322,7 @@ BOOLEAN AllowedToTimeCompress( void )
return( FALSE );
}
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 no meanwhiles
#else
// meanwhile coming up
@@ -1810,7 +1810,7 @@ BOOLEAN AllowedToExitFromMapscreenTo( INT8 bExitToWhere )
return( FALSE );
}
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
// meanwhile coming up
Strategic/Map Screen Interface.cpp
+1 -1
View File
@@ -5788,7 +5788,7 @@ BOOLEAN HandleTimeCompressWithTeamJackedInAndGearedToGo( void )
FadeInGameScreen( );
SetUpShutDownMapScreenHelpTextScreenMask( );
#if (defined JA2UB)
#ifdef JA2UB
//no ja25 UB
#else
// Add e-mail message
Strategic/Player Command.cpp
+5 -5
View File
@@ -184,7 +184,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
INT8 bTownId = 0;
UINT8 ubSectorID;
#if (defined JA2UB)
#ifdef JA2UB
//Ja25: No meanwhiles
#else
if( AreInMeanwhile( ) )
@@ -271,7 +271,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
{
HandleMoraleEvent( NULL, MORALE_TOWN_LIBERATED, sMapX, sMapY, bMapZ );
#if (defined JA2UB)
#ifdef JA2UB
//Ja25: no loyalty
#else
HandleGlobalLoyaltyEvent( GLOBAL_LOYALTY_GAIN_TOWN_SECTOR, sMapX, sMapY, bMapZ );
@@ -288,7 +288,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
if ( GetTotalLeftInMine( GetMineIndexForSector( sMapX, sMapY ) ) > 0)
{
HandleMoraleEvent( NULL, MORALE_MINE_LIBERATED, sMapX, sMapY, bMapZ );
#if (defined JA2UB)
#ifdef JA2UB
// Ja25: no loyalty
#else
HandleGlobalLoyaltyEvent( GLOBAL_LOYALTY_GAIN_MINE, sMapX, sMapY, bMapZ );
@@ -310,7 +310,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
}
HandleMoraleEvent( NULL, MORALE_SAM_SITE_LIBERATED, sMapX, sMapY, bMapZ );
#if (defined JA2UB)
#ifdef JA2UB
// Ja25: no loyalty
#else
HandleGlobalLoyaltyEvent( GLOBAL_LOYALTY_GAIN_SAM, sMapX, sMapY, bMapZ );
@@ -350,7 +350,7 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
( sMapY >= gModSettings.ubMeanwhileMedunaOutskirtsColMinY && sMapY <= gModSettings.ubMeanwhileMedunaOutskirtsColMaxY ) ) ) ) //col y range
{
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
HandleOutskirtsOfMedunaMeanwhileScene();
Strategic/Queen Command.cpp
+1 -1
View File
@@ -2056,7 +2056,7 @@ void BeginCaptureSquence( )
void EndCaptureSequence( )
{
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
Strategic/Strategic Event Handler.cpp
+1 -1
View File
@@ -799,7 +799,7 @@ void HandleNPCSystemEvent( UINT32 uiEvent )
break;
case NPC_ACTION_SEND_ENRICO_MIGUEL_EMAIL:
#if (defined JA2UB)
#ifdef JA2UB
// no UB
#else
AddEmail( ENRICO_MIGUEL, ENRICO_MIGUEL_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1 , TYPE_EMAIL_EMAIL_EDT);
Strategic/Strategic Movement.cpp
+2 -2
View File
@@ -1725,7 +1725,7 @@ void GroupArrivedAtSector( UINT8 ubGroupID, BOOLEAN fCheckForBattle, BOOLEAN fNe
if( fExceptionQueue || fCheckForBattle && gTacticalStatus.fEnemyInSector &&
FindMovementGroupInSector( (UINT8)gWorldSectorX, (UINT8)gWorldSectorY, TRUE ) &&
(pGroup->ubNextX != gWorldSectorX || pGroup->ubNextY != gWorldSectorY || gbWorldSectorZ > 0 ) ||
#if (defined JA2UB)
#ifdef JA2UB
//Ja25: NO meanwhiles
#else
AreInMeanwhile() ||
@@ -1739,7 +1739,7 @@ void GroupArrivedAtSector( UINT8 ubGroupID, BOOLEAN fCheckForBattle, BOOLEAN fNe
//QUEUE BATTLE!
//Delay arrival by a random value ranging from 3-5 minutes, so it doesn't get the player
//too suspicious after it happens to him a few times, which, by the way, is a rare occurrence.
#if (defined JA2UB)
#ifdef JA2UB
/*Ja25: No meanwhiles*/
#else
if( AreInMeanwhile() )
Strategic/Strategic Status.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void HandleEnricoEmail(void)
UINT8 ubCurrentProgress = CurrentPlayerProgressPercentage();
UINT8 ubHighestProgress = HighestPlayerProgressPercentage();
#if (defined JA2UB)
#ifdef JA2UB
//JA25 UB
#else
// if creatures have attacked a mine (doesn't care if they're still there or not at the moment)
Strategic/Strategic Town Loyalty.cpp
+2 -2
View File
@@ -1865,7 +1865,7 @@ void CheckIfEntireTownHasBeenLiberated( INT8 bTownId, INT16 sSectorX, INT16 sSec
// set fact is has been lib'ed and set history event
AddHistoryToPlayersLog( HISTORY_LIBERATED_TOWN, bTownId, GetWorldTotalMin(), sSectorX, sSectorY );
#if (defined JA2UB)
#ifdef JA2UB
//Ja25: No meanhwiles
#else
HandleMeanWhileEventPostingForTownLiberation( bTownId );
@@ -1903,7 +1903,7 @@ void CheckIfEntireTownHasBeenLost( INT8 bTownId, INT16 sSectorX, INT16 sSectorY
if ( MilitiaTrainingAllowedInSector( sSectorX, sSectorY, 0 ) && IsTownUnderCompleteControlByEnemy(bTownId) )
{
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhile
#else
// the whole town is under enemy control, check if we libed this town before
Strategic/mapscreen.cpp
+1 -1
View File
@@ -5773,7 +5773,7 @@ UINT32 MapScreenHandle(void)
RenderKeyRingPopup( FALSE );
}
#if (defined JA2UB)
#ifdef JA2UB
/* UB */
#else
CheckForMeanwhileOKStart( );
Strategic/strategicmap.cpp
+6 -6
View File
@@ -1487,7 +1487,7 @@ void BeginLoadScreen( void )
SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
#if (defined JA2UB)
#ifdef JA2UB
if( guiCurrentScreen == MAP_SCREEN && !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME) )
#else
//Ja25: No meanwhiles
@@ -1907,7 +1907,7 @@ void GetMapFileName(INT16 sMapX,INT16 sMapY, INT8 bSectorZ, STR8 bString, BOOLEA
}
}
#if (defined JA2UB)
#ifdef JA2UB
/* Ja25: No meanwhiles */
#else
// If we are in a meanwhile...
@@ -2396,7 +2396,7 @@ void PrepareLoadedSector()
BOOLEAN fEnemyPresenceInThisSector = FALSE;
BOOLEAN fAddCivs = TRUE;
INT8 bMineIndex = -1;
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
if( AreInMeanwhile( ) == FALSE )
@@ -2425,7 +2425,7 @@ void PrepareLoadedSector()
if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ))
{
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
if ( !AreReloadingFromMeanwhile( ) )
@@ -2550,7 +2550,7 @@ void PrepareLoadedSector()
{
AddProfilesNotUsingProfileInsertionData();
}
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
if( !AreInMeanwhile() || GetMeanwhileID() == INTERROGATION )
@@ -2935,7 +2935,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY , INT8 bSectorZ )
memset( &(gTacticalStatus.bNumFoughtInBattle), 0, MAXTEAMS );
}
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
if( AreInMeanwhile() == FALSE )