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

* 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 -2
View File
@@ -896,7 +896,7 @@ void BtnChatTogglesCallback( GUI_BUTTON *btn, INT32 reason )
{
UINT8 ubButton = (UINT8)MSYS_GetBtnUserData( btn, 0 );
if (ubButton == 1 && PLAYER_BSIDE != 1)
if (ubButton == 1 && cGameType != MP_TYPE_TEAMDEATMATCH)
return;
if( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
@@ -1160,7 +1160,7 @@ void EnableDisableChatLogScrollButtonsAndRegions( void )
MSYS_EnableRegion( &gChatLogScrollBarRegion );
}
if (PLAYER_BSIDE==1)
if (cGameType==MP_TYPE_TEAMDEATMATCH)
{
// Only enable Allies toggle for team deathmatch
EnableButton( guiChatToggles[1] );