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

Cope gracefully with wadfiles we can't handle

Browse source 
This is a weird little diff. We're doing a lot of gymnastics here so that
we don't have to crash (killing any loaded unsaved work!) when we find a
wadfile we don't know how to deal with.
This commit is contained in:
Jeff Teunissen 2010-10-10 06:20:20 -04:00 committed by Bill Currie
parent 6702f04b46
commit 74d959ec64
1 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,6 +155,8 @@ TEX_ImageFromMiptex (wad_t *wad, lumpinfo_t *qtexlump)
q->width = width; q->width = width;
q->height = height; q->height = height;
if (q->rep)
[q->rep release];
q->rep = bm; q->rep = bm;
q->data = dest; q->data = dest;
@ -189,38 +191,33 @@ TEX_InitFromWad (const char *path)
float start, stop; float start, stop;
wad_t *wad; wad_t *wad;
lumpinfo_t *lumpinfo; lumpinfo_t *lumpinfo;
NSString *errmsg;
int old_tex_count;
start = Sys_DoubleTime (); start = Sys_DoubleTime ();
newpath = [[project_i baseDirectoryPath] cString]; newpath = [[project_i baseDirectoryPath] cString];
newpath = va ("%s%s%s", newpath, (newpath[0] ? "/" : ""), path); newpath = va ("%s%s%s", newpath, (newpath[0] ? "/" : ""), path);
errmsg = [NSString stringWithFormat: @"Failed to open '%s'", newpath];
// free any textures
for (i = 0; i < tex_count; i++)
[qtextures[i].rep release];
tex_count = 0;
Sys_Printf ("TEX_InitFromWad: loading %s\n", newpath); Sys_Printf ("TEX_InitFromWad: loading %s\n", newpath);
wad = wad_open (newpath); wad = wad_open (newpath);
if (!wad) { if (!wad) {
NSRunAlertPanel (@"Wad Error!", Sys_Printf ("TEX_InitFromWad: wad_open(%s) failed\n", path);
[NSString stringWithFormat: @"Failed to open '%s'", goto cleanup;
newpath],
@"OK", nil,
nil);
return 0;
} }
lumpinfo = wad->lumps; lumpinfo = wad->lumps;
if (strcmp (lumpinfo->name, "PALETTE")) { if (strcasecmp (lumpinfo->name, "PALETTE")) {
lumpinfo_t tlump; lumpinfo_t tlump;
Sys_Printf ("TEX_InitFromWad: %s doesn't have palette at index 0\n", path); Sys_Printf ("TEX_InitFromWad: %s doesn't have palette at index 0\n", path);
lumpinfo = wad_find_lump (wad, "PALETTE"); lumpinfo = wad_find_lump (wad, "PALETTE");
if (!lumpinfo) if (!lumpinfo) {
Sys_Error ("TEX_InitFromWad: %s doesn't have a palette", path); Sys_Printf ("TEX_InitFromWad: %s doesn't have a palette\n", path);
goto cleanup;
}
// move the palette lump to the first entry // move the palette lump to the first entry
tlump = *lumpinfo; tlump = *lumpinfo;
@ -231,20 +228,41 @@ TEX_InitFromWad (const char *path)
TEX_InitPalette (wad, lumpinfo); TEX_InitPalette (wad, lumpinfo);
old_tex_count = tex_count;
tex_count = 0;
lumpinfo++; lumpinfo++;
for (i = 1; i < wad->numlumps; i++, lumpinfo++) { for (i = 1; i < wad->numlumps; i++, lumpinfo++) {
if (lumpinfo->type != TYP_MIPTEX) if (lumpinfo->type != TYP_MIPTEX) {
Sys_Error ("TEX_InitFromWad: %s is not a miptex!", lumpinfo->name); Sys_Printf ("TEX_InitFromWad: %s is not a miptex!\n", lumpinfo->name);
continue;
}
CleanupName (lumpinfo->name, qtextures[tex_count].name); CleanupName (lumpinfo->name, qtextures[tex_count].name);
TEX_ImageFromMiptex (wad, lumpinfo); TEX_ImageFromMiptex (wad, lumpinfo);
} }
if (tex_count) {
for (i = tex_count; i < old_tex_count; i++) {
[qtextures[i].rep release];
qtextures[i].rep = nil;
}
} else {
goto cleanup;
}
wad_close (wad); wad_close (wad);
stop = Sys_DoubleTime (); stop = Sys_DoubleTime ();
Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start); Sys_Printf ("loaded %s (%.3f seconds)\n", newpath, stop - start);
return 1; return 1;
cleanup:
if (wad)
wad_close (wad);
NSRunAlertPanel (@"Wad Error", errmsg, @"OK", nil, nil);
return 0;
} }
/* /*