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

Minor addon loading cleanup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3655 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-07-18 22:17:22 +00:00
parent b783c259f6
commit ce51a50cb0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/options.c
+10 -3
View File
@@ -420,7 +420,7 @@ mountAddonDir (uio_Repository *repository, uio_MountHandle *contentMountHandle,
count = 0; count = 0;
for (i = 0; i < availableAddons->numNames; ++i) for (i = 0; i < availableAddons->numNames; ++i)
{ {
static char mountname[128]; char mountname[128];
uio_DirHandle *addonDir; uio_DirHandle *addonDir;
const char *addon = availableAddons->names[i]; const char *addon = availableAddons->names[i];
@@ -430,8 +430,7 @@ mountAddonDir (uio_Repository *repository, uio_MountHandle *contentMountHandle,
++count; ++count;
log_add (log_Info, " %d. %s", count, addon); log_add (log_Info, " %d. %s", count, addon);
snprintf(mountname, 128, "addons/%s", addon); snprintf (mountname, sizeof mountname, "addons/%s", addon);
mountname[127]=0;
addonDir = uio_openDirRelative (addonsDir, addon, 0); addonDir = uio_openDirRelative (addonsDir, addon, 0);
if (addonDir == NULL) if (addonDir == NULL)
@@ -532,6 +531,11 @@ loadAddon (const char *addon)
} }
numLoaded = loadIndices (addonDir); numLoaded = loadIndices (addonDir);
if (!numLoaded)
{
log_add (log_Error, "No RMP index files were loaded for addon '%s'",
addon);
}
uio_closeDir (addonDir); uio_closeDir (addonDir);
uio_closeDir (addonsDir); uio_closeDir (addonsDir);
@@ -583,6 +587,9 @@ prepareAddons (const char **addons)
log_add (log_Info, "Loading addon '%s'", *addons); log_add (log_Info, "Loading addon '%s'", *addons);
if (!loadAddon (*addons)) if (!loadAddon (*addons))
{ {
// TODO: Should we do something like inform the user?
// Why simply refuse to load other addons?
// Maybe exit() to inform the user of the failure?
break; break;
} }
} }