r498 - packages/cube/trunk/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-04-15 01:18:22 +0000 (Sat, 15 Apr 2006)
New Revision: 498

Modified:
   packages/cube/trunk/debian/patches/02_data_in_usr_share.patch
Log:
patch work fine
todo: find a way to expore the data path


Modified: packages/cube/trunk/debian/patches/02_data_in_usr_share.patch
===================================================================
--- packages/cube/trunk/debian/patches/02_data_in_usr_share.patch	2006-04-15 00:14:00 UTC (rev 497)
+++ packages/cube/trunk/debian/patches/02_data_in_usr_share.patch	2006-04-15 01:18:22 UTC (rev 498)
@@ -8,7 +8,7 @@
 
 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
++++ cube-2005.08.29/src/rendergl.cpp	2006-04-15 03:13:28.000000000 +0200
 @@ -67,8 +67,11 @@
      if(qsphere) gluDeleteQuadric(qsphere);
  };
@@ -23,7 +23,7 @@
      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
++++ cube-2005.08.29/src/tools.cpp	2006-04-15 03:13:28.000000000 +0200
 @@ -98,10 +98,27 @@
  };
  
@@ -33,11 +33,11 @@
 +  if (s[0] == '/')
 +    return s;
 +
-+  char *prefixe = "/usr/share/cube/";
++  char prefixe[] = "/usr/share/cube/";
 +
 +  char *ret;
 +
-+  ret = malloc (sizeof(char)*(strlen(prefixe)+strlen(s)));
++  ret = (char*)malloc (sizeof(char)*(strlen(prefixe)+strlen(s)+1));
 +  strcpy (ret, prefixe);
 +  strcat (ret, s);
 +
@@ -54,7 +54,7 @@
  };
 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
++++ cube-2005.08.29/src/tools.h	2006-04-15 03:13:28.000000000 +0200
 @@ -110,6 +110,7 @@
  
  
@@ -63,3 +63,24 @@
  extern char *path(char *s);
  extern char *loadfile(char *fn, int *size);
  extern void endianswap(void *, int, int);
+diff -ru cube-2005.08.29.orig/src/worldio.cpp cube-2005.08.29/src/worldio.cpp
+--- cube-2005.08.29.orig/src/worldio.cpp	2005-08-13 21:16:30.000000000 +0200
++++ cube-2005.08.29/src/worldio.cpp	2006-04-15 03:13:28.000000000 +0200
+@@ -133,7 +133,7 @@
+     if(!*mname) mname = getclientmap();
+     setnames(mname);
+     backup(cgzname, bakname);
+-    gzFile f = gzopen(cgzname, "wb9");
++    gzFile f = gzopen(fullpath(cgzname), "wb9");
+     if(!f) { conoutf("could not write map to %s", cgzname); return; };
+     hdr.version = MAPVERSION;
+     hdr.numents = 0;
+@@ -212,7 +212,7 @@
+     cleardlights();
+     pruneundos();
+     setnames(mname);
+-    gzFile f = gzopen(cgzname, "rb9");
++    gzFile f = gzopen(fullpath(cgzname), "rb9");
+     if(!f) { conoutf("could not read map %s", cgzname); return; };
+     gzread(f, &hdr, sizeof(header)-sizeof(int)*16);
+     endianswap(&hdr.version, sizeof(int), 4);