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

Accept spaces in argument to '--contentdir'.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1242 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-09-19 01:07:47 +00:00
parent 9b96b8d9b8
commit 3652e93ad8
4 changed files with 9 additions and 8 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.4: Changes towards version 0.4:
- Accept spaces in --contentdir argument. - SvdB
- Separated and abstracted sound buffer-tagging and trackplayer - Separated and abstracted sound buffer-tagging and trackplayer
clip/subtitle chaining -Alex clip/subtitle chaining -Alex
- Abstracted the recursive mutexes in MixSDL and DCQ code -Michael - Abstracted the recursive mutexes in MixSDL and DCQ code -Michael
sc2/src/options.c
+1 -1
View File
@@ -55,7 +55,7 @@ static void mountDirZips (uio_MountHandle *contentHandle,
uio_DirHandle *dirHandle); uio_DirHandle *dirHandle);
void void
prepareContentDir (char *contentDirName, const char **addons) prepareContentDir (const char *contentDirName, const char **addons)
{ {
const char *testfile = "version"; const char *testfile = "version";
char cwd[PATH_MAX]; char cwd[PATH_MAX];
sc2/src/options.h
+1 -1
View File
@@ -44,7 +44,7 @@ extern uio_DirHandle *configDir;
extern uio_DirHandle *saveDir; extern uio_DirHandle *saveDir;
extern uio_DirHandle *meleeDir; extern uio_DirHandle *meleeDir;
void prepareContentDir (char *contentDirName, const char **addons); void prepareContentDir (const char *contentDirName, const char **addons);
void prepareConfigDir(void); void prepareConfigDir(void);
void prepareMeleeDir(void); void prepareMeleeDir(void);
void prepareSaveDir(void); void prepareSaveDir(void);
sc2/src/starcon2.c
+6 -6
View File
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
int width = 640, height = 480, bpp = 16; int width = 640, height = 480, bpp = 16;
int vol; int vol;
int val; int val;
char contentdir[1000]; const char *contentDir;
float gamma = 1.0; float gamma = 1.0;
int gammaset = 0; int gammaset = 0;
const char **addons; const char **addons;
@@ -127,11 +127,11 @@ main (int argc, char *argv[])
__DATE__, __TIME__); __DATE__, __TIME__);
#ifdef CONTENTDIR #ifdef CONTENTDIR
strcpy (contentdir, CONTENTDIR); contentDir = CONTENTDIR;
#elif defined (win32) #elif defined (win32)
strcpy (contentdir, "../../content"); contentDir = "../../content";
#else #else
strcpy (contentdir, "content"); contentDir = "content";
#endif #endif
/* InitThreadSystem should come before anything else. /* InitThreadSystem should come before anything else.
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
gfxflags |= TFB_GFXFLAGS_SHOWFPS; gfxflags |= TFB_GFXFLAGS_SHOWFPS;
break; break;
case 'n': case 'n':
sscanf(optarg, "%s", contentdir); contentDir = optarg;
break; break;
case 'M': case 'M':
sscanf(optarg, "%d", &vol); sscanf(optarg, "%d", &vol);
@@ -338,7 +338,7 @@ main (int argc, char *argv[])
} }
initIO(); initIO();
prepareContentDir (contentdir, addons); prepareContentDir (contentDir, addons);
HFree ((void*)addons); HFree ((void*)addons);
prepareConfigDir (); prepareConfigDir ();
prepareMeleeDir (); prepareMeleeDir ();