Merge branch 'order_occupancy-sx' into jgrpp

Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-09 23:45:21 +01:00
12 changed files with 129 additions and 1 deletions

View File

@@ -245,6 +245,7 @@ Order::Order(uint32 packed)
this->dest = GB(packed, 16, 16);
this->next = NULL;
this->refit_cargo = CT_NO_REFIT;
this->occupancy = 0;
this->wait_time = 0;
this->travel_time = 0;
this->max_speed = UINT16_MAX;