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 343f7a05f8614f9073428c694d0e424b5d74398d..b20af01c8f24fafdb65a51003a80c2705d028b26 100644 (file)
--- 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 00ad39b3da8331960247ffa53dff9befbee75446..fb0c0ae599a6e5e81dddc23f91ac63409ec9b801 100644 (file)
--- 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 f5ec2f6eb9387740cc6bca23439587796103fd88..d27ab4ae2b5b71b6b49df1b9010e14f089142980 100644 (file)
--- 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