mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-28 14:53:16 +00:00
fc70d429bb
Rip out the pcx loading code and use LoadPCX instead. pcx.h: remove the data field from pcx_t: it was messing with gcc's idea of the structure size. also, update LoadPCX's prototype pcx.c: change LoadPCX to return tex_t (new type in texture.h) and take a new param: convert. LoadPCX will now wither load raw 8 bit or convert to rgba on loading depending on convert. Also, make LoadPCX WORK and use Hunk_TempAlloc to store the resulting texture. texture.h: define tex_t. defines an in-memory texture (either 8 or 32 bit, depending on the presense of a palette). Data comes immediately after the sturcture. eg tex_t *tex = Hunk_TempAlloc (sizeof (tex_t) + count)
47 lines
1.1 KiB
C
47 lines
1.1 KiB
C
/*
|
|
texture.h
|
|
|
|
texture definition
|
|
|
|
Copyright (C) 2000 Bill Currie
|
|
|
|
Author: Bill Currie
|
|
Date: 2000-01-18
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
|
|
Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA
|
|
|
|
$Id$
|
|
*/
|
|
|
|
#ifndef __texture_h
|
|
#define __texture_h
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
// could not use texture_t as that is used for models.
|
|
typedef struct tex_s {
|
|
int width;
|
|
int height;
|
|
unsigned char *palette; // 0 = 32 bit, otherise 8
|
|
unsigned char data[ZERO_LENGTH_ARRAY];
|
|
} tex_t;
|
|
|
|
#endif // __texture_h
|