Merged Multi Player Project into main branch

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
+12 -3
View File
@@ -38,7 +38,7 @@
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
class SOLDIERTYPE;
#include "connect.h"
extern INT32 iCurrentMapSectorZ;
@@ -377,7 +377,9 @@ void RenderRadarScreen( )
SetObjectHandleShade( gusRadarImage, 0 );
//If night time and on surface, darken the radarmap.
if( NightTime() )
// WANNE - MP: Only darken the radarmap in single player mode
if( NightTime() && !is_networked )//hayden
{
if( guiCurrentScreen == MAP_SCREEN && !iCurrentMapSectorZ ||
guiCurrentScreen == GAME_SCREEN && !gbWorldSectorZ )
@@ -559,7 +561,14 @@ void RenderRadarScreen( )
// Don't place guys in radar until visible!
if ( pSoldier->bVisible == -1 && !(gTacticalStatus.uiFlags&SHOW_ALL_MERCS) && !(pSoldier->ubMiscSoldierFlags & SOLDIER_MISC_XRAYED) )
{
continue;
//hayden
if(is_networked && pSoldier->bSide==0)
{
}
else
{
continue;// ie dont render
}
}
// Don't render guys if they are dead!