(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
This means that any user attempt to remove a rear engine will tell the user to move the front engine instead This fixes the assert when moving multiheaded engines (introduced in r3144) Note: to make old savegames use this feature, some engines might be turned around in order to link engines in pairs -Codechange: train subtype is now a bitmask This allows fast access to info like if it is a wagon or engine and if it is in front and so on Note: savegame version bump
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#include "signs.h"
|
||||
#include "waypoint.h"
|
||||
#include "variables.h"
|
||||
#include "train.h"
|
||||
|
||||
#include "network_data.h"
|
||||
#include "network_client.h"
|
||||
@@ -799,7 +800,7 @@ static void ToolbarTrainClick(Window *w)
|
||||
int dis = -1;
|
||||
|
||||
FOR_ALL_VEHICLES(v) {
|
||||
if (v->type == VEH_Train && v->subtype == TS_Front_Engine) CLRBIT(dis, v->owner);
|
||||
if (v->type == VEH_Train && IsFrontEngine(v)) CLRBIT(dis, v->owner);
|
||||
}
|
||||
PopupMainPlayerToolbMenu(w, 310, 13, dis);
|
||||
}
|
||||
|
Reference in New Issue
Block a user