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

Separate fields for package, instance and type number in .lst files.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2020 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-11-30 02:43:10 +00:00
parent f288968eb2
commit f5fd81058f
54 changed files with 975 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/resource/resinit.c
+19 -24
View File
@@ -117,7 +117,6 @@ loadResourceIndex (uio_Stream *stream, const char *fileName) {
{
char lineBuf[PATH_MAX + 80];
char *ptr;
char *endResPtr;
char *endPtr;
char *path;
char *newPath;
@@ -157,36 +156,32 @@ loadResourceIndex (uio_Stream *stream, const char *fileName) {
if (*ptr == 0)
continue;
// Find the separator between the resource number and the path.
endResPtr = ptr;
do {
endResPtr++;
} while (*endResPtr != '\0' && !isspace (*endResPtr));
// Skip the separator
path = endResPtr;
while (isspace (*path))
path++;
if (*path == 0)
{
// No path present after the line number.
fprintf (stderr, "Resource index '%s': Invalid line %d.\n",
fileName, lineNum);
continue;
}
unsigned int resPackage;
unsigned int resInstance;
unsigned int resType;
unsigned int numParsed;
// Parse the resource number.
{
*endResPtr = '\0';
res = strtoul (ptr, &endResPtr, 16);
if (*endResPtr != '\0')
if (sscanf (ptr, "%i %i %i %n",
&resPackage, &resInstance, &resType, &numParsed) != 3)
{
// Invalid characters in the resource number.
fprintf (stderr, "Resource index '%s': Invalid line %d.\n",
fileName, lineNum);
continue;
}
path = ptr + numParsed;
res = MAKE_RESOURCE (resPackage, resType, resInstance);
}
while (isspace (*path))
path++;
if (*path == '\0')
{
// No path supplied.
fprintf (stderr, "Resource index '%s': Invalid line %d.\n",
fileName, lineNum);
continue;
}
#ifdef DEBUG