- Changed: Textures without a name no longer get added to the texture manager's
hash chains. - Fixed: specifying texture patches or font characters by full lump name instead of texture name didn't work. To do this properly the texture manager needs an option to look for a texture by lump number so that such textures can be maintained without interfering with regular operation. - added 'skystretch' and 'autosequences' keywords for MAPINFO so that the effects of 'noautosequences' and 'forcenoskystretch' can be cancelled. - Added a 'gamedefaults' section to MAPINFO after discovering that 'defaultmap' gets reset for each MAPINFO. A global section is needed to define a game's default setting in zdoom.pk3. The gamedefaults should normally not be changed by PWADs but it can be done if some mod intends to change gameplay settings but wants to allow custom add-ons on its own. SVN r1300 (trunk)
This commit is contained in:
parent
c35be830c3
commit
3f2d5db348
19 changed files with 212 additions and 145 deletions
|
|
@ -127,14 +127,34 @@ FTexture * FTexture::CreateTexture (int lumpnum, int usetype)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
FTexture::FTexture ()
|
||||
FTexture * FTexture::CreateTexture (const char *name, int lumpnum, int usetype)
|
||||
{
|
||||
FTexture *tex = CreateTexture(lumpnum, usetype);
|
||||
if (tex != NULL && name != NULL) uppercopy(tex->Name, name);
|
||||
return tex;
|
||||
}
|
||||
|
||||
|
||||
FTexture::FTexture (const char *name, int lumpnum)
|
||||
: LeftOffset(0), TopOffset(0),
|
||||
WidthBits(0), HeightBits(0), xScale(FRACUNIT), yScale(FRACUNIT),
|
||||
WidthBits(0), HeightBits(0), xScale(FRACUNIT), yScale(FRACUNIT), SourceLump(lumpnum),
|
||||
UseType(TEX_Any), bNoDecals(false), bNoRemap0(false), bWorldPanning(false),
|
||||
bMasked(true), bAlphaTexture(false), bHasCanvas(false), bWarped(0), bComplex(false),
|
||||
Rotations(0xFFFF), Width(0), Height(0), WidthMask(0), Native(NULL)
|
||||
{
|
||||
*Name = 0;
|
||||
if (name != NULL)
|
||||
{
|
||||
uppercopy(Name, name);
|
||||
}
|
||||
else if (lumpnum < 0)
|
||||
{
|
||||
*Name = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
Wads.GetLumpName (Name, lumpnum);
|
||||
Name[8] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
FTexture::~FTexture ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue