************************************************************

* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
+2 -3
View File
@@ -329,7 +329,6 @@ void HandleMPSScreen()
switch( gubMPSScreenHandler )
{
case MPS_CANCEL:
// TODO.RW: Exit game, disconnect
if (is_server)
server_disconnect();
@@ -475,7 +474,7 @@ BOOLEAN RenderMPSScreen()
}
}
if (PLAYER_BSIDE==MP_TYPE_COOP)
if (cGameType==MP_TYPE_COOP)
{
// CO-OP Mode, show stats for queens army
usPosY = MPS_PLAYERLIST_Y + (5 * MPS_PLAYER_GAP); // leave a space between players and AI
@@ -610,7 +609,7 @@ void DoneFadeOutForExitMPSScreen( void )
}
else
#endif
SetIntroType( INTRO_BEGINING );
SetIntroType( INTRO_BEGINNING );
ExitMPSScreen(); // cleanup please, if we called a fadeout then we didnt do it above