moved the targa stuff to its own file

This commit is contained in:
faded 2003-02-05 13:52:10 +00:00
parent 49ebbc4fbb
commit ae7d49d4fc
4 changed files with 41 additions and 18 deletions

View file

@ -656,14 +656,6 @@ void SCR_DrawConsole (void)
==============================================================================
*/
typedef struct _TargaHeader {
unsigned char id_length, colormap_type, image_type;
unsigned short colormap_index, colormap_length;
unsigned char colormap_size;
unsigned short x_origin, y_origin, width, height;
unsigned char pixel_size, attributes;
} TargaHeader;
/*
==================

View file

@ -628,15 +628,7 @@ TARGA LOADING
=========================================================
*/
typedef struct _TargaHeader
{
unsigned char id_length, colormap_type, image_type;
unsigned short colormap_index, colormap_length;
unsigned char colormap_size;
unsigned short x_origin, y_origin, width, height;
unsigned char pixel_size, attributes;
} TargaHeader;
/* -DC- moved typedef to targa.h */
TargaHeader targa_header;
byte *targa_rgba;

View file

@ -253,7 +253,7 @@ typedef struct
int pflags;
} entity_state_t;
#include "targa.h"
#include "wad.h"
#include "draw.h"
#include "cvar.h"

39
targa.h Normal file
View file

@ -0,0 +1,39 @@
#ifndef _TARGA_H
#define _TARGA_H
/*
Copyright (C) 1996-1997 Id Software, Inc.
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 the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
typedef struct _TargaHeader
{
unsigned char id_length, colormap_type, image_type;
unsigned short colormap_index, colormap_length;
unsigned char colormap_size;
unsigned short x_origin, y_origin, width, height;
unsigned char pixel_size, attributes;
} TargaHeader;
extern TargaHeader targa_header;
extern byte *targa_rgba;
#endif