r455 - packages/cube/cube/trunk/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-04-10 23:30:37 +0000 (Mon, 10 Apr 2006)
New Revision: 455

Modified:
   packages/cube/cube/trunk/debian/patches/03_fix_crash_with_bad_gl_installation.patch
Log:
This patch is the good one


Modified: packages/cube/cube/trunk/debian/patches/03_fix_crash_with_bad_gl_installation.patch
===================================================================
--- packages/cube/cube/trunk/debian/patches/03_fix_crash_with_bad_gl_installation.patch	2006-04-10 23:27:53 UTC (rev 454)
+++ packages/cube/cube/trunk/debian/patches/03_fix_crash_with_bad_gl_installation.patch	2006-04-10 23:30:37 UTC (rev 455)
@@ -7,49 +7,15 @@
 
 @DPATCH@
 
-diff -ru cube-2005.08.29.orig/src/main.cpp cube-2005.08.29/src/main.cpp
---- cube-2005.08.29.orig/src/main.cpp	2005-08-29 01:38:52.000000000 +0200
-+++ cube-2005.08.29/src/main.cpp	2006-04-04 22:35:37.000000000 +0200
-@@ -148,15 +148,15 @@
+diff -ru cube-2005.08.29.orig/src/rendergl.cpp cube-2005.08.29/src/rendergl.cpp
+--- cube-2005.08.29.orig/src/rendergl.cpp	2005-08-16 05:25:10.000000000 +0200
++++ cube-2005.08.29/src/rendergl.cpp	2006-04-11 01:16:40.000000000 +0200
+@@ -46,7 +46,7 @@
  
-     log("basetex");
-     int xs, ys;
--    if(!installtex(2,  path(newstring("data/newchars.png")), xs, ys) ||
--       !installtex(3,  path(newstring("data/martin/base.png")), xs, ys) ||
--       !installtex(6,  path(newstring("data/martin/ball1.png")), xs, ys) ||
--       !installtex(7,  path(newstring("data/martin/smoke.png")), xs, ys) ||
--       !installtex(8,  path(newstring("data/martin/ball2.png")), xs, ys) ||
--       !installtex(9,  path(newstring("data/martin/ball3.png")), xs, ys) ||
--       !installtex(4,  path(newstring("data/explosion.jpg")), xs, ys) ||
--       !installtex(5,  path(newstring("data/items.png")), xs, ys) ||
--       !installtex(1,  path(newstring("data/crosshair.png")), xs, ys)) fatal("could not find core textures (hint: run cube from the parent of the bin directory)");
-+    if(!installtex(2,  path(newstring("/usr/share/cube/data/newchars.png")), xs, ys) ||
-+       !installtex(3,  path(newstring("/usr/share/cube/data/martin/base.png")), xs, ys) ||
-+       !installtex(6,  path(newstring("/usr/share/cube/data/martin/ball1.png")), xs, ys) ||
-+       !installtex(7,  path(newstring("/usr/share/cube/data/martin/smoke.png")), xs, ys) ||
-+       !installtex(8,  path(newstring("/usr/share/cube/data/martin/ball2.png")), xs, ys) ||
-+       !installtex(9,  path(newstring("/usr/share/cube/data/martin/ball3.png")), xs, ys) ||
-+       !installtex(4,  path(newstring("/usr/share/cube/data/explosion.jpg")), xs, ys) ||
-+       !installtex(5,  path(newstring("/usr/share/cube/data/items.png")), xs, ys) ||
-+       !installtex(1,  path(newstring("/usr/share/cube/data/crosshair.png")), xs, ys)) fatal("could not find core textures (hint: run cube from the parent of the bin directory)");
- 
-     log("sound");
-     initsound();
-@@ -164,12 +164,12 @@
-     log("cfg");
-     newmenu("frags\tpj\tping\tteam\tname");
-     newmenu("ping\tplr\tserver");
--    exec("data/keymap.cfg");
--    exec("data/menus.cfg");
--    exec("data/prefabs.cfg");
--    exec("data/sounds.cfg");
-+    exec("/usr/share/cube/data/keymap.cfg");
-+    exec("/usr/share/cube/data/menus.cfg");
-+    exec("/usr/share/cube/data/prefabs.cfg");
-+    exec("/usr/share/cube/data/sounds.cfg");
-     exec("servers.cfg");
--    if(!execfile("config.cfg")) execfile("data/defaults.cfg");
-+    if(!execfile("config.cfg")) execfile("/usr/share/cube/data/defaults.cfg");
-     exec("autoexec.cfg");
- 
-     log("localconnect");
+     char *exts = (char *)glGetString(GL_EXTENSIONS);
+     
+-    if(strstr(exts, "GL_EXT_texture_env_combine")) hasoverbright = true;
++    if((exts != NULL) && strstr(exts, "GL_EXT_texture_env_combine")) hasoverbright = true;
+     else conoutf("WARNING: cannot use overbright lighting, using old lighting model!");
+         
+     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &glmaxtexsize);