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

Fix: UB compilation

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-04 17:08:00 +00:00
parent 62f8b7d3e8
commit f45c0a3544
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Game Event Hook.cpp
+3 -3
View File
@@ -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 );
Tactical/Food.cpp
+1 -1
View File
@@ -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;