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

Mounting packed ani/font files does not actually need to be relative to content mount.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3091 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2008-10-17 20:49:24 +00:00
parent 72e31c75db
commit a40a51cd71
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/options.c
+2 -1
View File
@@ -60,7 +60,6 @@ uio_DirHandle *contentDir;
uio_DirHandle *configDir; uio_DirHandle *configDir;
uio_DirHandle *saveDir; uio_DirHandle *saveDir;
uio_DirHandle *meleeDir; uio_DirHandle *meleeDir;
uio_MountHandle *contentMountHandle;
char baseContentPath[PATH_MAX]; char baseContentPath[PATH_MAX];
@@ -315,6 +314,8 @@ mountContentDir (uio_Repository *repository, const char *contentPath)
{ {
uio_DirHandle *packagesDir, *addonsDir; uio_DirHandle *packagesDir, *addonsDir;
static uio_AutoMount *autoMount[] = { NULL }; static uio_AutoMount *autoMount[] = { NULL };
uio_MountHandle *contentMountHandle;
availableAddons = NULL; availableAddons = NULL;
contentMountHandle = uio_mountDir (repository, "/", contentMountHandle = uio_mountDir (repository, "/",
sc2/src/options.h
-2
View File
@@ -50,8 +50,6 @@ extern uio_DirHandle *saveDir;
extern uio_DirHandle *meleeDir; extern uio_DirHandle *meleeDir;
extern char baseContentPath[PATH_MAX]; extern char baseContentPath[PATH_MAX];
extern uio_MountHandle *contentMountHandle;
extern uio_DirList *availableAddons; extern uio_DirList *availableAddons;
extern const char **optAddons; extern const char **optAddons;
sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c
+4 -4
View File
@@ -426,8 +426,8 @@ _GetCelData (uio_Stream *fp, DWORD length)
aniDir = uio_openDir (repository, aniDirName, 0); aniDir = uio_openDir (repository, aniDirName, 0);
aniMount = uio_mountDir (repository, aniDirName, uio_FSTYPE_ZIP, aniMount = uio_mountDir (repository, aniDirName, uio_FSTYPE_ZIP,
aniDir, aniFileName, "/", autoMount, aniDir, aniFileName, "/", autoMount,
uio_MOUNT_RDONLY | uio_MOUNT_ABOVE, uio_MOUNT_RDONLY | uio_MOUNT_TOP,
contentMountHandle); NULL);
aniFile = uio_fopen (aniDir, aniFileName, "r"); aniFile = uio_fopen (aniDir, aniFileName, "r");
opos = 0; opos = 0;
n = 0; n = 0;
@@ -631,8 +631,8 @@ _GetFontData (uio_Stream *fp, DWORD length)
fontDirHandle = uio_openDir (repository, fontDirName, 0); fontDirHandle = uio_openDir (repository, fontDirName, 0);
fontMount = uio_mountDir (repository, _cur_resfile_name, uio_FSTYPE_ZIP, fontMount = uio_mountDir (repository, _cur_resfile_name, uio_FSTYPE_ZIP,
fontDirHandle, fontZipName, "/", autoMount, fontDirHandle, fontZipName, "/", autoMount,
uio_MOUNT_RDONLY | uio_MOUNT_ABOVE, uio_MOUNT_RDONLY | uio_MOUNT_TOP,
contentMountHandle); NULL);
uio_closeDir (fontDirHandle); uio_closeDir (fontDirHandle);
} }