equal
deleted
inserted
replaced
70 break; |
70 break; |
71 case OT_GOTO_DEPOT: |
71 case OT_GOTO_DEPOT: |
72 SETBIT(w->disabled_state, 9); /* unload */ |
72 SETBIT(w->disabled_state, 9); /* unload */ |
73 SetDParam(2,STR_SERVICE); |
73 SetDParam(2,STR_SERVICE); |
74 break; |
74 break; |
|
75 |
|
76 case OT_GOTO_WAYPOINT: |
|
77 SETBIT(w->disabled_state, 8); /* full load */ |
|
78 SETBIT(w->disabled_state, 9); /* unload */ |
|
79 break; |
|
80 |
75 default: |
81 default: |
76 SETBIT(w->disabled_state, 6); /* nonstop */ |
82 SETBIT(w->disabled_state, 6); /* nonstop */ |
77 SETBIT(w->disabled_state, 8); /* full load */ |
83 SETBIT(w->disabled_state, 8); /* full load */ |
78 SETBIT(w->disabled_state, 9); /* unload */ |
84 SETBIT(w->disabled_state, 9); /* unload */ |
79 } |
85 } |
116 if (v->type == VEH_Train && ord.flags & OF_NON_STOP) s += 2; |
122 if (v->type == VEH_Train && ord.flags & OF_NON_STOP) s += 2; |
117 if (ord.flags & OF_FULL_LOAD) ++s; /* XXX service */ |
123 if (ord.flags & OF_FULL_LOAD) ++s; /* XXX service */ |
118 SetDParam(1, s); |
124 SetDParam(1, s); |
119 } else if (ord.type == OT_GOTO_WAYPOINT) { |
125 } else if (ord.type == OT_GOTO_WAYPOINT) { |
120 SetDParam(2, ord.station); |
126 SetDParam(2, ord.station); |
121 SetDParam(1, STR_GO_TO_WAYPOINT); |
127 SetDParam(1, (ord.flags & OF_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); |
122 } |
128 } |
123 } |
129 } |
124 { |
130 { |
125 byte color = (i == WP(w,order_d).sel) ? 0xC : 0x10; |
131 byte color = (i == WP(w,order_d).sel) ? 0xC : 0x10; |
126 SetDParam(0, i+1); |
132 SetDParam(0, i+1); |