OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: UseType was not properly set for textures defined in TEXTURES.

Browse source 
- Fixed: You couldn't set an offset for sprites defined in TEXTURES.
- Fixed some problems with last revision.

SVN r1040 (trunk)
This commit is contained in:
Christoph Oelckers 2008-06-16 07:40:28 +00:00
commit de53c3cd4c
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/textures/multipatchtexture.cpp
View file

@ -1166,7 +1166,7 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
sc.MustGetStringName(",");
sc.MustGetNumber();
Height = sc.Number;
UseType = FTexture::TEX_Override;
UseType = usetype;
if (sc.CheckString("{"))
{
@ -1203,6 +1203,18 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
part.Texture = NULL;
part.Translation = NULL;
}
else if (sc.Compare("Offset"))
{
sc.MustGetNumber();
LeftOffset = sc.Number;
sc.MustGetStringName(",");
sc.MustGetNumber();
TopOffset = sc.Number;
}
else
{
sc.ScriptError("Unknown texture property '%s'", sc.String);
}
}
NumParts = parts.Size();
@ -1223,7 +1235,6 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
bRedirect = true;
}
}
//DefinitionLump = sc.G deflumpnum;
}
sc.SetCMode(false);
}