OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed a few problems with the new texture code.

Browse source 
SVN r301 (trunk)
This commit is contained in:
Christoph Oelckers 2006-08-20 17:07:22 +00:00
commit 93beb4d42e
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/r_data.cpp
View file

@ -1,4 +1,3 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
@ -207,17 +206,21 @@ int FTextureManager::AddTexture (FTexture *texture)
return trans;
}
// Calls DoCreateTexture and adds the texture to the manager.
// Calls FTexture::CreateTexture and adds the texture to the manager.
int FTextureManager::CreateTexture (int lumpnum, int usetype)
{
FTexture *out = FTexture::CreateTexture(lumpnum, usetype);
if (out != NULL) return AddTexture (out);
else
if (lumpnum != -1)
{
Printf (TEXTCOLOR_ORANGE "Invalid data encountered for texture %s\n", Wads.GetLumpFullName(lumpnum));
return -1;
FTexture *out = FTexture::CreateTexture(lumpnum, usetype);
if (out != NULL) return AddTexture (out);
else
{
Printf (TEXTCOLOR_ORANGE "Invalid data encountered for texture %s\n", Wads.GetLumpFullName(lumpnum));
return -1;
}
}
return -1;
}
void FTextureManager::ReplaceTexture (int picnum, FTexture *newtexture, bool free)