Sisyphus repositório
Última atualização: 1 outubro 2023 | SRPMs: 18631 | Visitas: 37573845
en ru br
ALT Linux repositórios
S:2.5.1.3-alt2
5.0: 2.4.8.2-alt1
4.1: 2.4.6.1-alt1
4.0: 2.4.6.1-alt1

Group :: Jogos/Arcade
RPM: prboom-plus

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: prboom-plus-2.4.6.1-alt.patch
Download

diff -urN prboom-plus-2.4.6.1.orig/src/e6y.c prboom-plus-2.4.6.1/src/e6y.c
--- prboom-plus-2.4.6.1.orig/src/e6y.c	2006-09-16 16:05:20 +0300
+++ prboom-plus-2.4.6.1/src/e6y.c	2006-09-27 04:05:10 +0300
@@ -163,11 +163,11 @@
 float internal_render_fov = FOV90;
 
 #ifdef GL_DOOM
-int idDetail;
+unsigned int idDetail;
 boolean gl_arb_multitexture;
-PFNGLACTIVETEXTUREARBPROC        glActiveTextureARB       = NULL;
-PFNGLCLIENTACTIVETEXTUREARBPROC  glClientActiveTextureARB = NULL;
-PFNGLMULTITEXCOORD2FARBPROC      glMultiTexCoord2fARB     = NULL;
+PFNGLACTIVETEXTUREARBPROC        GLEXT_glActiveTextureARB       = NULL;
+PFNGLCLIENTACTIVETEXTUREARBPROC  GLEXT_glClientActiveTextureARB = NULL;
+PFNGLMULTITEXCOORD2FARBPROC      GLEXT_glMultiTexCoord2fARB     = NULL;
 #endif
 int maxViewPitch;
 int minViewPitch;
@@ -314,7 +314,7 @@
   spechit_magic = DEFAULT_SPECHIT_MAGIC;
   if ((p = M_CheckParm("-spechit")) && (p < myargc-1))
   {
-    if (!StrToInt(myargv[p+1], &spechit_magic))
+    if (!StrToInt(myargv[p+1], (long*)&spechit_magic))
       spechit_magic = DEFAULT_SPECHIT_MAGIC;
   }
 
@@ -549,16 +549,16 @@
   {
     extern void *gld_texcoords;
 
-    glClientActiveTextureARB(GL_TEXTURE0_ARB);
+    GLEXT_glClientActiveTextureARB(GL_TEXTURE0_ARB);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     glTexCoordPointer(2,GL_FLOAT,0,gld_texcoords);
-    glClientActiveTextureARB(GL_TEXTURE1_ARB);
+    GLEXT_glClientActiveTextureARB(GL_TEXTURE1_ARB);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     glTexCoordPointer(2,GL_FLOAT,0,gld_texcoords);
-    glActiveTextureARB(GL_TEXTURE1_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE1_ARB);
     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
     glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 2);
-    glActiveTextureARB(GL_TEXTURE0_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE0_ARB);
   }
 }
 
@@ -572,18 +572,18 @@
   extern int gl_texture_filter_anisotropic;
   extern int gl_tex_format;
 
-  char *extensions = (char*)glGetString(GL_EXTENSIONS);
+  const GLubyte *extensions = glGetString(GL_EXTENSIONS);
 
   gl_arb_multitexture = isExtensionSupported("GL_ARB_multitexture") != NULL;
 
   if (gl_arb_multitexture)
   {
-    glActiveTextureARB       = SDL_GL_GetProcAddress("glActiveTextureARB");
-    glClientActiveTextureARB = SDL_GL_GetProcAddress("glClientActiveTextureARB");
-    glMultiTexCoord2fARB     = SDL_GL_GetProcAddress("glMultiTexCoord2fARB");
+    GLEXT_glActiveTextureARB       = SDL_GL_GetProcAddress("glActiveTextureARB");
+    GLEXT_glClientActiveTextureARB = SDL_GL_GetProcAddress("glClientActiveTextureARB");
+    GLEXT_glMultiTexCoord2fARB     = SDL_GL_GetProcAddress("glMultiTexCoord2fARB");
 
-    if (!glActiveTextureARB    || !glClientActiveTextureARB ||
-        !glMultiTexCoord2fARB)
+    if (!GLEXT_glActiveTextureARB    || !GLEXT_glClientActiveTextureARB ||
+        !GLEXT_glMultiTexCoord2fARB)
       gl_arb_multitexture = false;
   }
   //gl_arb_multitexture = false;
@@ -608,7 +608,7 @@
       if (surf)
       {
         if (gl_arb_multitexture)
-          glActiveTextureARB(GL_TEXTURE1_ARB);
+          GLEXT_glActiveTextureARB(GL_TEXTURE1_ARB);
         glGenTextures(1, &idDetail);
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glBindTexture(GL_TEXTURE_2D, idDetail);
@@ -627,7 +627,7 @@
           glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 2.0);
         
         if (gl_arb_multitexture)
-          glActiveTextureARB(GL_TEXTURE0_ARB);
+          GLEXT_glActiveTextureARB(GL_TEXTURE0_ARB);
         
         SDL_FreeSurface(surf);
         render_canusedetail = true;
@@ -636,7 +636,7 @@
   }
   M_ChangeUseDetail();
   if (gl_arb_multitexture)
-    lprintf(LO_INFO,"e6y: using GL_ARB_multitexture\n",glGetString(GL_VENDOR));
+    lprintf(LO_INFO,"e6y: using GL_ARB_multitexture\n");
 }
 
 float distance2piece(float x0, float y0, float x1, float y1, float x2, float y2)
@@ -1101,7 +1101,7 @@
 
   if (val < 0)
     return -AccelerateMouse(-val);
