adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3552 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2011-02-12 21:29:10 +00:00
parent 3fe05b2562
commit fc88f86cba
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7: Changes towards version 0.7:
- Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh
- Fixed ship picking order after a simultaneous destruction, e.g. - Fixed ship picking order after a simultaneous destruction, e.g.
Shofixti picks last after Glory device (bugs #1087, #1088) - Alex Shofixti picks last after Glory device (bugs #1087, #1088) - Alex
- Game no longer locks up after quickly escaping melee (bug #1003) - Alex - Game no longer locks up after quickly escaping melee (bug #1003) - Alex
sc2/src/uqm/supermelee/melee.c
+3 -2
View File
@@ -44,7 +44,7 @@
// for DrawShadowedBox() // for DrawShadowedBox()
# include "../cnctdlg.h" # include "../cnctdlg.h"
// for MeleeConnectDialog() // for MeleeConnectDialog()
#endif #endif /* defined (NETPLAY) */
#include "../resinst.h" #include "../resinst.h"
#include "../settings.h" #include "../settings.h"
#include "../setup.h" #include "../setup.h"
@@ -2501,6 +2501,8 @@ Melee_LocalChange_team (MELEE_STATE *pMS, size_t teamNr,
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifdef NETPLAY
// Send the entire team to the remote side. Used when the connection has // Send the entire team to the remote side. Used when the connection has
// just been established, or after the setup menu is reentered after battle. // just been established, or after the setup menu is reentered after battle.
void void
@@ -2536,7 +2538,6 @@ Melee_bootstrapSyncTeam (MELEE_STATE *meleeState, size_t teamNr)
// The behavior of these functions (and the comments therein) follow the // The behavior of these functions (and the comments therein) follow the
// description in doc/devel/netplay/protocol. // description in doc/devel/netplay/protocol.
#ifdef NETPLAY
void void
Melee_RemoteChange_ship (MELEE_STATE *pMS, NetConnection *conn, COUNT side, Melee_RemoteChange_ship (MELEE_STATE *pMS, NetConnection *conn, COUNT side,
FleetShipIndex index, MeleeShip ship) FleetShipIndex index, MeleeShip ship)