From 5e5035458a90fa43a3dcc892617ef6fe5c148f76 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 26 Feb 2008 20:28:06 +0000 Subject: [PATCH] - Improved previous bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1855 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- gamescreen.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gamescreen.cpp b/gamescreen.cpp index d8dba286..89e3f7eb 100644 --- a/gamescreen.cpp +++ b/gamescreen.cpp @@ -1115,9 +1115,11 @@ void InitHelicopterEntranceByMercs( void ) // Update clock ahead from STARTING_TIME to make mercs arrive! WarpGameTime( gGameExternalOptions.iFirstArrivalDelay, WARPTIME_PROCESS_EVENTS_NORMALLY ); - // WANNE: fix HOT DAY in night at arrival by night. Maybe gubEnvLightValue=12 is no good value.. - // Maybe we should add a switch-case for different night times and set gubEnvLightValue to differnt values - if( gGameExternalOptions.iFirstArrivalDelay < 21599) + // WANNE: fix HOT DAY in night at arrival by night. + // Explanation: If game starting time + first arrival delay < 07:00 (111600) -> we arrive before the sun rises or + // if game starting time + first arrival delay >= 21:00 (162000) -> we arrive after the sun goes down + if( (gGameExternalOptions.iGameStartingTime + gGameExternalOptions.iFirstArrivalDelay) < 111600 || + (gGameExternalOptions.iGameStartingTime + gGameExternalOptions.iFirstArrivalDelay >= 162000)) { gubEnvLightValue = 12; LightSetBaseLevel(gubEnvLightValue);