qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do error checking when trying to load a wad file.

Browse source
This commit is contained in:
Bill Currie 2010-09-28 22:17:07 +09:00
parent 997df6c310
commit 939605309f
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/Forge/Bundles/MapEdit/TexturePalette.h
View file

@ -34,10 +34,8 @@ typedef struct {
extern int tex_count; extern int tex_count;
extern qtexture_t qtextures[MAX_TEXTURES]; extern qtexture_t qtextures[MAX_TEXTURES];
void TEX_InitFromWad (const char *path);
qtexture_t *TEX_ForName (const char *name); qtexture_t *TEX_ForName (const char *name);
typedef struct { typedef struct {
NSImageRep *image; NSImageRep *image;
NSRect r; NSRect r;

17
tools/Forge/Bundles/MapEdit/TexturePalette.m
View file

@ -174,7 +174,7 @@ TEX_ImageFromMiptex (wad_t *wad, lumpinfo_t *qtexlump)
TEX_InitFromWad TEX_InitFromWad
================= =================
*/ */
void int
TEX_InitFromWad (const char *path) TEX_InitFromWad (const char *path)
{ {
int i; int i;
@ -186,7 +186,7 @@ TEX_InitFromWad (const char *path)
start = Sys_DoubleTime (); start = Sys_DoubleTime ();
newpath = [preferences_i getProjectPath]; newpath = [preferences_i getProjectPath];
newpath = va ("%s%s%s", newpath, newpath[0] ? "/" : "", path); //XXX safe? newpath = va ("%s%s%s", newpath, newpath[0] ? "/" : "", path);
// free any textures // free any textures
for (i = 0; i < tex_count; i++) for (i = 0; i < tex_count; i++)
@ -196,7 +196,14 @@ TEX_InitFromWad (const char *path)
// try to use the cached wadfile // try to use the cached wadfile
Sys_Printf ("TEX_InitFromWad %s\n", newpath); Sys_Printf ("TEX_InitFromWad %s\n", newpath);
wad = wad_open (newpath); //FIXME error checking wad = wad_open (newpath);
if (!wad) {
NSRunAlertPanel (@"Wad Error!",
[NSString stringWithFormat:@"Failed to open '%s'",
newpath],
@"OK", nil, nil);
return 0;
}
lumpinfo = wad->lumps; lumpinfo = wad->lumps;
@ -219,6 +226,7 @@ TEX_InitFromWad (const char *path)
stop = Sys_DoubleTime (); stop = Sys_DoubleTime ();
Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start); Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start);
return 1;
} }
/* /*
@ -278,7 +286,8 @@ TEX_ForName (const char *name)
selectedTexture = -1; selectedTexture = -1;
// Init textures WAD // Init textures WAD
TEX_InitFromWad (wf); if (!TEX_InitFromWad (wf))
return self;
// Create STORAGE // Create STORAGE
if (textureList_i) if (textureList_i)