[Sc2-cvs] SF.net SVN: sc2:[3655] trunk/sc2/src/options.c

[<av...@us...>]

Revision: 3655
          http://sc2.svn.sourceforge.net/sc2/?rev=3655&view=rev
Author:   avolkov
Date:     2011-07-18 22:17:22 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Minor addon loading cleanup

Modified Paths:
--------------
    trunk/sc2/src/options.c

Modified: trunk/sc2/src/options.c
===================================================================
--- trunk/sc2/src/options.c	2011-07-17 18:31:14 UTC (rev 3654)
+++ trunk/sc2/src/options.c	2011-07-18 22:17:22 UTC (rev 3655)
@@ -420,7 +420,7 @@
 		count = 0;
 		for (i = 0; i < availableAddons->numNames; ++i)
 		{
-			static char mountname[128];
+			char mountname[128];
 			uio_DirHandle *addonDir;
 			const char *addon = availableAddons->names[i];
 			
@@ -430,8 +430,7 @@
 			++count;
 			log_add (log_Info, "    %d. %s", count, addon);
 		
-			snprintf(mountname, 128, "addons/%s", addon);
-			mountname[127]=0;
+			snprintf (mountname, sizeof mountname, "addons/%s", addon);
 
 			addonDir = uio_openDirRelative (addonsDir, addon, 0);
 			if (addonDir == NULL)
@@ -532,6 +531,11 @@
 	}
 
 	numLoaded = loadIndices (addonDir);
+	if (!numLoaded)
+	{
+		log_add (log_Error, "No RMP index files were loaded for addon '%s'",
+				addon);
+	}
 
 	uio_closeDir (addonDir);
 	uio_closeDir (addonsDir);
@@ -583,6 +587,9 @@
 		log_add (log_Info, "Loading addon '%s'", *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;
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.