r452 - packages/cube/cube/trunk/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-04-09 22:19:47 +0000 (Sun, 09 Apr 2006)
New Revision: 452

Modified:
   packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
Log:
still crash


Modified: packages/cube/cube/trunk/debian/patches/02_data_in_usr_share
===================================================================
--- packages/cube/cube/trunk/debian/patches/02_data_in_usr_share	2006-04-09 14:02:20 UTC (rev 451)
+++ packages/cube/cube/trunk/debian/patches/02_data_in_usr_share	2006-04-09 22:19:47 UTC (rev 452)
@@ -6,49 +6,60 @@
 
 @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-10 00:05:49.000000000 +0200
+@@ -67,8 +67,11 @@
+     if(qsphere) gluDeleteQuadric(qsphere);
+ };
  
-     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)");
++
++
+ bool installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)
+ {
++    texname = fullpath (texname);
+     SDL_Surface *s = IMG_Load(texname);
+     if(!s) { conoutf("couldn't load texture %s", texname); return false; };
+     if(s->format->BitsPerPixel!=24) { conoutf("texture must be 24bpp: %s", texname); return false; };
+diff -ru cube-2005.08.29.orig/src/tools.cpp cube-2005.08.29/src/tools.cpp
+--- cube-2005.08.29.orig/src/tools.cpp	2005-08-13 21:18:46.000000000 +0200
++++ cube-2005.08.29/src/tools.cpp	2006-04-09 23:56:03.000000000 +0200
+@@ -98,10 +98,27 @@
+ };
  
-     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 *fullpath(char *s)
++{
++  if (s[0] == '/')
++    return s;
++
++  char prefixe = "/usr/share/cube/";
++
++  char *ret;
++
++  ret = malloc (sizeof(char)*(strlen(prefixe)+strlen(s)));
++  strcpy (ret, prefixe);
++  strcat (ret, s);
++
++  return ret;
++}
++
+ ///////////////////////// misc tools ///////////////////////
+ 
+ char *path(char *s)
+ {
++    s = fullpath (s);
+     for(char *t = s; t = strpbrk(t, "/\\"); *t++ = PATHDIV);
+     return s;
+ };
+diff -ru cube-2005.08.29.orig/src/tools.h cube-2005.08.29/src/tools.h
+--- cube-2005.08.29.orig/src/tools.h	2005-08-14 19:09:22.000000000 +0200
++++ cube-2005.08.29/src/tools.h	2006-04-10 00:10:11.000000000 +0200
+@@ -110,6 +110,7 @@
+ 
+ 
+ 
++extern char *fullpath(char *s);
+ extern char *path(char *s);
+ extern char *loadfile(char *fn, int *size);
+ extern void endianswap(void *, int, int);