qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-29 15:23:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct GL_4_BYTES to GLuint. Also some whitespace/comment cleanups

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2000-12-20 21:59:56 +00:00
parent 8d579b7a0b
commit 87b5defa64
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/gl_draw.c
View file

@ -489,12 +489,7 @@ Draw_Init (void)
draw_chars[i] = 255; // proper transparent color draw_chars[i] = 255; // proper transparent color
// now turn them into textures // now turn them into textures
char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1); // 1999-12-27 char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1); // 1999-12-27 Conwidth/height charset fix by TcT
// Conwidth/height
// charset
// fix
// by
// TcT
cs_texture = GL_LoadTexture ("crosshair", 8, 8, cs_data, false, true, 1); cs_texture = GL_LoadTexture ("crosshair", 8, 8, cs_data, false, true, 1);
// char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1); // 1999-12-27 Conwidth/height charset fix by TcT // char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1); // 1999-12-27 Conwidth/height charset fix by TcT
@ -1178,7 +1173,7 @@ GL_Upload32 (unsigned int *data, int width, int height, qboolean mipmap,
if (! if (!
(scaled = (scaled =
malloc (scaled_width * scaled_height * malloc (scaled_width * scaled_height *
sizeof (GL_4_BYTES)))) Sys_Error ("GL_LoadTexture: too big"); sizeof (GLuint)))) Sys_Error ("GL_LoadTexture: too big");
samples = alpha ? gl_alpha_format : gl_solid_format; samples = alpha ? gl_alpha_format : gl_solid_format;
@ -1400,7 +1395,7 @@ GL_LoadTexture (char *identifier, int width, int height, byte * data,
GL_Upload8 (data, width, height, mipmap, alpha); GL_Upload8 (data, width, height, mipmap, alpha);
break; break;
case 4: case 4:
GL_Upload32 ((unsigned int *) data, width, height, mipmap, alpha); GL_Upload32 ((GLuint *) data, width, height, mipmap, alpha);
break; break;
default: default:
Sys_Error ("SetupTexture: unknown bytesperpixel %i", Sys_Error ("SetupTexture: unknown bytesperpixel %i",