From: lordhavoc Date: Wed, 16 Jan 2002 18:47:28 +0000 (+0000) Subject: fix for missing (byte *) cast, and fix for WIN32 function lookup code in vid_shared.c X-Git-Tag: RELEASE_0_2_0_RC1~725 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=18b154b2b81e0928bd3534b3352976c619545218 fix for missing (byte *) cast, and fix for WIN32 function lookup code in vid_shared.c git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1347 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/buildnumber.c b/buildnumber.c index 343f7a05..b20af01c 100644 --- a/buildnumber.c +++ b/buildnumber.c @@ -1,4 +1,4 @@ -#define BUILDNUMBER 605 +#define BUILDNUMBER 606 int buildnumber = BUILDNUMBER; diff --git a/gl_textures.c b/gl_textures.c index 00ad39b3..fb0c0ae5 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -818,7 +818,7 @@ static void R_ResampleTexture (void *indata, int inwidth, int inheight, void *ou fracstep = inwidth*0x10000/outwidth; for (i = 0;i < outheight;i++) { - inrow = indata + inwidth3*(i*inheight/outheight); + inrow = (byte *)indata + inwidth3*(i*inheight/outheight); frac = fracstep >> 1; j = outwidth - 4; while (j >= 0) diff --git a/vid_shared.c b/vid_shared.c index f5ec2f6e..d27ab4ae 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -92,7 +92,7 @@ static void gl_getfuncs_end(void) static void *gl_getfuncaddress(char *name) { #ifdef WIN32 - return (void *) wglGetProcAddress(func->name); + return (void *) wglGetProcAddress(name); #else return (void *) dlsym(prjobj, name); #endif