dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r955) Replace uint16 for orders with struct Order

Browse Source 
This adds no functionality, but is a stepping stone for future improvement (like 16bit order indices) and is easier to read.
This changes preserves binary compatibility wrt savegames.
This commit is contained in:
tron
2004-12-05 12:43:04 +00:00
parent 1de8e294d8
commit 7c2448ecea
20 changed files with 582 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ship_gui.c
View File

@@ -498,15 +498,15 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) {
} else if (v->vehstatus & VS_STOPPED) {
str = STR_8861_STOPPED;
} else {
switch(v->next_order & OT_MASK) {
switch (v->current_order.type) {
case OT_GOTO_STATION: {
SetDParam(0, v->next_order_param);
SetDParam(0, v->current_order.station);
SetDParam(1, v->cur_speed * 10 >> 5);
str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
} break;
case OT_GOTO_DEPOT: {
Depot *dep = &_depots[v->next_order_param];
Depot *dep = &_depots[v->current_order.station];
SetDParam(0, dep->town_index);
SetDParam(1, v->cur_speed * 10 >> 5);
str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed;
@@ -836,16 +836,14 @@ void ShowShipDepotWindow(uint tile)
static void DrawSmallShipSchedule(Vehicle *v, int x, int y) {
uint16 *sched;
Order *sched;
int sel;
uint ord;
Station *st;
int i = 0;
sched = v->schedule_ptr;
sel = v->cur_order_index;
while ((ord=*sched++) != 0) {
for (sched = v->schedule_ptr; sched->type != OT_NOTHING; ++sched) {
if (sel == 0) {
_stringwidth_base = 0xE0;
DoDrawString( "\xAF", x-6, y, 16);
@@ -853,11 +851,11 @@ static void DrawSmallShipSchedule(Vehicle *v, int x, int y) {
}
sel--;
if ((ord & OT_MASK) == OT_GOTO_STATION) {
st = DEREF_STATION(ord >> 8);
if (sched->type == OT_GOTO_STATION) {
st = DEREF_STATION(sched->station);
if (!(st->had_vehicle_of_type & HVOT_BUOY)) {
SetDParam(0, ord >> 8);
SetDParam(0, sched->station);
DrawString(x, y, STR_A036, 0);
y += 6;