--- deliantra/Deliantra-Client/Client.xs 2009/12/21 23:52:34 1.296 +++ deliantra/Deliantra-Client/Client.xs 2009/12/22 01:37:41 1.299 @@ -43,6 +43,8 @@ /* work around os x broken headers */ #ifdef __MACOSX__ typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); #endif #define PANGO_ENABLE_BACKEND @@ -99,7 +101,6 @@ #define TEXID_SPEECH 1 #define TEXID_NOFACE 2 -#define TEXID_HIDDEN 3 static AV *texture_av; @@ -931,6 +932,9 @@ #define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); #include "glfunc.h" #undef GL_FUNC + + if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; + if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; } } OUTPUT: @@ -1673,9 +1677,9 @@ PROTOTYPE: @ CODE: { - glEnable (GL_TEXTURE_2D); glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + glEnable (GL_TEXTURE_2D); glBindTexture (GL_TEXTURE_2D, name1); glColor3f (intensity, intensity, intensity); @@ -2143,7 +2147,7 @@ rc_t *rc = rc_alloc (); rc_t *rc_ov = rc_alloc (); rc_key_t key; - rc_array_t *arr, *arr_hidden; + rc_array_t *arr; pl_tex.name = 0; @@ -2191,9 +2195,6 @@ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - key.texname = self->tex [TEXID_HIDDEN].name; - arr_hidden = rc_array (rc_ov, &key); - for (z = 0; z <= 2; z++) { memset (smooth_level, 0, sizeof (smooth_level));