From f45c0a35442a3c7786c21e98dfcc77c1d1f3986e Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 4 Mar 2018 17:08:00 +0000 Subject: [PATCH] Fix: UB compilation git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8535 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Game Event Hook.cpp | 6 +++--- Tactical/Food.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index e6fff5a61..5e7c229d7 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -608,9 +608,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) RepairSamSite( pEvent->uiParam ); break; -#ifdef JA2UB - // No Kingpin Events in UB -#else +#ifndef JA2UB case EVENT_MILITIAROSTER_EMAIL: AddEmail( MILITIAROSTER_INTRO, MILITIAROSTER_INTRO_LENGTH, MAIL_ENRICO, GetWorldTotalMin( ), -1, -1, TYPE_EMAIL_EMAIL_EDT ); break; @@ -637,9 +635,11 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) ChangeWeather( (UINT8)pEvent->uiParam, WEATHER_FORECAST_SNOW ); break; +#ifndef JA2UB case EVENT_INTEL_ENRICO_EMAIL: AddEmail( INTEL_ENRICO_INTRO, INTEL_ENRICO_INTRO_LENGTH, MAIL_ENRICO, GetWorldTotalMin(), -1, -1, TYPE_EMAIL_EMAIL_EDT ); break; +#endif case EVENT_INTEL_PHOTOFACT_VERIFY: LuaVerifyPhotoState( (INT16)pEvent->uiParam ); diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index 0bb043fed..a809f387e 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -382,7 +382,7 @@ void HourlyFoodSituationUpdate( SOLDIERTYPE *pSoldier ) else activitymodifier = gGameExternalOptions.sFoodDigestionTravel; } - else if ( pSoldier->bAssignment > DOCTOR ) // unclear why this does not include DOCTOR assignment??? + else if ( pSoldier->bAssignment > ON_DUTY ) activitymodifier = gGameExternalOptions.sFoodDigestionAssignment; else if ( (gTacticalStatus.uiFlags & INCOMBAT) ) activitymodifier = gGameExternalOptions.sFoodDigestionCombat;