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

Revert part of the change that wasn't ready to be committed.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@247 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2002-11-27 19:26:12 +00:00
parent 2a412bf68c
commit 5d7a33325a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/melee.c
+6 -6
View File
@@ -18,7 +18,9 @@
#include <ctype.h> #include <ctype.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/param.h>
#include "starcon.h" #include "starcon.h"
#include "options.h"
#include "melee.h" #include "melee.h"
#include "options.h" #include "options.h"
@@ -1757,10 +1759,8 @@ Melee (void)
LoadMeleeInfo (&MenuState); LoadMeleeInfo (&MenuState);
{ {
FILE *load_fp; FILE *load_fp;
char file[MAXPATHLEN];
load_fp = OpenResFile ("melee.cfg", "rb");
sprintf (file, "%smelee.cfg", configDir);
load_fp = OpenResFile (file, "rb");
if (load_fp) if (load_fp)
{ {
int status; int status;
@@ -1800,6 +1800,7 @@ Melee (void)
MenuState.star_bucks[1] = GetTeamValue (&MenuState.TeamImage[1]); MenuState.star_bucks[1] = GetTeamValue (&MenuState.TeamImage[1]);
DoInput ((PVOID)&MenuState); DoInput ((PVOID)&MenuState);
char file[MAXPATHLEN];
while (SoundPlaying ()) while (SoundPlaying ())
; ;
@@ -1809,8 +1810,7 @@ Melee (void)
BOOLEAN err; BOOLEAN err;
err = FALSE; err = FALSE;
sprintf (file, "%smelee.cfg", configDir); save_fp = OpenResFile ("melee.cfg", "wb");
save_fp = OpenResFile (file, "wb");
if (save_fp) if (save_fp)
{ {
if (PutResFileChar (PlayerControl[0], save_fp) == -1) if (PutResFileChar (PlayerControl[0], save_fp) == -1)