OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: GCC warnings.

Browse source 
SVN r2843 (trunk)
This commit is contained in:
Braden Obrzut 2010-09-21 20:35:40 +00:00
commit 15d74dab56
9 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/textures/multipatchtexture.cpp
View file

@ -1200,6 +1200,7 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
bMultiPatch = true;
sc.SetCMode(true);
sc.MustGetString();
const char* textureName = NULL;
if (sc.Compare("optional"))
{
bSilent = true;
@ -1208,11 +1209,11 @@ FMultiPatchTexture::FMultiPatchTexture (FScanner &sc, int usetype)
{
// this is not right. Apparently a texture named 'optional' is being defined right now...
sc.UnGet();
sc.String = "optional";
textureName = "optional";
bSilent = false;
}
}
uppercopy(Name, sc.String);
uppercopy(Name, !textureName ? sc.String : textureName);
Name[8] = 0;
sc.MustGetStringName(",");
sc.MustGetNumber();