forks/yadex: src/textures.cc annotate

annotate src/textures.cc @ 107:20aa5a515896

Reformat one line /* */ comments to //

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 06 Oct 2014 12:42:55 +0300
parents	2f1ecc1c5f72
children	f05330267c66

rev	line source
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	2 * textures.cc
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	3 * Trevor Phillips, RQ and Christian Johannes Schladetsch
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	4 * sometime in 1994.
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 /*
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 This file is part of Yadex.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 Yadex incorporates code from DEU 5.21 that was put in the public domain in
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 1994 by Raphaël Quinet and Brendon Wyber.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 The rest of Yadex is Copyright © 1997-2003 André Majorel and others.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 This program is free software; you can redistribute it and/or modify it under
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 the terms of the GNU General Public License as published by the Free Software
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 Foundation; either version 2 of the License, or (at your option) any later
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 version.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 This program is distributed in the hope that it will be useful, but WITHOUT
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 You should have received a copy of the GNU General Public License along with
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 Place, Suite 330, Boston, MA 02111-1307, USA.
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 */
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 #include "yadex.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 #ifdef Y_X11
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 #include <X11/Xlib.h>
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 #endif
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 #include "dialog.h"
107 20aa5a515896 Reformat one line /* / comments to // Matti Hamalainen <ccr@tnsp.org>* parents: 80 diff changeset	36 #include "game.h" // yg_picture_format
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 #include "gfx.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 #include "lists.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 #include "patchdir.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 #include "pic2img.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 #include "sticker.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 #include "textures.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 #include "wadfile.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 #include "wads.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 #include "wstructs.h"
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46
50 48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	47 /* Rudimentary check if the texture name is "valid"
48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	48 */
71 210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	49 bool InvalidTextureName(const char *name)
50 48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	50 {
71 210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	51 if ((name[0] == '-' && name[1] == 0) \|\| name[0] == 0)
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	52 return true;
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	53 else
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	54 {
107 20aa5a515896 Reformat one line /* / comments to // Matti Hamalainen <ccr@tnsp.org>* parents: 80 diff changeset	55 // Check for name that consists only of whitespace
71 210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	56 const char *c = name;
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	57 while (*c)
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	58 {
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	59 if (isspace(*c))
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	60 c++;
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	61 else
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	62 return false;
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	63 }
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	64 return true;
210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	65 }
50 48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	66 }
48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	67
71 210bfe10609f Change return type of {Valid\|Invalid}TextureName() functions, and make them Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	68 bool ValidTextureName(const char *name)
50 48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	69 {
48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	70 return !InvalidTextureName(name);
48d4f8e3fce5 Add simple functions for checking if texture name is "valid" (e.g. not empty or "-") Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	71 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 /*
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 display a wall texture ("TEXTURE1" or "TEXTURE2" object)
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 at coords c->x0, c->y0
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 */
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	77 void DisplayWallTexture(hookfunc_comm_t * c)
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	79 MDirPtr dir = 0; // Main directory pointer to the TEXTURE* entries
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	80 int n; // General counter
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	81 i16 width, height; // Size of the texture
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	82 i16 npatches; // Number of patches in the textures
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	83 i32 numtex; // number of texture names in TEXTURE* list
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	84 i32 texofs; // Offset in the wad file to the texture data
107 20aa5a515896 Reformat one line /* / comments to // Matti Hamalainen <ccr@tnsp.org>* parents: 80 diff changeset	85 char tname[WAD_TEX_NAME + 1]; // texture name
20aa5a515896 Reformat one line /* / comments to // Matti Hamalainen <ccr@tnsp.org>* parents: 80 diff changeset	86 char picname[WAD_PIC_NAME + 1]; // wall patch name
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	87 bool have_dummy_bytes;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	88 int header_size;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	89 int item_size;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 // So that, on failure, the caller clears the display area
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	92 c->disp_x0 = c->x1;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	93 c->disp_y0 = c->y1;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	94 c->disp_x1 = c->x0;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	95 c->disp_y1 = c->y0;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 // Iwad-dependant details
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	98 if (yg_texture_format == YGTF_NAMELESS)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	99 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	100 have_dummy_bytes = true;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	101 header_size = 14;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	102 item_size = 10;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	103 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	104 else if (yg_texture_format == YGTF_NORMAL)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	105 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	106 have_dummy_bytes = true;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	107 header_size = 14;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	108 item_size = 10;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	109 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	110 else if (yg_texture_format == YGTF_STRIFE11)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	111 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	112 have_dummy_bytes = false;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	113 header_size = 10;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	114 item_size = 6;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	115 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	116 else
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	117 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	118 nf_bug("Bad texture format %d.", (int) yg_texture_format);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	119 return;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	120 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 #ifndef Y_X11
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	123 if (have_key())
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	124 return; // Speedup
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 #endif
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 // Offset for texture we want
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	128 texofs = 0;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 // Doom alpha 0.4 : "TEXTURES", no names
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	130 if (yg_texture_lumps == YGTL_TEXTURES
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	131 && yg_texture_format == YGTF_NAMELESS)
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	132 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	133 const char *lump_name = "TEXTURES";
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	134 dir = FindMasterDir(cfg.MasterDir, lump_name);
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	135 if (dir != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	136 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	137 const Wad_file *wf = dir->wadfile;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	138 wf->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	139 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	140 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	141 warn("%s: can't seek to lump\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	142 goto alpha04_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	143 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	144 wf->read_i32(&numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	145 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	146 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	147 warn("%s: error reading texture count\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	148 goto alpha04_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	149 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	150 if (WAD_TEX_NAME < 7)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	151 nf_bug("WAD_TEX_NAME too small"); // Sanity
60 1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	152
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	153 if (!y_strnicmp(c->name, "TEX", 3)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	154 && isdigit(c->name[3])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	155 && isdigit(c->name[4])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	156 && isdigit(c->name[5])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	157 && isdigit(c->name[6]) && c->name[7] == '\0')
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	158 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	159 long num;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	160 if (sscanf(c->name + 3, "%4ld", &num) == 1
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	161 && num >= 0 && num < numtex)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	162 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	163 wf->seek(dir->dir.start + 4 + 4 * num);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	164 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	165 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	166 // FIXME print name of offending texture (or #)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	167 warn("%s: can't seek to offsets table entry\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	168 lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	169 goto alpha04_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	170 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	171 wf->read_i32(&texofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	172 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	173 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	174 warn("%s: error reading texture offset\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	175 goto alpha04_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	176 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	177 texofs += dir->dir.start;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	178 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	179 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	180 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	181 alpha04_done:
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	182 ;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	183 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 // Doom alpha 0.5 : only "TEXTURES"
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	185 else if (yg_texture_lumps == YGTL_TEXTURES
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	186 && (yg_texture_format == YGTF_NORMAL
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	187 \|\| yg_texture_format == YGTF_STRIFE11))
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	188 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	189 const char *lump_name = "TEXTURES";
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	190 dir = FindMasterDir(cfg.MasterDir, lump_name);
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	191 if (dir != NULL) // (Theoretically, it should always exist)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	192 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	193 i32 *offsets = NULL; // Array of offsets to texture names
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	194 const Wad_file *wf = dir->wadfile;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	196 wf->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	197 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	198 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	199 warn("%s: can't seek to lump\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	200 goto textures_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	201 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	202 wf->read_i32(&numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	203 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	204 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	205 warn("%s: error reading texture count\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	206 goto textures_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	207 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	208 // Read in the offsets for texture1 names and info
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	209 offsets = (i32 ) GetMemory((long) numtex 4);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	210 wf->read_i32(offsets, numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	211 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	212 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	213 warn("%s: error reading offsets table\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	214 goto textures_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	215 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	216 for (long n = 0; n < numtex && !texofs; n++)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	217 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	218 wf->seek(dir->dir.start + offsets[n]);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	219 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	220 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	221 warn("%s: error seeking to definition of texture #%ld\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	222 lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	223 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	224 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	225 wf->read_bytes(&tname, WAD_TEX_NAME);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	226 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	227 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	228 warn("%s: error reading name of texture #%ld\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	229 lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	230 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	231 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	232 if (!y_strnicmp(tname, c->name, WAD_TEX_NAME))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	233 texofs = dir->dir.start + offsets[n];
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	234 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	235 textures_done:
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	236 if (offsets != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	237 FreeMemory(offsets);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	238 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	239 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240 // Other iwads : "TEXTURE1" and "TEXTURE2"
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	241 else if (yg_texture_lumps == YGTL_NORMAL
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	242 && (yg_texture_format == YGTF_NORMAL
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	243 \|\| yg_texture_format == YGTF_STRIFE11))
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	244 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	245 // Is it in TEXTURE1 ?
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	246 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	247 const char *lump_name = "TEXTURE1";
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	248 dir = FindMasterDir(cfg.MasterDir, lump_name);
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	249 if (dir != NULL) // (Theoretically, it should always exist)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	250 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	251 const Wad_file *wf = dir->wadfile;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	252 i32 *offsets = NULL; // Array of offsets to texture names
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	254 wf->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	255 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	256 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	257 warn("%s: can't seek to lump\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	258 goto texture1_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	259 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	260 wf->read_i32(&numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	261 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	262 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	263 warn("%s: error reading texture count\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	264 goto texture1_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	265 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	266 // Read in the offsets for texture1 names and info
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	267 offsets = (i32 ) GetMemory((long) numtex 4);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	268 wf->read_i32(offsets, numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	269 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	270 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	271 warn("%s: error reading offsets table\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	272 goto texture1_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	273 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	274 for (long n = 0; n < numtex && !texofs; n++)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	275 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	276 wf->seek(dir->dir.start + offsets[n]);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	277 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	278 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	279 warn("%s: error seeking to definition of texture #%ld\n", lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	280 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	281 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	282 wf->read_bytes(&tname, WAD_TEX_NAME);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	283 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	284 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	285 warn("%s: error reading name of texture #%ld\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	286 lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	287 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	288 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	289 if (!y_strnicmp(tname, c->name, WAD_TEX_NAME))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	290 texofs = dir->dir.start + offsets[n];
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	291 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	292 texture1_done:
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	293 if (offsets != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	294 FreeMemory(offsets);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	295 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	296 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	297 // Well, then is it in TEXTURE2 ?
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	298 if (texofs == 0)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	299 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	300 const char *lump_name = "TEXTURE2";
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	301 i32 *offsets = NULL; // Array of offsets to texture names
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	303 dir = FindMasterDir(cfg.MasterDir, lump_name);
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	304 if (dir != NULL) // Doom II has no TEXTURE2
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	305 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	306 const Wad_file *wf = dir->wadfile;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	307 wf->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	308 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	309 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	310 warn("%s: can't seek to lump\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	311 goto texture2_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	312 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	313 wf->read_i32(&numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	314 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	315 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	316 warn("%s: error reading texture count\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	317 goto texture2_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	318 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	319 // Read in the offsets for TEXTURE2 names
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	320 offsets = (i32 ) GetMemory((long) numtex 4);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	321 wf->read_i32(offsets, numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	322 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	323 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	324 warn("%s: error reading offsets table\n", lump_name);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	325 goto texture2_done;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	326 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	327 for (long n = 0; n < numtex && !texofs; n++)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	328 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	329 wf->seek(dir->dir.start + offsets[n]);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	330 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	331 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	332 warn("%s: error seeking to definition of texture #%ld\n", lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	333 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	334 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	335 wf->read_bytes(&tname, WAD_TEX_NAME);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	336 if (wf->error())
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	337 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	338 warn("%s: error reading name of texture #%ld\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	339 lump_name, n);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	340 break;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	341 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	342 if (!y_strnicmp(tname, c->name, WAD_TEX_NAME))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	343 texofs = dir->dir.start + offsets[n];
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	344 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	345 texture2_done:
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	346 if (offsets != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	347 FreeMemory(offsets);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	348 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	349 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	350 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	351 else
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	352 nf_bug("Invalid texture_format/texture_lumps combination.");
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 // Texture name not found
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	355 if (texofs == 0)
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	356 return;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 // Read the info for this texture
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	359 i32 header_ofs;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	360 if (yg_texture_format == YGTF_NAMELESS)
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	361 header_ofs = texofs;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	362 else
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	363 header_ofs = texofs + WAD_TEX_NAME;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	364 dir->wadfile->seek(header_ofs + 4);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 // FIXME
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	366 dir->wadfile->read_i16(&width);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 // FIXME
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	368 dir->wadfile->read_i16(&height);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 // FIXME
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	370 if (have_dummy_bytes)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	371 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	372 i16 dummy;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	373 dir->wadfile->read_i16(&dummy);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	374 dir->wadfile->read_i16(&dummy);
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	375 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	376 dir->wadfile->read_i16(&npatches);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 // FIXME
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	379 c->width = width;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	380 c->height = height;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	381 c->npatches = npatches;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	382 c->flags \|= HOOK_SIZE_VALID \| HOOK_DISP_SIZE;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 /* Clip the texture to size. Done after setting c->width and
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 c->height so that the selector shows the unclipped size. */
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	386 width = y_min(width, c->x1 - c->x0 + 1);
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	387 height = y_min(height, c->y1 - c->y0 + 1);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 // Compose the texture
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	390 c->img.resize(width, height);
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	391 c->img.set_opaque(false);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 /* Paste onto the buffer all the patches that the texture is
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 made of. Unless c->npatches is non-zero, in which case we
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 paste only the first maxpatches ones. */
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	396 int maxpatches = npatches;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	397 if (c->maxpatches != 0 && c->maxpatches <= npatches)
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	398 maxpatches = c->maxpatches;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	399 for (n = 0; n < maxpatches; n++)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	400 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	401 hookfunc_comm_t subc;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	402 i16 xofs, yofs; // Offset in texture space for the patch
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	403 i16 pnameind; // Index of patch in PNAMES
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	405 dir->wadfile->seek(header_ofs + header_size + (long) n * item_size);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	406 dir->wadfile->read_i16(&xofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	407 dir->wadfile->read_i16(&yofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	408 dir->wadfile->read_i16(&pnameind);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	409 if (have_dummy_bytes)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	410 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	411 i16 stepdir;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	412 i16 colormap;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	413 dir->wadfile->read_i16(&stepdir); // Always 1, unused.
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	414 dir->wadfile->read_i16(&colormap); // Always 0, unused.
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	415 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	416
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	417 /* AYM 1998-08-08: Yes, that's weird but that's what Doom
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	418 does. Without these two lines, the few textures that have
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	419 patches with negative y-offsets (BIGDOOR7, SKY1, TEKWALL1,
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	420 TEKWALL5 and a few others) would not look in the texture
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	421 viewer quite like in Doom. This should be mentioned in
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	422 the UDS, by the way. */
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	423 if (yofs < 0)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	424 yofs = 0;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	426 Lump_loc loc;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	427 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	428 wad_pic_name_t *name = patch_dir.name_for_num(pnameind);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	429 if (name == 0)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	430 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	431 warn("texture \"%.*s\": patch %2d has bad index %d.\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	432 WAD_TEX_NAME, tname, (int) n, (int) pnameind);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	433 continue;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	434 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	435 patch_dir.loc_by_name((const char ) name, loc);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	436 *picname = '\0';
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	437 strncat(picname, (const char ) name, sizeof picname - 1);
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	438 #ifdef DEBUG
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	439 printf("Texture \"%.*s\": Patch %2d: #%3d %-8.8s (%d, %d)\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	440 c->name, (int) n, (int) pnameind, picname, (int) xofs,
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	441 (int) yofs);
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	442 #endif
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	443 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	445 subc.x0 = y_max(c->x0, c->x0 + xofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	446 subc.y0 = y_min(c->y0, c->y0 + yofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	447 subc.x1 = c->x1;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	448 subc.x1 = c->y1;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	449 subc.name = picname;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	451 if (LoadPicture(c->img, picname, loc, xofs, yofs, 0, 0))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	452 warn("texture \"%.s\": patch \"%.s\" not found.\n",
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	453 WAD_TEX_NAME, tname, WAD_PIC_NAME, picname);
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	454 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456 // Display the texture
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	457 Sticker sticker(c->img, true); // Use opaque because it's faster
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	458 sticker.draw(drw, 't', c->x0, c->y0);
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	459 c->flags \|= HOOK_DRAWN;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	460 c->disp_x0 = c->x0 + c->xofs;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	461 c->disp_y0 = c->y0 + c->yofs;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	462 c->disp_x1 = c->disp_x0 + width - 1;
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	463 c->disp_y1 = c->disp_y0 + height - 1;
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 }
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 /*
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 Function to get the size of a wall texture
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 */
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	470 void GetWallTextureSize(i16 * width, i16 * height, const char *texname)
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	472 MDirPtr dir = 0; // Pointer in main directory to texname
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	473 i32 *offsets; // Array of offsets to texture names
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	474 int n; // General counter
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	475 i32 numtex; // Number of texture names in TEXTURE*
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	476 i32 texofs; // Offset in wad for the texture data
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	477 char tname[WAD_TEX_NAME + 1]; // Texture name
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478
55 522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	479 // Offset for texture we want
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	480 texofs = 0;
55 522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	481
522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	482 // Search for texname in TEXTURE1 (or TEXTURES)
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	483 if (yg_texture_lumps == YGTL_TEXTURES
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	484 && yg_texture_format == YGTF_NAMELESS)
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	485 {
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	486 dir = FindMasterDir(cfg.MasterDir, "TEXTURES");
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	487 if (dir != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	488 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	489 dir->wadfile->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	490 dir->wadfile->read_i32(&numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	491 if (WAD_TEX_NAME < 7)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	492 nf_bug("WAD_TEX_NAME too small"); // Sanity
55 522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	493
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	494 if (!y_strnicmp(texname, "TEX", 3)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	495 && isdigit(texname[3])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	496 && isdigit(texname[4])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	497 && isdigit(texname[5])
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	498 && isdigit(texname[6]) && texname[7] == '\0')
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	499 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	500 long num;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	501 if (sscanf(texname + 3, "%4ld", &num) == 1
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	502 && num >= 0 && num < numtex)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	503 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	504 dir->wadfile->seek(dir->dir.start + 4 + 4 * num);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	505 dir->wadfile->read_i32(&texofs);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	506 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	507 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	508 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	509 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	510 else if (yg_texture_format == YGTF_NORMAL
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	511 \|\| yg_texture_format == YGTF_STRIFE11)
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	512 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	513 if (yg_texture_lumps == YGTL_TEXTURES)
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	514 dir = FindMasterDir(cfg.MasterDir, "TEXTURES"); // Doom alpha 0.5
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	515 else if (yg_texture_lumps == YGTL_NORMAL)
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	516 dir = FindMasterDir(cfg.MasterDir, "TEXTURE1");
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	517 else
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	518 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	519 dir = 0;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	520 nf_bug("Invalid texture_format/texture_lumps combination.");
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	521 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	522 if (dir != NULL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	523 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	524 dir->wadfile->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	525 dir->wadfile->read_i32(&numtex);
60 1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	526 if (dir->wadfile->error())
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	527 warn("Could not seek or read the textures directory (1).\n");
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	528
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	529 // Read in the offsets for texture1 names and info
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	530 offsets = (i32 ) GetMemory((long) numtex 4);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	531 dir->wadfile->read_i32(offsets, numtex);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	532 for (n = 0; n < numtex && !texofs; n++)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	533 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	534 dir->wadfile->seek(dir->dir.start + offsets[n]);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	535 dir->wadfile->read_bytes(&tname, WAD_TEX_NAME);
60 1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	536 if (dir->wadfile->error())
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	537 {
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	538 warn("Error in reading texture #%d/%d (1).\n", n, numtex);
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	539 break;
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	540 }
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	541 if (!y_strnicmp(tname, texname, WAD_TEX_NAME))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	542 texofs = dir->dir.start + offsets[n];
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	543 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	544 FreeMemory(offsets);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	545 }
55 522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	546
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	547 if (texofs == 0 && yg_texture_lumps == YGTL_NORMAL)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	548 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	549 // Search for texname in TEXTURE2
80 2f1ecc1c5f72 Huge cleanup -- move some global variables into a struct. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	550 dir = FindMasterDir(cfg.MasterDir, "TEXTURE2");
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	551 if (dir != NULL) // Doom II has no TEXTURE2
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	552 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	553 dir->wadfile->seek(dir->dir.start);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	554 dir->wadfile->read_i32(&numtex);
60 1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	555 if (dir->wadfile->error())
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	556 warn("Could not seek or read the textures directory (2).\n");
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	557
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	558 // Read in the offsets for texture2 names
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	559 offsets = (i32 ) GetMemory((long) numtex 4);
59 55bd29745535 Fix a NASTY bug in TEXTURE2 lump directory reading. This sometimes/often Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	560 dir->wadfile->read_i32(offsets, numtex);
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	561 for (n = 0; n < numtex && !texofs; n++)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	562 {
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	563 dir->wadfile->seek(dir->dir.start + offsets[n]);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	564 dir->wadfile->read_bytes(&tname, WAD_TEX_NAME);
60 1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	565 if (dir->wadfile->error())
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	566 {
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	567 warn("Error in reading texture #%d/%d (2).\n", n, numtex);
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	568 break;
1dfcb729ef3d Add in more extensive error reporting. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	569 }
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	570 if (!y_strnicmp(tname, texname, WAD_TEX_NAME))
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	571 texofs = dir->dir.start + offsets[n];
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	572 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	573 FreeMemory(offsets);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	574 }
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	575 }
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	576 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	577 else
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	578 nf_bug("Invalid texture_format/texture_lumps combination.");
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	580 if (texofs != 0)
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	581 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	582 // Read the info for this texture
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	583 if (yg_texture_format == YGTF_NAMELESS)
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	584 dir->wadfile->seek(texofs + 4L);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	585 else
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	586 dir->wadfile->seek(texofs + 12L);
55 522a71f40632 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	587
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	588 dir->wadfile->read_i16(width);
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	589 dir->wadfile->read_i16(height);
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	590 }
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	591 else
8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	592 {
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	593 // Texture data not found
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	594 *width = -1;
a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	595 *height = -1;
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	596 }
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 }
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600 /*
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 choose a wall texture
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 */
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	603 void ChooseWallTexture(int x0, int y0, const char *prompt, int listsize,
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	604 char *list, char name)
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 {
25 8eaf72e2041b Reindent the source using GNU indent and "indent -i4 -bli0 -npcs -nprs -npsl". Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	606 InputNameFromListWithFunc(x0, y0, prompt, listsize, list, 9, name,
33 a68786b9c74b Oops, used indent with tabs enabled. Remove tabs. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	607 512, 256, DisplayWallTexture);
0 241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608
241c93442be0 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 }

Mercurial > hg > forks > yadex

annotate src/textures.cc @ 107:20aa5a515896