mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1177) Enable non-stop flag for waypoints

release/0.4.5
tron 2004-12-19 21:03:16 +00:00
parent 0807891501
commit 7182b2508d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/english.txt
View File

@ -1086,6 +1086,7 @@ STR_HEADING_FOR_WAYPOINT :{LTBLUE}Heading for {WAYPOINT}
STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY} STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
STR_GO_TO_WAYPOINT :Go via {WAYPOINT} STR_GO_TO_WAYPOINT :Go via {WAYPOINT}
STR_GO_NON_STOP_TO_WAYPOINT :Go non-stop via {WAYPOINT}
STR_WAYPOINTNAME_CITY :Waypoint {TOWN} STR_WAYPOINTNAME_CITY :Waypoint {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA16} STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA16}

3
order_cmd.c
View File

@ -177,7 +177,8 @@ int32 CmdModifyOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
sched = &v->schedule_ptr[sel]; sched = &v->schedule_ptr[sel];
if (sched->type != OT_GOTO_STATION && if (sched->type != OT_GOTO_STATION &&
(sched->type != OT_GOTO_DEPOT || (p2 >> 8) == 1)) (sched->type != OT_GOTO_DEPOT || (p2 >> 8) == 1) &&
(sched->type != OT_GOTO_WAYPOINT || (p2 >> 8) != 2))
return CMD_ERROR; return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

8
order_gui.c
View File

@ -72,6 +72,12 @@ static void DrawOrdersWindow(Window *w)
SETBIT(w->disabled_state, 9); /* unload */ SETBIT(w->disabled_state, 9); /* unload */
SetDParam(2,STR_SERVICE); SetDParam(2,STR_SERVICE);
break; break;
case OT_GOTO_WAYPOINT:
SETBIT(w->disabled_state, 8); /* full load */
SETBIT(w->disabled_state, 9); /* unload */
break;
default: default:
SETBIT(w->disabled_state, 6); /* nonstop */ SETBIT(w->disabled_state, 6); /* nonstop */
SETBIT(w->disabled_state, 8); /* full load */ SETBIT(w->disabled_state, 8); /* full load */
@ -118,7 +124,7 @@ static void DrawOrdersWindow(Window *w)
SetDParam(1, s); SetDParam(1, s);
} else if (ord.type == OT_GOTO_WAYPOINT) { } else if (ord.type == OT_GOTO_WAYPOINT) {
SetDParam(2, ord.station); SetDParam(2, ord.station);
SetDParam(1, STR_GO_TO_WAYPOINT); SetDParam(1, (ord.flags & OF_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
} }
} }
{ {