fix for missing (byte *) cast, and fix for WIN32 function lookup code in vid_shared.c
authorlordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 16 Jan 2002 18:47:28 +0000 (18:47 +0000)
committerlordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 16 Jan 2002 18:47:28 +0000 (18:47 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1347 d7cf8633-e32d-0410-b094-e92efae38249

buildnumber.c
gl_textures.c
vid_shared.c

index 343f7a0..b20af01 100644 (file)
@@ -1,4 +1,4 @@
 
-#define BUILDNUMBER 605
+#define BUILDNUMBER 606
 
 int buildnumber = BUILDNUMBER;
index 00ad39b..fb0c0ae 100644 (file)
@@ -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)
index f5ec2f6..d27ab4a 100644 (file)
@@ -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