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

(svn r11) Feature: Copy/share orders now works from ship depot window for ships and hangar window for aircraft

This commit is contained in:
dominik 2004-08-10 16:54:34 +00:00
parent 39267dbad5
commit ee4511a836
4 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aircraft_gui.c
View File

@ -694,12 +694,16 @@ static int GetVehicleFromAircraftDepotWndPt(Window *w, int x, int y, Vehicle **v
static void AircraftDepotClickAircraft(Window *w, int x, int y)
{
Vehicle *v;
int mode = GetVehicleFromAircraftDepotWndPt(w, x, y, &v);
switch(GetVehicleFromAircraftDepotWndPt(w, x, y, &v)) {
// share / copy orders
if (_thd.place_mode && mode <= 0) { _place_clicked_vehicle = v; return; }
switch(mode) {
case 1:
return;
case 0:
case 0: // start dragging of vehicle
if (v != NULL) {
WP(w,traindepot_d).sel = v->index;
SetWindowDirty(w);
@ -707,11 +711,11 @@ static void AircraftDepotClickAircraft(Window *w, int x, int y)
}
break;
case -1:
case -1: // show info window
ShowAircraftViewWindow(v);
break;
case -2:
case -2: // click start/stop flag
DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_AIRCRAFT | CMD_MSG(STR_A016_CAN_T_STOP_START_AIRCRAFT));
break;

18
roadveh_gui.c
View File

@ -562,14 +562,16 @@ static int GetVehicleFromRoadDepotWndPt(Window *w, int x, int y, Vehicle **veh)
static void RoadDepotClickVeh(Window *w, int x, int y)
{
Vehicle *v;
int r;
int mode;
r = GetVehicleFromRoadDepotWndPt(w, x, y, &v);
if (r > 0) return;
mode = GetVehicleFromRoadDepotWndPt(w, x, y, &v);
if (mode > 0) return;
if (_thd.place_mode) { _place_clicked_vehicle = v; return; }
switch (r) {
case 0:
// share / copy orders
if (_thd.place_mode && mode <= 0) { _place_clicked_vehicle = v; return; }
switch (mode) {
case 0: // start dragging of vehicle
if (v != NULL) {
WP(w,traindepot_d).sel = v->index;
SetWindowDirty(w);
@ -577,11 +579,11 @@ static void RoadDepotClickVeh(Window *w, int x, int y)
}
break;
case -1:
case -1: // show info window
ShowRoadVehViewWindow(v);
break;
case -2:
case -2: // click start/stop flag
DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_ROADVEH | CMD_MSG(STR_9015_CAN_T_STOP_START_ROAD_VEHICLE));
break;

14
ship_gui.c
View File

@ -694,12 +694,16 @@ static int GetVehicleFromShipDepotWndPt(Window *w, int x, int y, Vehicle **veh)
static void ShipDepotClick(Window *w, int x, int y)
{
Vehicle *v;
int mode = GetVehicleFromShipDepotWndPt(w, x, y, &v);
switch (GetVehicleFromShipDepotWndPt(w, x, y, &v)) {
case 1:
// share / copy orders
if (_thd.place_mode && mode <= 0) { _place_clicked_vehicle = v; return; }
switch (mode) {
case 1: // invalid
return;
case 0:
case 0: // start dragging of vehicle
if (v != NULL) {
WP(w,traindepot_d).sel = v->index;
SetWindowDirty(w);
@ -708,11 +712,11 @@ static void ShipDepotClick(Window *w, int x, int y)
}
break;
case -1:
case -1: // show info window
ShowShipViewWindow(v);
break;
case -2:
case -2: // click start/stop flag
DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_SHIP | CMD_MSG(STR_9818_CAN_T_STOP_START_SHIP));
break;

9
train_gui.c
View File

@ -442,13 +442,14 @@ static void TrainDepotClickTrain(Window *w, int x, int y)
Vehicle *v;
mode = GetVehicleFromTrainDepotWndPt(w, x, y, &gdvp);
// share / copy orders
if (_thd.place_mode && mode <= 0) { _place_clicked_vehicle = gdvp.head; return; }
v = gdvp.wagon;
switch(mode) {
case 0:
case 0: // start dragging of vehicle
sel = (int16)WP(w,traindepot_d).sel;
if (sel != -1) {
WP(w,traindepot_d).sel = INVALID_VEHICLE;
@ -460,11 +461,11 @@ static void TrainDepotClickTrain(Window *w, int x, int y)
}
break;
case -1:
case -1: // show info window
ShowTrainViewWindow(v);
break;
case -2:
case -2: // click start/stop flag
DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_TRAIN | CMD_MSG(STR_883B_CAN_T_STOP_START_TRAIN));
break;
}