[SCM] transportation simulator branch, master, updated. upstream/100.0-26-g8ed85fd

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 8ed85fd7e737318f7f20ed6d13101211b3f8bdd3
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Wed Jul 2 17:43:16 2008 +0200

    Remove cast from `const char*' to `int' in simconvoi.cc
    
    * Remove cast from `const char*' to `int' in simconvoi.cc
      + new patch fix_casts.diff

diff --git a/debian/changelog b/debian/changelog
index 6b6426f..491a423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+simutrans (100.0+ds1-2) UNRELEASED; urgency=low
+
+  * Remove cast from `const char*' to `int' in simconvoi.cc
+    + new patch fix_casts.diff
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Wed, 02 Jul 2008 17:34:26 +0200
+
 simutrans (100.0+ds1-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]
diff --git a/debian/patches/fix_casts.diff b/debian/patches/fix_casts.diff
new file mode 100644
index 0000000..73c0740
--- /dev/null
+++ b/debian/patches/fix_casts.diff
@@ -0,0 +1,13 @@
+Index: simutrans/simconvoi.cc
+===================================================================
+--- simutrans.orig/simconvoi.cc
++++ simutrans/simconvoi.cc
+@@ -2142,7 +2142,7 @@
+ 		(const char *)(state_names[state]),
+ 		(int)alte_richtung,
+ 		(long)(jahresgewinn/100),
+-		(int)name_and_id,
++		name_and_id,
+ 		(int)line_id,
+ 		(const void *)fpl );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2e34ad9..e444917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 path-for-game-data.diff
 config.diff
 fix_makeobj_compilation.diff
+fix_casts.diff

-- 
transportation simulator