mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r26550) -Change: Show measured order times in timetable GUI

This commit is contained in:
fonsinchen 2014-05-01 14:53:06 +00:00
parent 11d98f043e
commit 64e4e52c33
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lang/english.txt
View File

@ -3795,9 +3795,13 @@ STR_TIMETABLE_TOOLTIP :{BLACK}Timetabl
STR_TIMETABLE_NO_TRAVEL :No travel STR_TIMETABLE_NO_TRAVEL :No travel
STR_TIMETABLE_NOT_TIMETABLEABLE :Travel (automatic; timetabled by next manual order) STR_TIMETABLE_NOT_TIMETABLEABLE :Travel (automatic; timetabled by next manual order)
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled) STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled)
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :Travel with at most {2:VELOCITY} (not timetabled) STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :Travel (not timetabled) with at most {2:VELOCITY}
STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING1} STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING1}
STR_TIMETABLE_TRAVEL_FOR_SPEED :Travel for {STRING1} with at most {VELOCITY} STR_TIMETABLE_TRAVEL_FOR_SPEED :Travel for {STRING1} with at most {VELOCITY}
STR_TIMETABLE_TRAVEL_FOR_ESTIMATED :Travel (for {STRING1}, not timetabled)
STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED :Travel (for {STRING1}, not timetabled) with at most {VELOCITY}
STR_TIMETABLE_STAY_FOR_ESTIMATED :(stay for {STRING1}, not timetabled)
STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED :(travel for {STRING1}, not timetabled)
STR_TIMETABLE_STAY_FOR :and stay for {STRING1} STR_TIMETABLE_STAY_FOR :and stay for {STRING1}
STR_TIMETABLE_AND_TRAVEL_FOR :and travel for {STRING1} STR_TIMETABLE_AND_TRAVEL_FOR :and travel for {STRING1}
STR_TIMETABLE_DAYS :{COMMA} day{P "" s} STR_TIMETABLE_DAYS :{COMMA} day{P "" s}

8
src/order_gui.cpp
View File

@ -266,8 +266,8 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
if (timetable) { if (timetable) {
SetDParam(3, STR_EMPTY); SetDParam(3, STR_EMPTY);
if (order->IsWaitTimetabled()) { if (order->GetWaitTime() > 0) {
SetDParam(5, STR_TIMETABLE_STAY_FOR); SetDParam(5, order->IsWaitTimetabled() ? STR_TIMETABLE_STAY_FOR : STR_TIMETABLE_STAY_FOR_ESTIMATED);
SetTimetableParams(6, 7, order->GetWaitTime()); SetTimetableParams(6, 7, order->GetWaitTime());
} }
} else { } else {
@ -334,8 +334,8 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
SetDParam(4, value); SetDParam(4, value);
} }
if (timetable && order->IsWaitTimetabled()) { if (timetable && order->GetWaitTime() > 0) {
SetDParam(5, STR_TIMETABLE_AND_TRAVEL_FOR); SetDParam(5, order->IsWaitTimetabled() ? STR_TIMETABLE_AND_TRAVEL_FOR : STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED);
SetTimetableParams(6, 7, order->GetWaitTime()); SetTimetableParams(6, 7, order->GetWaitTime());
} else { } else {
SetDParam(5, STR_EMPTY); SetDParam(5, STR_EMPTY);

20
src/timetable_cmd.cpp
View File

@ -116,8 +116,8 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
ModifyTimetableFlags mtf = Extract<ModifyTimetableFlags, 28, 2>(p1); ModifyTimetableFlags mtf = Extract<ModifyTimetableFlags, 28, 2>(p1);
if (mtf >= MTF_END) return CMD_ERROR; if (mtf >= MTF_END) return CMD_ERROR;
int wait_time = order->GetTimetabledWait(); int wait_time = order->GetWaitTime();
int travel_time = order->GetTimetabledTravel(); int travel_time = order->GetTravelTime();
int max_speed = order->GetMaxSpeed(); int max_speed = order->GetMaxSpeed();
switch (mtf) { switch (mtf) {
case MTF_WAIT_TIME: case MTF_WAIT_TIME:
@ -137,7 +137,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
NOT_REACHED(); NOT_REACHED();
} }
if (wait_time != order->GetTimetabledWait()) { if (wait_time != order->GetWaitTime()) {
switch (order->GetType()) { switch (order->GetType()) {
case OT_GOTO_STATION: case OT_GOTO_STATION:
if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE); if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE);
@ -150,13 +150,19 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
} }
} }
if (travel_time != order->GetTimetabledTravel() && order->IsType(OT_CONDITIONAL)) return CMD_ERROR; if (travel_time != order->GetTravelTime() && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
if (max_speed != order->GetMaxSpeed() && (order->IsType(OT_CONDITIONAL) || v->type == VEH_AIRCRAFT)) return CMD_ERROR; if (max_speed != order->GetMaxSpeed() && (order->IsType(OT_CONDITIONAL) || v->type == VEH_AIRCRAFT)) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (wait_time != order->GetTimetabledWait()) ChangeTimetable(v, order_number, wait_time, MTF_WAIT_TIME, wait_time > 0); if (wait_time != order->GetWaitTime() || (wait_time > 0 && !order->IsWaitTimetabled())) {
if (travel_time != order->GetTimetabledTravel()) ChangeTimetable(v, order_number, travel_time, MTF_TRAVEL_TIME, travel_time > 0); ChangeTimetable(v, order_number, wait_time, MTF_WAIT_TIME, wait_time > 0);
if (max_speed != order->GetMaxSpeed()) ChangeTimetable(v, order_number, max_speed, MTF_TRAVEL_SPEED, max_speed != UINT16_MAX); }
if (travel_time != order->GetTravelTime() || (travel_time > 0 && !order->IsTravelTimetabled())) {
ChangeTimetable(v, order_number, travel_time, MTF_TRAVEL_TIME, travel_time > 0);
}
if (max_speed != order->GetMaxSpeed()) {
ChangeTimetable(v, order_number, max_speed, MTF_TRAVEL_SPEED, max_speed != UINT16_MAX);
}
} }
return CommandCost(); return CommandCost();

