Mercurial > hg > openttd
changeset 8064:77c27cd64609 draft
(svn r11625) -Codechange: add CO_* enum at some places, add includes of order.h too
author | smatz <smatz@openttd.org> |
---|---|
date | Wed, 12 Dec 2007 14:37:35 +0000 |
parents | 84f26bedd0d3 |
children | 7db06d2429ce |
files | src/ai/trolly/trolly.cpp src/autoreplace_cmd.cpp src/order_cmd.cpp src/order_gui.cpp src/vehicle.cpp |
diffstat | 5 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -37,6 +37,7 @@ #include "../../vehicle.h" #include "../../date.h" #include "../ai.h" +#include "../../order.h" // This function is called after StartUp. It is the init of an AI static void AiNew_State_FirstTime(Player *p) @@ -1171,7 +1172,7 @@ assert(p->ainew.state == AI_STATE_GIVE_ORDERS); if (p->ainew.veh_main_id != INVALID_VEHICLE) { - AI_DoCommand(0, p->ainew.veh_id + (p->ainew.veh_main_id << 16), 0, DC_EXEC, CMD_CLONE_ORDER); + AI_DoCommand(0, p->ainew.veh_id + (p->ainew.veh_main_id << 16), CO_SHARE, DC_EXEC, CMD_CLONE_ORDER); p->ainew.state = AI_STATE_START_VEHICLE; return;
--- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -18,7 +18,7 @@ #include "cargotype.h" #include "group.h" #include "strings.h" - +#include "order.h" /* * move the cargo from one engine to another if possible
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -983,7 +983,7 @@ /* If we had shared orders, recover that */ if (bak->clone != INVALID_VEHICLE) { - DoCommandP(0, v->index | (bak->clone << 16), 0, NULL, CMD_CLONE_ORDER); + DoCommandP(0, v->index | (bak->clone << 16), CO_SHARE, NULL, CMD_CLONE_ORDER); } else { /* CMD_NO_TEST_IF_IN_NETWORK is used here, because CMD_INSERT_ORDER checks if the
--- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -27,6 +27,7 @@ #include "vehicle_gui.h" #include "timetable.h" #include "cargotype.h" +#include "order.h" enum OrderWindowWidgets { ORDER_WIDGET_CLOSEBOX = 0, @@ -364,7 +365,7 @@ // obviously if you press CTRL on a non-empty orders vehicle you know what you are doing if (v->num_orders != 0 && _ctrl_pressed == 0) return false; - if (DoCommandP(v->tile, v->index | (u->index << 16), _ctrl_pressed ? 0 : 1, NULL, + if (DoCommandP(v->tile, v->index | (u->index << 16), _ctrl_pressed ? CO_SHARE : CO_COPY, NULL, _ctrl_pressed ? CMD_CLONE_ORDER | CMD_MSG(STR_CANT_SHARE_ORDER_LIST) : CMD_CLONE_ORDER | CMD_MSG(STR_CANT_COPY_ORDER_LIST))) { WP(w,order_d).sel = -1; ResetObjectToPlace();