fix merged build (d3d color references, renderinfo fixes)

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2993 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2008-06-01 22:34:19 +00:00
parent 519983dee2
commit 5c65851fb7
4 changed files with 1416 additions and 1417 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -40,7 +40,7 @@ void GLDraw_BeginDisc (void);
void GLDraw_EndDisc (void); void GLDraw_EndDisc (void);
void GLDraw_TileClear (int x, int y, int w, int h); void GLDraw_TileClear (int x, int y, int w, int h);
void GLDraw_FillRGB (int x, int y, int w, int h, float r, float g, float b); void GLDraw_FillRGB (int x, int y, int w, int h, float r, float g, float b);
void GLDraw_Fill (int x, int y, int w, int h, int c); void GLDraw_Fill (int x, int y, int w, int h, unsigned int c);
void GLDraw_FadeScreen (void); void GLDraw_FadeScreen (void);
void GLDraw_String (int x, int y, const qbyte *str); void GLDraw_String (int x, int y, const qbyte *str);
void GLDraw_Alt_String (int x, int y, const qbyte *str); void GLDraw_Alt_String (int x, int y, const qbyte *str);

View file

@ -4086,6 +4086,7 @@ rendererinfo_t d3drendererinfo = {
GLDraw_ReInit, GLDraw_ReInit,
GLDraw_Character, GLDraw_Character,
GLDraw_ColouredCharacter, GLDraw_ColouredCharacter,
GLDraw_TinyCharacter,
GLDraw_String, GLDraw_String,
GLDraw_Alt_String, GLDraw_Alt_String,
GLDraw_Crosshair, GLDraw_Crosshair,