ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2025-02-16 17:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

USHORT -> unsigned short

Browse source
This commit is contained in:
Jonathan Gray 2013-04-23 20:54:21 +10:00
parent 9e50610608
commit 3aaacddbb2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/qcommon/cm_draw.cpp
View file

@ -548,7 +548,7 @@ void CDraw32::DrawLineAANC(long x0, long y0, long x1, long y1, CPixel32 color)
// Y-major line; calculate 16-bit fixed-point fractional part of a // Y-major line; calculate 16-bit fixed-point fractional part of a
// pixel that X advances each time Y advances 1 pixel, truncating the // pixel that X advances each time Y advances 1 pixel, truncating the
// result so that we won't overrun the endpoint along the X axis // result so that we won't overrun the endpoint along the X axis
unsigned short ErrorAdj = unsigned short unsigned short ErrorAdj = (unsigned short)
(((unsigned long) DeltaX << 16) / (unsigned long) DeltaY); (((unsigned long) DeltaX << 16) / (unsigned long) DeltaY);
// Draw all pixels other than the first and last // Draw all pixels other than the first and last
@ -580,7 +580,7 @@ void CDraw32::DrawLineAANC(long x0, long y0, long x1, long y1, CPixel32 color)
// It's an X-major line; calculate 16-bit fixed-point fractional part of a // It's an X-major line; calculate 16-bit fixed-point fractional part of a
// pixel that Y advances each time X advances 1 pixel, truncating the // pixel that Y advances each time X advances 1 pixel, truncating the
// result to avoid overrunning the endpoint along the X axis // result to avoid overrunning the endpoint along the X axis
unsigned short ErrorAdj = unsigned short unsigned short ErrorAdj = (unsigned short)
(((unsigned long) DeltaY << 16) / (unsigned long) DeltaX); (((unsigned long) DeltaY << 16) / (unsigned long) DeltaX);
// Draw all pixels other than the first and last // Draw all pixels other than the first and last
while (--DeltaX) while (--DeltaX)

2
code/renderer/tr_image.cpp
View file

@ -748,7 +748,7 @@ static void Upload32( unsigned *data,
qboolean isLightmap, qboolean isLightmap,
qboolean allowTC, qboolean allowTC,
int *pformat, int *pformat,
USHORT *pUploadWidth, USHORT *pUploadHeight ) unsigned short *pUploadWidth, unsigned short *pUploadHeight )
{ {
if (format == GL_RGBA) if (format == GL_RGBA)
{ {

2
code/renderer/tr_local.h
View file

@ -119,7 +119,7 @@ typedef struct image_s {
char imgName[MAX_QPATH]; // game path, including extension char imgName[MAX_QPATH]; // game path, including extension
int frameUsed; // for texture usage in frame statistics int frameUsed; // for texture usage in frame statistics
#endif #endif
USHORT width, height; // source image unsigned short width, height; // source image
// int imgfileSize; // int imgfileSize;
GLuint texnum; // gl texture binding GLuint texnum; // gl texture binding