OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: The HIRESTEX parser didn't check if a graphic specified in a remap

Browse source 
command actually existed.
- Fixed: My $Limit fix from yesterday didn't work because NearLimit was
  an unsigned byte and the comparisons with -1 didn't work. Made it a
  signed word instead.
- Made sfxinfo_t::Link an unsigned int because it limited the amount of 
  usable sounds to 65535. 

SVN r869 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-30 08:32:44 +00:00
commit 868782a843
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/textures/texturemanager.cpp
View file

@ -455,8 +455,11 @@ void FTextureManager::AddHiresTextures (int wadnum)
{
// A texture with this name does not yet exist
FTexture * newtex = FTexture::CreateTexture (firsttx, FTexture::TEX_Any);
newtex->UseType=FTexture::TEX_Override;
AddTexture(newtex);
if (newtex != NULL)
{
newtex->UseType=FTexture::TEX_Override;
AddTexture(newtex);
}
}
else
{
@ -537,6 +540,11 @@ void FTextureManager::LoadHiresTex(int wadnum)
Printf("Attempting to remap non-existent texture %s to %s\n",
texname.GetChars(), sc.String);
}
else if (lumpnum == -1)
{
Printf("Attempting to remap texture %s to non-existent lump %s\n",
texname.GetChars(), sc.String);
}
else
{
for(unsigned int i = 0; i < tlist.Size(); i++)
@ -572,7 +580,6 @@ void FTextureManager::LoadHiresTex(int wadnum)
memcpy(src, sc.String, 8);
int lumpnum = Wads.CheckNumForFullName(sc.String, true, ns_graphics);
if (lumpnum < 0) lumpnum = Wads.CheckNumForName(sc.String, ns_graphics);
sc.GetString();
is32bit = !!sc.Compare("force32bit");