Inkelyad,
having some trouble merging the Experimental version: I get compile errors with this line in simvehikel.h:
static sint32 speed_unlimited() {return std::numeric_limits<sint32>::max(); }
1>f:\my documents\development\simutrans\simutrans-experimental-sources\vehicle/simvehikel.h(412): warning C4003: not enough actual parameters for macro 'max'
1>f:\my documents\development\simutrans\simutrans-experimental-sources\vehicle/simvehikel.h(412): error C2589: '(' : illegal token on right side of '::'
1>f:\my documents\development\simutrans\simutrans-experimental-sources\vehicle/simvehikel.h(412): error C2059: syntax error : '::'