qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-04 16:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'forge' of ssh://quake.git.sf.net/gitroot/quake/quakeforge into forge

Browse source
This commit is contained in:
Bill Currie 2010-10-10 15:53:19 +09:00
commit 39da12282c
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -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

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

@ -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!",
@ -218,10 +216,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;