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 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
Strategic/Game Init.cpp
+19 -2
View File
@@ -63,7 +63,8 @@
#include "Interface Panels.h"
#endif
//forward declarations of common classes to eliminate includes
#include "text.h"
#include "connect.h"
class OBJECTTYPE;
class SOLDIERTYPE;
@@ -418,7 +419,7 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
ClearTacticalMessageQueue( );
// clear mapscreen messages
FreeGlobalMessageList();
if(!is_networked)FreeGlobalMessageList(); //hayden
// IF our first time, go into laptop!
if ( gubScreenCount == 0 )
@@ -435,6 +436,8 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
// this is for the "mercs climbing down from a rope" animation, NOT Skyrider!!
ResetHeliSeats( );
if(!is_networked)
{
// Setup two new messages!
AddPreReadEmail(OLD_ENRICO_1,OLD_ENRICO_1_LENGTH,MAIL_ENRICO, GetWorldTotalMin() );
AddPreReadEmail(OLD_ENRICO_2,OLD_ENRICO_2_LENGTH,MAIL_ENRICO, GetWorldTotalMin() );
@@ -446,6 +449,7 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
{
AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1 );
}
}
@@ -509,8 +513,21 @@ BOOLEAN InitNewGame( BOOLEAN fReset )
#endif
if(is_networked)
{
SetLaptopExitScreen( MAP_SCREEN ); //hayden
SetPendingNewScreen( MAP_SCREEN );
ScreenMsg( MSG_FONT_WHITE, MSG_CHAT, L"------------------------------------------------------");
ScreenMsg( MSG_FONT_WHITE, MSG_CHAT, MPHelp[0]);
ScreenMsg( MSG_FONT_WHITE, MSG_CHAT, L"------------------------------------------------------");
ScreenMsg( MSG_FONT_WHITE, MSG_CHAT, MPHelp[1]);
}
else
{
SetLaptopExitScreen( INIT_SCREEN );
SetPendingNewScreen(LAPTOP_SCREEN);
}
gubScreenCount = 1;
//Set the fact the game is in progress