SOURCES (AC-branch): openttd-personal-data.patch - adjusted for 0....

[hawk]

Author: hawk                         Date: Thu Mar 29 23:19:21 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- adjusted for 0.5.1 RC2

---- Files affected:
SOURCES:
   openttd-personal-data.patch (1.3 -> 1.3.2.1) 

---- Diffs:

================================================================
Index: SOURCES/openttd-personal-data.patch
diff -u SOURCES/openttd-personal-data.patch:1.3 SOURCES/openttd-personal-data.patch:1.3.2.1
--- SOURCES/openttd-personal-data.patch:1.3	Mon May 16 01:13:15 2005
+++ SOURCES/openttd-personal-data.patch	Fri Mar 30 01:19:16 2007
@@ -1,56 +1,67 @@
-diff -ruN openttd./fileio.c openttd/fileio.c
---- openttd./fileio.c	2004-12-07 18:16:57.000000000 +0100
-+++ openttd/fileio.c	2004-12-07 19:29:33.034947832 +0100
-@@ -121,6 +121,11 @@
+diff -ur openttd-0.5.1-RC2.orig/fileio.c openttd-0.5.1-RC2/fileio.c
+--- openttd-0.5.1-RC2.orig/fileio.c	2006-12-09 11:56:12.000000000 +0100
++++ openttd-0.5.1-RC2/fileio.c	2007-03-29 21:53:06.000000000 +0200
+@@ -134,6 +134,11 @@
  		}
  #endif
  	}
 +	if (f == NULL) {
-+		// Look for file in personal data dir
-+		sprintf(buf, "%s%s", _path.personal_data_dir, filename);
++		snprintf(buf, lengthof(buf), "%s%s", _paths.personal_data_dir, filename);
++		strtolower(buf + strlen(_paths.personal_data_dir) - 1);
 +		f = fopen(buf, "rb");
 +	}
  #endif
  
- 	if (f == NULL)
-@@ -167,6 +167,11 @@
- 		}
- #endif
+ 	return f;
+diff -ur openttd-0.5.1-RC2.orig/gfxinit.c openttd-0.5.1-RC2/gfxinit.c
+--- openttd-0.5.1-RC2.orig/gfxinit.c	2007-02-08 11:04:57.000000000 +0100
++++ openttd-0.5.1-RC2/gfxinit.c	2007-03-29 21:56:42.000000000 +0200
+@@ -135,6 +135,18 @@
  	}
+ #endif
+ 
++#if !defined(WIN32)
 +	if (f == NULL) {
-+		// Look for file in personal data dir
-+		sprintf(buf, "%s%s", _path.personal_data_dir, filename);
++		snprintf(buf, lengthof(buf), "%s%s", _paths.personal_data_dir, file.filename);
 +		f = fopen(buf, "rb");
++
++		if (f == NULL) {
++			strtolower(buf + strlen(_paths.personal_data_dir) - 1);
++			f = fopen(buf, "rb");
++		}
 +	}
- #endif
- 
- 	if (f == NULL)
-diff -ruN openttd./unix.c openttd/unix.c
---- openttd./unix.c	2004-12-07 19:31:02.136402352 +0100
-+++ openttd/unix.c	2004-12-07 19:27:33.786076416 +0100
-@@ -507,6 +507,7 @@
- 	_path.scenario_dir = str_fmt("%sscenario", _path.personal_dir);
- 	_path.gm_dir = str_fmt("%sgm/", _path.game_data_dir);
- 	_path.data_dir = str_fmt("%sdata/", _path.game_data_dir);
-+	_path.personal_data_dir = str_fmt("%sdata/", _path.personal_dir);
++#endif
++
+ 	if (f != NULL) {
+ 		md5_state_t filemd5state;
+ 		md5_byte_t buffer[1024];
+diff -ur openttd-0.5.1-RC2.orig/unix.c openttd-0.5.1-RC2/unix.c
+--- openttd-0.5.1-RC2.orig/unix.c	2007-03-19 21:17:24.000000000 +0100
++++ openttd-0.5.1-RC2/unix.c	2007-03-29 21:50:11.000000000 +0200
+@@ -220,6 +220,7 @@
+ 	_paths.heightmap_dir = str_fmt("%sscenario/heightmap", _paths.personal_dir);
+ 	_paths.gm_dir = str_fmt("%sgm/", _paths.game_data_dir);
+ 	_paths.data_dir = str_fmt("%sdata/", _paths.game_data_dir);
++	_paths.personal_data_dir = str_fmt("%sdata/", _paths.personal_dir);
  
  	if (_config_file == NULL)
- 		_config_file = str_fmt("%sopenttd.cfg", _path.personal_dir);
-@@ -522,5 +523,6 @@
- 	mkdir(_path.save_dir, 0755);
- 	mkdir(_path.autosave_dir, 0755);
- 	mkdir(_path.scenario_dir, 0755);
-+	mkdir(_path.personal_data_dir, 0755);
+ 		_config_file = str_fmt("%sopenttd.cfg", _paths.personal_dir);
+@@ -241,6 +242,7 @@
+ 	mkdir(_paths.autosave_dir, 0755);
+ 	mkdir(_paths.scenario_dir, 0755);
+ 	mkdir(_paths.heightmap_dir, 0755);
++	mkdir(_paths.personal_data_dir, 0755);
  }
  
-diff -ruN openttd./variables.h openttd/variables.h
---- openttd./variables.h	2004-12-07 18:16:57.000000000 +0100
-+++ openttd/variables.h	2004-12-07 19:25:40.088361096 +0100
-@@ -193,6 +193,7 @@
- typedef struct Paths {
- 	char *personal_dir;  // includes cfg file and save folder
- 	char *game_data_dir; // includes data, gm, lang
-+	char *personal_data_dir; // personal game data, like newgrf files
- 	char *data_dir;
- 	char *gm_dir;
- 	char *lang_dir;
+ bool InsertTextBufferClipboard(Textbuf *tb)
+diff -ur openttd-0.5.1-RC2.orig/variables.h openttd-0.5.1-RC2/variables.h
+--- openttd-0.5.1-RC2.orig/variables.h	2007-02-08 11:19:03.000000000 +0100
++++ openttd-0.5.1-RC2/variables.h	2007-03-29 21:49:13.000000000 +0200
+@@ -260,6 +260,7 @@
+ 	char *scenario_dir;
+ 	char *heightmap_dir;
+ 	char *second_data_dir;
++	char *personal_data_dir;
+ } Paths;
+ 
+ VARDEF Paths _paths;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openttd-personal-data.patch?r1=1.3&r2=1.3.2.1&f=u