mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
- Fixed compilation error for JA2UB define (by anv)
- 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:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user