zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed texture name handling in GL related texture classes for recent changes in ZDoom to eliminate the 8 character name limit.

This commit is contained in:
Christoph Oelckers 2014-06-01 00:04:28 +02:00
parent 3c5d07e9c6
commit d925279bef
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gl/textures/gl_skyboxtexture.cpp
View File

@ -150,8 +150,8 @@ void gl_ParseSkybox(FScanner &sc)
sc.MustGetString(); sc.MustGetString();
FSkyBox * sb = new FSkyBox; FSkyBox * sb = new FSkyBox;
uppercopy(sb->Name, sc.String); sb->Name = sc.String;
sb->Name[8]=0; sb->Name.ToUpper();
if (sc.CheckString("fliptop")) if (sc.CheckString("fliptop"))
{ {
sb->fliptop = true; sb->fliptop = true;
@ -192,8 +192,8 @@ void gl_ParseVavoomSkybox()
int facecount=0; int facecount=0;
int maplump = -1; int maplump = -1;
FSkyBox * sb = new FSkyBox; FSkyBox * sb = new FSkyBox;
uppercopy(sb->Name, sc.String); sb->Name = sc.String;
sb->Name[8]=0; sb->Name.ToUpper();
sb->fliptop = true; sb->fliptop = true;
sc.MustGetStringName("{"); sc.MustGetStringName("{");
while (!sc.CheckString("}")) while (!sc.CheckString("}"))

4
src/gl/textures/gl_texture.cpp
View File

@ -603,7 +603,7 @@ bool FTexture::ProcessData(unsigned char * buffer, int w, int h, bool ispatch)
FBrightmapTexture::FBrightmapTexture (FTexture *source) FBrightmapTexture::FBrightmapTexture (FTexture *source)
{ {
memset(Name, 0, sizeof(Name)); Name = "";
SourcePic = source; SourcePic = source;
CopySize(source); CopySize(source);
bNoDecals = source->bNoDecals; bNoDecals = source->bNoDecals;
@ -650,7 +650,7 @@ int FBrightmapTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotat
FCloneTexture::FCloneTexture (FTexture *source, int usetype) FCloneTexture::FCloneTexture (FTexture *source, int usetype)
{ {
memset(Name, 0, sizeof(Name)); Name = "";
SourcePic = source; SourcePic = source;
CopySize(source); CopySize(source);
bNoDecals = source->bNoDecals; bNoDecals = source->bNoDecals;