diff --git a/sc2/ChangeLog b/sc2/ChangeLog index d8592180e..a616e3feb 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Fix compilation without Netplay support - SvdB - Added limited AIFF sound file decoder for playing 3DO originals; SDX2 decoder by SvdB - Alex - Typo fix in Starbase speech (bug #959) - Michael diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index 0ad5e885f..cdccab0af 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -1033,8 +1033,7 @@ ReadTeamImage (TEAM_IMAGE *pTI, uio_Stream *load_fp) } static int -LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, - UNICODE* pFilePath) +LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, UNICODE* pFilePath) { UNICODE file[NAME_MAX]; // local buf if needed UNICODE *pfile; @@ -2174,6 +2173,7 @@ StartMeleeButtonPressed (PMELEE_STATE pMS) return; } +#ifdef NETPLAY if ((PlayerControl[0] & NETWORK_CONTROL) && (PlayerControl[1] & NETWORK_CONTROL)) { @@ -2193,7 +2193,6 @@ StartMeleeButtonPressed (PMELEE_STATE pMS) return; } -#ifdef NETPLAY // Check whether all network parties are ready; { COUNT player;