From fc88f86cbad5ecd712cd00328f91b6836148f6dc Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Sat, 12 Feb 2011 21:29:10 +0000 Subject: [PATCH] Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3552 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/uqm/supermelee/melee.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 94c1d5467..abdaaedbf 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ 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. Shofixti picks last after Glory device (bugs #1087, #1088) - Alex - Game no longer locks up after quickly escaping melee (bug #1003) - Alex diff --git a/sc2/src/uqm/supermelee/melee.c b/sc2/src/uqm/supermelee/melee.c index 1ae11f272..18141a6d3 100644 --- a/sc2/src/uqm/supermelee/melee.c +++ b/sc2/src/uqm/supermelee/melee.c @@ -44,7 +44,7 @@ // for DrawShadowedBox() # include "../cnctdlg.h" // for MeleeConnectDialog() -#endif +#endif /* defined (NETPLAY) */ #include "../resinst.h" #include "../settings.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 // just been established, or after the setup menu is reentered after battle. void @@ -2536,7 +2538,6 @@ Melee_bootstrapSyncTeam (MELEE_STATE *meleeState, size_t teamNr) // The behavior of these functions (and the comments therein) follow the // description in doc/devel/netplay/protocol. -#ifdef NETPLAY void Melee_RemoteChange_ship (MELEE_STATE *pMS, NetConnection *conn, COUNT side, FleetShipIndex index, MeleeShip ship)