r10624 - in packages/trunk/rott/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2009-12-18 10:49:20 +0000 (Fri, 18 Dec 2009)
New Revision: 10624

Added:
   packages/trunk/rott/debian/patches/01-demo-datadir.patch
Modified:
   packages/trunk/rott/debian/changelog
   packages/trunk/rott/debian/patches/series
Log:
  * debian/patches/01-demo-datadir.patch: New patch, enable
    playback of demo files in DATADIR.



Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog	2009-12-16 03:38:07 UTC (rev 10623)
+++ packages/trunk/rott/debian/changelog	2009-12-18 10:49:20 UTC (rev 10624)
@@ -2,8 +2,10 @@
 
   * Converted from cdbs to debhelper 7.3.
   * Updated my email address.
+  * debian/patches/01-demo-datadir.patch: New patch, enable
+    playback of demo files in DATADIR.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Tue, 08 Dec 2009 13:29:42 +0100
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 18 Dec 2009 11:48:09 +0100
 
 rott (1.1.1-2) unstable; urgency=low
 

Added: packages/trunk/rott/debian/patches/01-demo-datadir.patch
===================================================================
--- packages/trunk/rott/debian/patches/01-demo-datadir.patch	                        (rev 0)
+++ packages/trunk/rott/debian/patches/01-demo-datadir.patch	2009-12-18 10:49:20 UTC (rev 10624)
@@ -0,0 +1,45 @@
+Enable playback of demo files in DATADIR.
+
+--- rott-1.1.1.orig/rott/rt_net.c
++++ rott-1.1.1/rott/rt_net.c
+@@ -3077,10 +3077,10 @@
+ 
+ void GetDemoFilename (int demonumber, char * filename)
+ {
+-   strcpy(filename,"demo0_0.dmo\0");
++   strcpy(filename,DATADIR "DEMO0_0.DMO\0");
+ 
+-   filename[4] = (char)('0' + (byte)demonumber);
+-   filename[6] = (char)('0' + (byte)gamestate.violence);
++   filename[3 + sizeof(DATADIR)] = (char)('0' + (byte)demonumber);
++   filename[5 + sizeof(DATADIR)] = (char)('0' + (byte)gamestate.violence);
+    FixFilePath(filename);
+ }
+ //****************************************************************************
+@@ -3091,7 +3091,7 @@
+ 
+ boolean DemoExists (int demonumber)
+ {
+-   char demo[20];
++   char demo[20 + sizeof(DATADIR)];
+ 
+    GetDemoFilename (demonumber, &demo[0]);
+    if (access (demo, F_OK) == 0)
+@@ -3120,7 +3120,7 @@
+ 
+ void SaveDemo (int demonumber)
+ {
+-   char demo[20];
++   char demo[20 + sizeof(DATADIR)];
+ 
+    RecordDemoCmd ();
+    GetDemoFilename (demonumber, &demo[0]);
+@@ -3136,7 +3136,7 @@
+ 
+ void LoadDemo (int demonumber)
+ {
+-   char demo[20];
++   char demo[20 + sizeof(DATADIR)];
+    int size;
+ 
+    GetDemoFilename (demonumber, demo);

Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series	2009-12-16 03:38:07 UTC (rev 10623)
+++ packages/trunk/rott/debian/patches/series	2009-12-18 10:49:20 UTC (rev 10624)
@@ -1,3 +1,4 @@
 #00-disable-audiolib.patch
 #00-ludicrous-gibs.patch
 #00-registered-version.patch
+01-demo-datadir.patch