17
src/timetable_gui.cpp
View File

@ -402,9 +402,16 @@ struct TimetableWindow : Window {
string = STR_TIMETABLE_NOT_TIMETABLEABLE; string = STR_TIMETABLE_NOT_TIMETABLEABLE;
colour = ((i == selected) ? TC_SILVER : TC_GREY) | TC_NO_SHADE; colour = ((i == selected) ? TC_SILVER : TC_GREY) | TC_NO_SHADE;
} else if (!order->IsTravelTimetabled()) { } else if (!order->IsTravelTimetabled()) {
string = order->GetMaxSpeed() != UINT16_MAX ? if (order->GetTravelTime() > 0) {
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED : SetTimetableParams(0, 1, order->GetTravelTime());
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED; string = order->GetMaxSpeed() != UINT16_MAX ?
STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED :
STR_TIMETABLE_TRAVEL_FOR_ESTIMATED;
} else {
string = order->GetMaxSpeed() != UINT16_MAX ?
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED;
}
} else { } else {
SetTimetableParams(0, 1, order->GetTimetabledTravel()); SetTimetableParams(0, 1, order->GetTimetabledTravel());
string = order->GetMaxSpeed() != UINT16_MAX ? string = order->GetMaxSpeed() != UINT16_MAX ?
@ -546,7 +553,7 @@ struct TimetableWindow : Window {
StringID current = STR_EMPTY; StringID current = STR_EMPTY;
if (order != NULL) { if (order != NULL) {
uint time = (selected % 2 == 1) ? order->GetTimetabledTravel() : order->GetTimetabledWait(); uint time = (selected % 2 == 1) ? order->GetTravelTime() : order->GetWaitTime();
if (!_settings_client.gui.timetable_in_ticks) time /= DAY_TICKS; if (!_settings_client.gui.timetable_in_ticks) time /= DAY_TICKS;
if (time != 0) { if (time != 0) {
@ -556,7 +563,7 @@ struct TimetableWindow : Window {
} }
this->query_is_speed_query = false; this->query_is_speed_query = false;
ShowQueryString(current, STR_TIMETABLE_CHANGE_TIME, 31, this, CS_NUMERAL, QSF_NONE); ShowQueryString(current, STR_TIMETABLE_CHANGE_TIME, 31, this, CS_NUMERAL, QSF_ACCEPT_UNCHANGED);
break; break;
} }