REVERT: " Except in network mode, do NOT read comfort/catering/bonus data from savefile -- allow pak to set it."
FIX: Compile error
Merge branch 'prettier-cities-2' of git://github.com/neroden/simutrans.git into 11.x
Merge branch 'jp-11x' into merge-from-james-july-1