Mercurial > hg > forks > yadex
changeset 55:522a71f40632
Cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 26 Sep 2011 06:02:12 +0300 |
parents | dd94096a7fcd |
children | 2898afb3c9a0 |
files | src/textures.cc |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/textures.cc Mon Sep 26 05:45:04 2011 +0300 +++ b/src/textures.cc Mon Sep 26 06:02:12 2011 +0300 @@ -461,9 +461,10 @@ i32 texofs; // Offset in wad for the texture data char tname[WAD_TEX_NAME + 1]; // Texture name -// Offset for texture we want + // Offset for texture we want texofs = 0; -// Search for texname in TEXTURE1 (or TEXTURES) + + // Search for texname in TEXTURE1 (or TEXTURES) if (yg_texture_lumps == YGTL_TEXTURES && yg_texture_format == YGTF_NAMELESS) { @@ -474,6 +475,7 @@ dir->wadfile->read_i32(&numtex); if (WAD_TEX_NAME < 7) nf_bug("WAD_TEX_NAME too small"); // Sanity + if (!y_strnicmp(texname, "TEX", 3) && isdigit(texname[3]) && isdigit(texname[4]) @@ -518,6 +520,7 @@ } FreeMemory(offsets); } + if (texofs == 0 && yg_texture_lumps == YGTL_NORMAL) { // Search for texname in TEXTURE2 @@ -550,6 +553,7 @@ dir->wadfile->seek(texofs + 4L); else dir->wadfile->seek(texofs + 12L); + dir->wadfile->read_i16(width); dir->wadfile->read_i16(height); }