ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-22 04:11:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

USHORT -> unsigned short

Browse source
This commit is contained in:
Jonathan Gray 2013-04-25 14:59:26 +10:00
parent 067e58ea4e
commit 4d606a650d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
codemp/qcommon/cm_draw.cpp
View file

@ -550,7 +550,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
// 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
unsigned short ErrorAdj = unsigned short
unsigned short ErrorAdj = (unsigned short)
(((unsigned long) DeltaX << 16) / (unsigned long) DeltaY);
// Draw all pixels other than the first and last
@ -582,7 +582,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
// pixel that Y advances each time X advances 1 pixel, truncating the
// 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);
// Draw all pixels other than the first and last
while (--DeltaX)

4
codemp/renderer/tr_image.cpp
View file

@ -590,7 +590,7 @@ static void Upload32( unsigned *data,
qboolean isLightmap,
qboolean allowTC,
int *pformat,
USHORT *pUploadWidth, USHORT *pUploadHeight, bool bRectangle = false )
unsigned short *pUploadWidth, unsigned short *pUploadHeight, bool bRectangle = false )
{
GLuint uiTarget = GL_TEXTURE_2D;
if ( bRectangle )
@ -796,7 +796,7 @@ static void Upload32_3D( unsigned *data,
qboolean isLightmap,
qboolean allowTC,
int *pformat,
USHORT *pUploadWidth, USHORT *pUploadHeight )
unsigned short *pUploadWidth, unsigned short *pUploadHeight )
{
int samples;
int i, c;

4
codemp/renderer/tr_local.h
View file

@ -117,7 +117,7 @@ typedef struct {
#ifdef _XBOX
typedef struct image_s {
int imgCode;
USHORT width, height; // source image
unsigned short width, height; // source image
GLuint texnum; // gl texture binding
int internalFormat;
@ -135,7 +135,7 @@ typedef struct image_s {
typedef struct image_s {
char imgName[MAX_QPATH]; // game path, including extension
USHORT width, height; // after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
unsigned short width, height; // after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
GLuint texnum; // gl texture binding
int frameUsed; // for texture usage in frame statistics