diff --git a/ddraw.rc b/ddraw.rc index 1bf4acf..7473f98 100644 --- a/ddraw.rc +++ b/ddraw.rc @@ -2,7 +2,7 @@ #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d) #define str(s) #s -#define VERSION 1,1,6,4 +#define VERSION 1,1,6,5 1 VERSIONINFO FILEVERSION VERSION diff --git a/inc/main.h b/inc/main.h index be838f6..9c9e292 100644 --- a/inc/main.h +++ b/inc/main.h @@ -20,8 +20,6 @@ #include #include "ddraw.h" #include "debug.h" -#include -#include #define CUTSCENE_WIDTH 640 #define CUTSCENE_HEIGHT 400 diff --git a/inc/opengl.h b/inc/opengl.h index cca8c4d..5549a44 100644 --- a/inc/opengl.h +++ b/inc/opengl.h @@ -55,16 +55,7 @@ extern PFNGLBUFFERDATAPROC glBufferData; extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; extern PFNGLDELETEBUFFERSPROC glDeleteBuffers; -extern PFNGLGENBUFFERSARBPROC glGenBuffersARB; -extern PFNGLBINDBUFFERARBPROC glBindBufferARB; -extern PFNGLBUFFERDATAARBPROC glBufferDataARB; -extern PFNGLDELETEBUFFERSARBPROC glDeleteBuffersARB; -extern PFNGLMAPBUFFERARBPROC glMapBufferARB; -extern PFNGLUNMAPBUFFERARBPROC glUnmapBufferARB; - -extern PFNGLACTIVETEXTUREARBPROC glActiveTexture; -extern PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture; -extern PFNGLMULTITEXCOORD2FPROC glMultiTexCoord2f; +extern PFNGLACTIVETEXTUREPROC glActiveTexture; extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; diff --git a/src/opengl.c b/src/opengl.c index 9edda36..308be31 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -50,16 +50,7 @@ PFNGLBUFFERDATAPROC glBufferData = NULL; PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer = NULL; PFNGLDELETEBUFFERSPROC glDeleteBuffers = NULL; -PFNGLGENBUFFERSARBPROC glGenBuffersARB = NULL; -PFNGLBINDBUFFERARBPROC glBindBufferARB = NULL; -PFNGLBUFFERDATAARBPROC glBufferDataARB = NULL; -PFNGLDELETEBUFFERSARBPROC glDeleteBuffersARB = NULL; -PFNGLMAPBUFFERARBPROC glMapBufferARB = NULL; -PFNGLUNMAPBUFFERARBPROC glUnmapBufferARB = NULL; - -PFNGLACTIVETEXTUREARBPROC glActiveTexture = NULL; -PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture = NULL; -PFNGLMULTITEXCOORD2FPROC glMultiTexCoord2f = NULL; +PFNGLACTIVETEXTUREPROC glActiveTexture = NULL; PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers = NULL; PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer = NULL; @@ -115,16 +106,7 @@ void OpenGL_Init() glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)wglGetProcAddress("glVertexAttribPointer"); glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)wglGetProcAddress("glDeleteBuffers"); - glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)wglGetProcAddress("glGenBuffersARB"); - glBindBufferARB = (PFNGLBINDBUFFERARBPROC)wglGetProcAddress("glBindBufferARB"); - glBufferDataARB = (PFNGLBUFFERDATAARBPROC)wglGetProcAddress("glBufferDataARB"); - glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)wglGetProcAddress("glDeleteBuffersARB"); - glMapBufferARB = (PFNGLMAPBUFFERARBPROC)wglGetProcAddress("glMapBufferARB"); - glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)wglGetProcAddress("glUnmapBufferARB"); - - glActiveTexture = (PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTexture"); - glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)wglGetProcAddress("glClientActiveTexture"); - glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)wglGetProcAddress("glMultiTexCoord2f"); + glActiveTexture = (PFNGLACTIVETEXTUREPROC)wglGetProcAddress("glActiveTexture"); glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)wglGetProcAddress("glGenFramebuffers"); glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)wglGetProcAddress("glBindFramebuffer");