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

Fix compilation without Netplay support. (Was fixed in CVS, but after

Browse Source 
we moved to SVN).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2684 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2007-01-28 13:15:39 +00:00
parent f7ae44c379
commit 68aa444425
2 changed files with 3 additions and 3 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:
- Fix compilation without Netplay support - SvdB
- Added limited AIFF sound file decoder for playing 3DO originals; - Added limited AIFF sound file decoder for playing 3DO originals;
SDX2 decoder by SvdB - Alex SDX2 decoder by SvdB - Alex
- Typo fix in Starbase speech (bug #959) - Michael - Typo fix in Starbase speech (bug #959) - Michael
sc2/src/sc2code/melee.c
+2 -3
View File
@@ -1033,8 +1033,7 @@ ReadTeamImage (TEAM_IMAGE *pTI, uio_Stream *load_fp)
} }
static int static int
LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, UNICODE* pFilePath)
UNICODE* pFilePath)
{ {
UNICODE file[NAME_MAX]; // local buf if needed UNICODE file[NAME_MAX]; // local buf if needed
UNICODE *pfile; UNICODE *pfile;
@@ -2174,6 +2173,7 @@ StartMeleeButtonPressed (PMELEE_STATE pMS)
return; return;
} }
#ifdef NETPLAY
if ((PlayerControl[0] & NETWORK_CONTROL) && if ((PlayerControl[0] & NETWORK_CONTROL) &&
(PlayerControl[1] & NETWORK_CONTROL)) (PlayerControl[1] & NETWORK_CONTROL))
{ {
@@ -2193,7 +2193,6 @@ StartMeleeButtonPressed (PMELEE_STATE pMS)
return; return;
} }
#ifdef NETPLAY
// Check whether all network parties are ready; // Check whether all network parties are ready;
{ {
COUNT player; COUNT player;