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

- Removed the "JA113NODEMO" define

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-08-24 08:15:20 +00:00
parent 061ea16cea
commit 114f0064c4
38 changed files with 87 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Game Event Hook.cpp
+2 -2
View File
@@ -221,7 +221,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 || defined JA113NODEMO)
#if (defined JA2UB)
//No JA25 UB
#else
AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1, -1 ,TYPE_EMAIL_EMAIL_EDT );
@@ -361,7 +361,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
// BeginAirRaid( );
// break;
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
// Ja25 No meanwhiles
#else
case EVENT_MEANWHILE: