1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Multiplayer Updates:

Browse Source 
o Fixed problem in score screen (stack around variable szPlayerMisses was corrupt)
o Increased connection timeout to 120 seconds, which hopefully avoids the ID_CONNECTION_LOST when trying to connect with high ping
o Fixed wrong message in message box, when clients connection got lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-06-22 21:20:38 +00:00
parent 0d661ec0cf
commit b932d1accf
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MPScoreScreen.cpp
+12 -12
View File
@@ -419,10 +419,10 @@ BOOLEAN RenderMPSScreen()
// Draw players // Draw players
wchar_t szPlayerName[30]; wchar_t szPlayerName[30];
wchar_t szPlayerKills[3]; wchar_t szPlayerKills[4];
wchar_t szPlayerDeaths[3]; wchar_t szPlayerDeaths[4];
wchar_t szPlayerHits[3]; wchar_t szPlayerHits[4];
wchar_t szPlayerMisses[3]; wchar_t szPlayerMisses[4];
wchar_t szPlayerAccuracy[8]; wchar_t szPlayerAccuracy[8];
float flAccuracy = 0; float flAccuracy = 0;
for(int i=0; i < 4; i++) for(int i=0; i < 4; i++)
@@ -441,22 +441,22 @@ BOOLEAN RenderMPSScreen()
DisplayWrappedString( MPS_LABEL_PLAYER_X, usPosY, MPS_LABEL_PLAYER_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerName, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_PLAYER_X, usPosY, MPS_LABEL_PLAYER_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerName, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Kills Column // Draw Kills Column
memset(szPlayerKills,0,3*sizeof(wchar_t)); memset(szPlayerKills,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[i].kills,szPlayerKills,10); _itow(gMPPlayerStats[i].kills,szPlayerKills,10);
DisplayWrappedString( MPS_LABEL_KILLS_X, usPosY, MPS_LABEL_KILLS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerKills, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_KILLS_X, usPosY, MPS_LABEL_KILLS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerKills, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Deaths Column // Draw Deaths Column
memset(szPlayerDeaths,0,3*sizeof(wchar_t)); memset(szPlayerDeaths,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[i].deaths,szPlayerDeaths,10); _itow(gMPPlayerStats[i].deaths,szPlayerDeaths,10);
DisplayWrappedString( MPS_LABEL_DEATHS_X, usPosY, MPS_LABEL_DEATHS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerDeaths, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_DEATHS_X, usPosY, MPS_LABEL_DEATHS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerDeaths, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Hits Column // Draw Hits Column
memset(szPlayerHits,0,3*sizeof(wchar_t)); memset(szPlayerHits,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[i].hits,szPlayerHits,10); _itow(gMPPlayerStats[i].hits,szPlayerHits,10);
DisplayWrappedString( MPS_LABEL_HITS_X, usPosY, MPS_LABEL_HITS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerHits, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_HITS_X, usPosY, MPS_LABEL_HITS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerHits, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Misses Column // Draw Misses Column
memset(szPlayerMisses,0,3*sizeof(wchar_t)); memset(szPlayerMisses,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[i].misses,szPlayerMisses,10); _itow(gMPPlayerStats[i].misses,szPlayerMisses,10);
DisplayWrappedString( MPS_LABEL_MISSES_X, usPosY, MPS_LABEL_MISSES_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerMisses, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_MISSES_X, usPosY, MPS_LABEL_MISSES_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerMisses, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
@@ -483,22 +483,22 @@ BOOLEAN RenderMPSScreen()
DisplayWrappedString( MPS_LABEL_PLAYER_X, usPosY, MPS_LABEL_PLAYER_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, gzMPSScreenText[MPS_AITEAM_TEXT], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_PLAYER_X, usPosY, MPS_LABEL_PLAYER_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, gzMPSScreenText[MPS_AITEAM_TEXT], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Kills Column // Draw Kills Column
memset(szPlayerKills,0,3*sizeof(wchar_t)); memset(szPlayerKills,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[4].kills,szPlayerKills,10); _itow(gMPPlayerStats[4].kills,szPlayerKills,10);
DisplayWrappedString( MPS_LABEL_KILLS_X, usPosY, MPS_LABEL_KILLS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerKills, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_KILLS_X, usPosY, MPS_LABEL_KILLS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerKills, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Deaths Column // Draw Deaths Column
memset(szPlayerDeaths,0,3*sizeof(wchar_t)); memset(szPlayerDeaths,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[4].deaths,szPlayerDeaths,10); _itow(gMPPlayerStats[4].deaths,szPlayerDeaths,10);
DisplayWrappedString( MPS_LABEL_DEATHS_X, usPosY, MPS_LABEL_DEATHS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerDeaths, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_DEATHS_X, usPosY, MPS_LABEL_DEATHS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerDeaths, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Hits Column // Draw Hits Column
memset(szPlayerHits,0,3*sizeof(wchar_t)); memset(szPlayerHits,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[4].hits,szPlayerHits,10); _itow(gMPPlayerStats[4].hits,szPlayerHits,10);
DisplayWrappedString( MPS_LABEL_HITS_X, usPosY, MPS_LABEL_HITS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerHits, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_HITS_X, usPosY, MPS_LABEL_HITS_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerHits, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
// Draw Misses Column // Draw Misses Column
memset(szPlayerMisses,0,3*sizeof(wchar_t)); memset(szPlayerMisses,0,4*sizeof(wchar_t));
_itow(gMPPlayerStats[4].misses,szPlayerMisses,10); _itow(gMPPlayerStats[4].misses,szPlayerMisses,10);
DisplayWrappedString( MPS_LABEL_MISSES_X, usPosY, MPS_LABEL_MISSES_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerMisses, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); DisplayWrappedString( MPS_LABEL_MISSES_X, usPosY, MPS_LABEL_MISSES_WIDTH, 2, MPS_LABEL_TEXT_FONT, MPS_LABEL_TEXT_COLOR, szPlayerMisses, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
Multiplayer/client.cpp
+1 -1
View File
@@ -4346,7 +4346,7 @@ void HandleClientConnectionLost()
if (wcscmp(gszDisconnectReason,L"")==0) if (wcscmp(gszDisconnectReason,L"")==0)
{ {
UINT32 giMPHMessageBox = DoMessageBox( MSG_BOX_BASIC_STYLE, (recieved_settings ? MPClientMessage[48] : MPClientMessage[55] ), guiCurrentScreen, ( UINT16 ) ( MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT ),disconnected_callback, &CenteringRect ); UINT32 giMPHMessageBox = DoMessageBox( MSG_BOX_BASIC_STYLE, MPClientMessage[48], guiCurrentScreen, ( UINT16 ) ( MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT ),disconnected_callback, &CenteringRect );
} }
else else
{ {
Multiplayer/server.cpp
+6
View File
@@ -1018,9 +1018,15 @@ void start_server (void)
ScreenMsg( FONT_ORANGE, MSG_MPSYSTEM, MPServerMessage[0] ); ScreenMsg( FONT_ORANGE, MSG_MPSYSTEM, MPServerMessage[0] );
server=RakNetworkFactory::GetRakPeerInterface(); server=RakNetworkFactory::GetRakPeerInterface();
// WANNE: Set higher timeout than default (30 seconds)
server->SetTimeoutTime(120000, UNASSIGNED_SYSTEM_ADDRESS); // 120 Seconds
bool b = server->Startup(gMaxClients, 30, &SocketDescriptor(serverPort,0), 1); bool b = server->Startup(gMaxClients, 30, &SocketDescriptor(serverPort,0), 1);
server->SetMaximumIncomingConnections((gMaxClients)); server->SetMaximumIncomingConnections((gMaxClients));
server->SetOccasionalPing(true);
//RPC's //RPC's
REGISTER_STATIC_RPC(server, sendPATH); REGISTER_STATIC_RPC(server, sendPATH);