From 92b735fe40fa39c82ca798721e87b6f2a252e3ff Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Sun, 10 Oct 2010 01:51:22 -0400 Subject: [PATCH 1/3] TexturePalette: Prevent NULL dereference Keep the app from crashing on a wad that doesn't have any palette at all. --- tools/Forge/Bundles/MapEdit/TexturePalette.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.m b/tools/Forge/Bundles/MapEdit/TexturePalette.m index 35d57f87e..0049805c9 100644 --- a/tools/Forge/Bundles/MapEdit/TexturePalette.m +++ b/tools/Forge/Bundles/MapEdit/TexturePalette.m @@ -218,10 +218,10 @@ TEX_InitFromWad (const char *path) if (strcmp (lumpinfo->name, "PALETTE")) { lumpinfo_t tlump; - Sys_Printf ("TEX_InitFromWad: %s doesn't have palette as 0", path); + Sys_Printf ("TEX_InitFromWad: %s doesn't have palette at index 0\n", path); lumpinfo = wad_find_lump (wad, "PALETTE"); if (!lumpinfo) - Sys_Printf ("TEX_InitFromWad: %s doesn't have a palette", path); + Sys_Error ("TEX_InitFromWad: %s doesn't have a palette", path); // move the palette lump to the first entry tlump = *lumpinfo; From 0bb30fc9946f59a9df657afca19d64803653c409 Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Sun, 10 Oct 2010 02:24:35 -0400 Subject: [PATCH 2/3] TexturePalette.m: microscopic update remove a bogus comment, clarify a printf call, add parens around a ternary test. --- tools/Forge/Bundles/MapEdit/TexturePalette.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.m b/tools/Forge/Bundles/MapEdit/TexturePalette.m index 0049805c9..1c251f9ed 100644 --- a/tools/Forge/Bundles/MapEdit/TexturePalette.m +++ b/tools/Forge/Bundles/MapEdit/TexturePalette.m @@ -192,7 +192,7 @@ TEX_InitFromWad (const char *path) start = Sys_DoubleTime (); newpath = [[preferences_i getProjectPath] cString]; - newpath = va ("%s%s%s", newpath, newpath[0] ? "/" : "", path); + newpath = va ("%s%s%s", newpath, (newpath[0] ? "/" : ""), path); // free any textures for (i = 0; i < tex_count; i++) @@ -200,9 +200,7 @@ TEX_InitFromWad (const char *path) tex_count = 0; - // try to use the cached wadfile - - Sys_Printf ("TEX_InitFromWad %s\n", newpath); + Sys_Printf ("TEX_InitFromWad: loading %s\n", newpath); wad = wad_open (newpath); if (!wad) { NSRunAlertPanel (@"Wad Error!", From 75b63316e1b90026c146aba1987828fa5b6febc5 Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Sun, 10 Oct 2010 02:31:55 -0400 Subject: [PATCH 3/3] Ignore all *.a files, testsound the ruamoko/ dir had some .a libs that needed ignoring, and libs/audio/testsound should be ignored too. --- .gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b6bba3082..b2e11ecb3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.la *.lo *.obj +*.a *.o *~ autom4te.cache/ @@ -109,6 +110,7 @@ core # /libs/ # /libs/audio/ +/libs/audio/testsound # /libs/audio/cd/ @@ -186,7 +188,6 @@ core /nq/include/stamp-h # /nq/source/ -/nq/source/*.a /nq/source/*.d /nq/source/fbset_modes_l.c /nq/source/fbset_modes_y.c @@ -213,7 +214,6 @@ core /qtv/include/config.h # /qtv/source/ -/qtv/source/*.a /qtv/source/*.d /qtv/source/*.i /qtv/source/*.s @@ -228,7 +228,6 @@ core /qw/include/config.h # /qw/source/ -/qw/source/*.a /qw/source/*.d /qw/source/*.i /qw/source/*.s