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

*** Merged Code from Multiplayer Branch Revision 2960 ***

Browse Source 
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 21:01:45 +00:00
parent 17f44f63e8
commit 47db604b50
301 changed files with 76701 additions and 1843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+26 -13
View File
@@ -117,6 +117,16 @@
#include "test_space.h"
#include "connect.h"
// OJW - 20090419
UINT8 giMAXIMUM_NUMBER_OF_PLAYER_MERCS = CODE_MAXIMUM_NUMBER_OF_PLAYER_MERCS;
UINT8 giMAXIMUM_NUMBER_OF_PLAYER_VEHICLES = CODE_MAXIMUM_NUMBER_OF_PLAYER_VEHICLES;
UINT8 giMAXIMUM_NUMBER_OF_PLAYER_SLOTS = CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS;
UINT8 giMAXIMUM_NUMBER_OF_ENEMIES = CODE_MAXIMUM_NUMBER_OF_ENEMIES;
UINT8 giMAXIMUM_NUMBER_OF_CREATURES = CODE_MAXIMUM_NUMBER_OF_CREATURES;
UINT8 giMAXIMUM_NUMBER_OF_REBELS = CODE_MAXIMUM_NUMBER_OF_REBELS;
UINT8 giMAXIMUM_NUMBER_OF_CIVS = CODE_MAXIMUM_NUMBER_OF_CIVS;
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
class SOLDIERTYPE;
@@ -362,16 +372,16 @@ UINT8 bDefaultTeamRanges[ MAXTEAMS_SP ][ 2 ] =
COLORVAL bDefaultTeamColors[ MAXTEAMS ] =
{
FROMRGB( 255, 255, 0 ),
FROMRGB( 255, 255, 0 ), // own team: yellow
FROMRGB( 255, 0, 0 ),
FROMRGB( 255, 0, 255 ),
FROMRGB( 0, 255, 0 ),
FROMRGB( 255, 255, 255 ),
FROMRGB( 0, 0, 255 ),
FROMRGB( 255, 156, 49 ), //hayden //team 1 (radar colours)
FROMRGB( 49, 255, 207 ), //2
FROMRGB( 193, 85, 255 ), //3
FROMRGB( 0, 255, 115 ) //4
FROMRGB( 255, 120, 0 ), //hayden //team 1 (radar colours) // orange
FROMRGB( 62, 140, 240 ), //2 // light blue
FROMRGB( 180, 50, 255 ), //3 // violett
FROMRGB( 0, 180, 20 ) //4 // green
};
@@ -7075,16 +7085,19 @@ BOOLEAN CheckForLosingEndOfBattle( )
gfKillingGuysForLosingBattle = FALSE;
if ( fDoCapture )
// WANNE - MP: Only do special scenes (capture, ...) in a single player game
if (!is_networked)
{
EndCaptureSequence( );
SetCustomizableTimerCallbackAndDelay( 3000, CaptureTimerCallback, FALSE );
if ( fDoCapture )
{
EndCaptureSequence( );
SetCustomizableTimerCallbackAndDelay( 3000, CaptureTimerCallback, FALSE );
}
else
{
SetCustomizableTimerCallbackAndDelay( 10000, DeathTimerCallback, FALSE );
}
}
else
{
SetCustomizableTimerCallbackAndDelay( 10000, DeathTimerCallback, FALSE );
}
}
return( TRUE );
}