OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Made loading of Build's palette.dat automatic if it's found inside a loaded

Browse source 
group file, but the -bpal parameter remains for now.
- Made loading of Build art tiles automatic if they are found inside a group
  file. Removed the corresponding command-line parameter.
- Added support for Ken Silverman's group files.


SVN r72 (trunk)
This commit is contained in:
Randy Heit 2006-05-02 04:38:12 +00:00
commit 01a41a6f13
8 changed files with 136 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/r_data.cpp
View file

@ -2727,38 +2727,33 @@ void R_InitTextures (void)
void R_InitBuildTiles ()
{
const char *artdir;
int numartfiles;
char artfile[] = "tilesXXX.art";
int lumpnum;
if (NULL != (artdir = Args.CheckValue ("-art")))
for (numartfiles = 0; numartfiles < 1000; numartfiles++)
{
char lastchar = artdir[strlen(artdir)-1];
const char *optslash = (lastchar == '/' || lastchar == '\\') ? "" : "/";
char artpath[PATH_MAX];
for (numartfiles = 0; ; numartfiles++)
artfile[5] = numartfiles / 100 + '0';
artfile[6] = numartfiles / 10 % 10 + '0';
artfile[7] = numartfiles % 10 + '0';
lumpnum = Wads.CheckNumForFullName (artfile);
if (lumpnum < 0)
{
sprintf (artpath, "%s%stiles%03d.art", artdir, optslash, numartfiles);
if (!FileExists (artpath))
{
break;
}
FileReader file (artpath);
// BADBAD: This memory is never explicitly deleted except when the
// version number is wrong.
BYTE *art = new BYTE[file.GetLength()];
file.Read (art, file.GetLength());
if (LittleLong(*(DWORD *)art) != 1)
{
delete[] art;
break;
}
TexMan.AddTiles (art);
break;
}
// BADBAD: This memory is never explicitly deleted except when the
// version number is wrong.
BYTE *art = new BYTE[Wads.LumpLength (lumpnum)];
Wads.ReadLump (lumpnum, art);
if (LittleLong(*(DWORD *)art) != 1)
{
delete[] art;
break;
}
TexMan.AddTiles (art);
}
}
@ -2782,7 +2777,7 @@ void R_SetDefaultColormap (const char *name)
BYTE remap[256];
// [RH] If using BUILD's palette.dat, generate the colormap
if (Args.CheckValue ("-bpal") != NULL)
if (Args.CheckParm ("-bpal") || Wads.CheckNumForFullName("palette.dat"))
{
Printf ("Make colormap\n");
FDynamicColormap foo;