-  return (int) pow(val, mouse_accelfactor);
+  return (int)(pow((double)val, (double)mouse_accelfactor));
 }
 
 int mlooky;
@@ -1125,7 +1125,7 @@
   {
 //    predefined_translucency_fixed = true;
 //    predefined_translucency_level = compatibility_level;
-    for(i = 0; i < sizeof(predefined_translucency)/sizeof(predefined_translucency[0]); i++)
+    for(i = 0; (size_t)i < sizeof(predefined_translucency)/sizeof(predefined_translucency[0]); i++)
     {
       if (comp[comp_translucency]) 
         mobjinfo[predefined_translucency[i]].flags &= ~MF_TRANSLUCENT;
@@ -1616,7 +1616,12 @@
       {
         unsigned int data_dest = *data_src | ((*(data_src + 1)) << 16);
         data_dest |= data_dest << 8;
+#ifdef _MSC_VER
         *((unsigned int*)pdest)++ = data_dest;
+#else
+        *((unsigned int*)pdest) = data_dest;
+        pdest += sizeof(unsigned int);
+#endif
       }
       if (!interlaced)
         memcpy_fast(pdest_saved + pitch_dest, pdest_saved, pitch_dest);
@@ -1688,4 +1693,4 @@
       }
     }
   }
-}
\ В конце файла нет новой строки
+}
diff -urN prboom-plus-2.4.6.1.orig/src/e6y.h prboom-plus-2.4.6.1/src/e6y.h
--- prboom-plus-2.4.6.1.orig/src/e6y.h	2006-09-16 16:05:20 +0300
+++ prboom-plus-2.4.6.1/src/e6y.h	2006-09-27 04:05:10 +0300
@@ -178,7 +178,7 @@
 extern float internal_render_fov;
 
 extern boolean gl_arb_multitexture;
-extern int idDetail;
+extern unsigned int idDetail;
 
 extern hu_textline_t  w_hudadd;
 extern hu_textline_t  w_centermsg;
diff -urN prboom-plus-2.4.6.1.orig/src/gl_main.c prboom-plus-2.4.6.1/src/gl_main.c
--- prboom-plus-2.4.6.1.orig/src/gl_main.c	2006-09-11 17:10:41 +0300
+++ prboom-plus-2.4.6.1/src/gl_main.c	2006-09-27 04:05:23 +0300
@@ -66,9 +66,9 @@
 #include "e6y.h"//e6y
 
 //e6y
-extern PFNGLACTIVETEXTUREARBPROC        glActiveTextureARB;
-extern PFNGLCLIENTACTIVETEXTUREARBPROC  glClientActiveTextureARB;
-extern PFNGLMULTITEXCOORD2FARBPROC      glMultiTexCoord2fARB;
+extern PFNGLACTIVETEXTUREARBPROC        GLEXT_glActiveTextureARB;
+extern PFNGLCLIENTACTIVETEXTUREARBPROC  GLEXT_glClientActiveTextureARB;
+extern PFNGLMULTITEXCOORD2FARBPROC      GLEXT_glMultiTexCoord2fARB;
 
 extern int tran_filter_pct;
 
@@ -2016,7 +2016,7 @@
         wall->glseg->x2, wall->glseg->z2) < DETAIL_DISTANCE)
   {
     float w, h, s;
-    glActiveTextureARB(GL_TEXTURE1_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE1_ARB);
     glEnable(GL_TEXTURE_2D);
     if (anim_textures[wall->gltexture->index].count==0)
     {
@@ -2032,21 +2032,21 @@
     h = s + wall->gltexture->realtexheight / 18.0f;
     gld_StaticLightAlpha(wall->light, wall->alpha);
     glBegin(GL_TRIANGLE_STRIP);
-      glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ul,wall->vt);
-      glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ul*w,wall->vt*h);
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ul,wall->vt);
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ul*w,wall->vt*h);
       glVertex3f(wall->glseg->x1,wall->ytop,wall->glseg->z1);
-      glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ul,wall->vb); 
-      glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ul*w,wall->vb*h);
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ul,wall->vb); 
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ul*w,wall->vb*h);
       glVertex3f(wall->glseg->x1,wall->ybottom,wall->glseg->z1);
-      glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ur,wall->vt); 
-      glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ur*w,wall->vt*h);
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ur,wall->vt); 
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ur*w,wall->vt*h);
       glVertex3f(wall->glseg->x2,wall->ytop,wall->glseg->z2);
-      glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ur,wall->vb); 
-      glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ur*w,wall->vb*h);
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE0_ARB,wall->ur,wall->vb); 
+      GLEXT_glMultiTexCoord2fARB(GL_TEXTURE1_ARB,wall->ur*w,wall->vb*h);
       glVertex3f(wall->glseg->x2,wall->ybottom,wall->glseg->z2);
     glEnd();
     glDisable(GL_TEXTURE_2D);
-    glActiveTextureARB(GL_TEXTURE0_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE0_ARB);
   }
   else
   {
@@ -2475,7 +2475,7 @@
   if (gl_arb_multitexture && render_detailedflats)
   {
     float s;
-    glActiveTextureARB(GL_TEXTURE1_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE1_ARB);
     glEnable(GL_TEXTURE_2D);
     gld_StaticLight(flat->light);
     if (anim_flats[flat->gltexture->index - firstflat].count==0)
@@ -2533,7 +2533,7 @@
     //glMatrixMode(GL_TEXTURE);
     glPopMatrix();
     glDisable(GL_TEXTURE_2D);
-    glActiveTextureARB(GL_TEXTURE0_ARB);
+    GLEXT_glActiveTextureARB(GL_TEXTURE0_ARB);
   }
 
   glPopMatrix();
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009