Merge branch 'master' into jgrpp

# Conflicts:
#	src/string.cpp

bin/baseset/orig_dos.obm

@@ -0,0 +1,76 @@
+; $Id$
+;
+; This represents the original music as on the Transport
+; Tycoon Deluxe for DOS CD.
+;
+[metadata]
+name              = original_dos
+shortname         = TTDD
+version           = 1
+description       = Original Transport Tycoon Deluxe DOS edition music.
+
+[files]
+theme = gm.cat
+old_0 = gm.cat
+old_1 = gm.cat
+old_2 = gm.cat
+old_3 = gm.cat
+old_4 = gm.cat
+old_5 = gm.cat
+old_6 = gm.cat
+old_7 = gm.cat
+old_8 =
+old_9 =
+new_0 = gm.cat
+new_1 = gm.cat
+new_2 = gm.cat
+new_3 = gm.cat
+new_4 = gm.cat
+new_5 = gm.cat
+new_6 = gm.cat
+new_7 =
+new_8 =
+new_9 =
+ezy_0 = gm.cat
+ezy_1 = gm.cat
+ezy_2 = gm.cat
+ezy_3 = gm.cat
+ezy_4 = gm.cat
+ezy_5 = gm.cat
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[md5s]
+gm.cat = 7a29d2d0c4f7d2e03091ffa9b2bdfffb
+
+[catindex]
+theme = 0
+old_0 = 1
+old_1 = 8
+old_2 = 2
+old_3 = 9
+old_4 = 14
+old_5 = 15
+old_6 = 19
+old_7 = 13
+new_0 = 6
+new_1 = 11
+new_2 = 10
+new_3 = 17
+new_4 = 21
+new_5 = 18
+new_6 = 5
+ezy_0 = 12
+ezy_1 = 7
+ezy_2 = 16
+ezy_3 = 3
+ezy_4 = 20
+ezy_5 = 4
+
+[names]
+; Names get read from the CAT file
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_tto.obm

@@ -0,0 +1,71 @@
+; $Id$
+;
+; This represents the original music as on the Transport
+; Tycoon (with World Editor) for DOS CD.
+;
+[metadata]
+name              = original_tto
+shortname         = TTOD
+version           = 1
+description       = Original Transport Tycoon (Original/World Editor) music.
+
+[files]
+theme = gm-tto.cat
+old_0 = gm-tto.cat
+old_1 = gm-tto.cat
+old_2 = gm-tto.cat
+old_3 = gm-tto.cat
+old_4 = gm-tto.cat
+old_5 = gm-tto.cat
+old_6 = gm-tto.cat
+old_7 = gm-tto.cat
+old_8 =
+old_9 =
+new_0 = gm-tto.cat
+new_1 = gm-tto.cat
+new_2 = gm-tto.cat
+new_3 = gm-tto.cat
+new_4 = gm-tto.cat
+new_5 = gm-tto.cat
+new_6 = gm-tto.cat
+new_7 = gm-tto.cat
+new_8 =
+new_9 =
+ezy_0 =
+ezy_1 =
+ezy_2 =
+ezy_3 =
+ezy_4 =
+ezy_5 =
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[catindex]
+theme = 0
+old_0 = 1
+old_1 = 6
+old_2 = 2
+old_3 = 7
+old_4 = 11
+old_5 = 12
+old_6 = 15
+old_7 = 10
+new_0 = 4
+new_1 = 5
+new_2 = 9
+new_3 = 8
+new_4 = 13
+new_5 = 16
+new_6 = 14
+new_7 = 3
+
+[md5s]
+gm-tto.cat = 26e85ff84b0063aa5da05dd4698fc76e
+
+[names]
+; Names get read from the CAT file
+
+[origin]
+default      = You can find it on your Transport Tycoon CD-ROM.