Okay, here you go. It all appears to be working - I guess in this little whirlwind of development we may have knocked something out of kilter, but it all looks about right to me!
*download latest code here*
I actually used the tool above to do most of the merge - very neat! It did get a bit confused in map.bb, but I tracked it down to a dodgy invisible char at the end of a line, so fair enough! Of course, I then forgot that I needed to update room files, add a tile, needed to add your switch tile to the test.obj... well anyway, it's done now!
Someone mentioned an alternate CVS based free site on an old thread, I may scan back to see if that's any good.
*download latest code here*
I actually used the tool above to do most of the merge - very neat! It did get a bit confused in map.bb, but I tracked it down to a dodgy invisible char at the end of a line, so fair enough! Of course, I then forgot that I needed to update room files, add a tile, needed to add your switch tile to the test.obj... well anyway, it's done now!
Someone mentioned an alternate CVS based free site on an old thread, I may scan back to see if that's any good.