OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed the unused sfx_ variables for the chainsaw sounds.

Browse source 
- Fixed map name checks in idclev, hxvisit, for +map and the titlemap.
- Changed handling of Zips so that the patches/, graphics/, sounds/ and
  music/ subdirectories no longer are placed in the global namespace. Instead
  new namespaces are defined. These namespaces aren't merged, however and 
  searching in them either returns a lump inside it or one from the global
  namespace when it doesn't come from a Zip file. Proper order of files is
  still observed though. As a result proper use of the directories inside Zips 
  is strictly enforced now so that for example anything used as a patch must be 
  in the patches/ directory and won't be found anywhere else.


SVN r199 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-19 15:31:10 +00:00
commit cf7d8ab43b
19 changed files with 95 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/r_data.cpp
View file

@ -241,7 +241,7 @@ int FTextureManager::CreateTexture (int lumpnum, int usetype)
} first4bytes;
// Must check the length of the lump. Zero length flat markers (F1_START etc.) will come through here.
// 13 is the minimum length of andthing valid (i.e a 1x1 pixel Doom patch.)
// 13 is the minimum length of anything valid (i.e a 1x1 pixel Doom patch.)
if (lumpnum < 0 || Wads.LumpLength(lumpnum)<13)
{
return -1;
@ -426,7 +426,7 @@ int FTextureManager::AddPatch (const char *patchname, int namespc)
{
return lumpnum;
}
lumpnum = Wads.CheckNumForName (patchname, namespc);
lumpnum = Wads.CheckNumForName (patchname, namespc==ns_global? ns_graphics:namespc);
if (lumpnum < 0)
{
return -1;
@ -603,7 +603,7 @@ void FTextureManager::AddPatches (int lumpnum)
if (CheckForTexture (name, FTexture::TEX_WallPatch, false) == -1)
{
CreateTexture (Wads.CheckNumForName (name), FTexture::TEX_WallPatch);
CreateTexture (Wads.CheckNumForName (name, ns_patches), FTexture::TEX_WallPatch);
}
}
@ -1163,7 +1163,7 @@ void FPatchTexture::GetDimensions ()
if (dummy.width <= 0 || dummy.height <= 0 || dummy.width > 2048 || dummy.height > 2048)
{
delete lump;
lump = Wads.ReopenLumpNum ( Wads.GetNumForName("-BADPATC") );
lump = Wads.ReopenLumpNum ( Wads.GetNumForName("-BADPATC", ns_graphics) );
(*lump) >> dummy.width >> dummy.height;
}