More header musical chairs chaos. You there! No eating the chairs!

This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-05-09 18:42:37 +00:00
parent 5afd16bea9
commit 910e76a900
4 changed files with 119 additions and 4 deletions

64
include/QF/skin.h Normal file
View file

@ -0,0 +1,64 @@
/*
skin.h
Client skin definitions
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:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifndef _SKIN_H
#define _SKIN_H
#include "client.h"
#define MAX_CACHED_SKINS 128
#define RSSHOT_WIDTH 320
#define RSSHOT_HEIGHT 200
typedef struct skin_s
{
char name[16];
qboolean failedload; // the name isn't a valid skin
cache_user_t cache;
int fb_texture;
} skin_t;
extern byte player_8bit_texels[320 * 200];
extern skin_t skin_cache[MAX_CACHED_SKINS];
struct tex_s;
struct player_info_s;
void Skin_Find (struct player_info_s *sc);
struct tex_s *Skin_Cache (skin_t *skin);
void Skin_Skins_f (void);
void Skin_AllSkins_f (void);
void Skin_NextDownload (void);
void Skin_Init (void);
void Skin_Init_Cvars (void);
void Skin_Init_Translation (void);
void Skin_Set_Translate (struct player_info_s *player);
void Skin_Do_Translation (player_info_t *player);
void Skin_Process (skin_t *skin, struct tex_s *);
#endif

47
include/QF/texture.h Normal file
View file

@ -0,0 +1,47 @@
/*
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

View file

@ -214,7 +214,7 @@ GL_SubdivideSurface (msurface_t *fa)
// speed up sin calculations - Ed
float turbsin[] = {
# include "gl_warp_sin.h"
# include "QF/gl_warp_sin.h"
};
#define TURBSCALE (256.0 / (2 * M_PI))

View file

@ -31,9 +31,10 @@
#endif
#include "QF/cvar.h"
#include "glquake.h"
#include "QF/sys.h"
#include "glquake.h"
extern double realtime;
extern model_t *loadmodel;
@ -43,6 +44,7 @@ msurface_t *warpface;
extern cvar_t *gl_subdivide_size;
void
BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
{
@ -61,6 +63,7 @@ BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
}
}
void
SubdividePolygon (int numverts, float *verts)
{
@ -144,6 +147,7 @@ SubdividePolygon (int numverts, float *verts)
}
}
/*
GL_SubdivideSurface
@ -183,12 +187,12 @@ GL_SubdivideSurface (msurface_t *fa)
//=========================================================
// speed up sin calculations - Ed
float turbsin[] = {
# include "gl_warp_sin.h"
# include "QF/gl_warp_sin.h"
};
#define TURBSCALE (256.0 / (2 * M_PI))
/*