1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged Multi Player Project into main branch

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-05-12 08:20:47 +00:00
parent c448713412
commit 3e22dce318
132 changed files with 14527 additions and 4859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamescreen.cpp
+3 -2
View File
@@ -88,6 +88,7 @@
#include "Scheduling.h"
#endif
#include "connect.h"
#define ARE_IN_FADE_IN( ) ( gfFadeIn || gfFadeInitialized )
@@ -554,7 +555,7 @@ UINT32 MainGameScreenHandle(void)
{
if ( gTacticalStatus.fEnemySightingOnTheirTurn )
{
if ( ( GetJA2Clock( ) - gTacticalStatus.uiTimeSinceDemoOn ) > 3000 )
if ( (( GetJA2Clock( ) - gTacticalStatus.uiTimeSinceDemoOn ) > 3000) || is_client)//unpause straight away if in MP
{
if ( gTacticalStatus.ubCurrentTeam != gbPlayerNum )
{
@@ -1115,7 +1116,7 @@ void InitHelicopterEntranceByMercs( void )
// 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 ||
if( (gGameExternalOptions.iGameStartingTime + gGameExternalOptions. iFirstArrivalDelay) < 111600 ||
(gGameExternalOptions.iGameStartingTime + gGameExternalOptions.iFirstArrivalDelay >= 162000))
{
gubEnvLightValue = 12;