gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-22 07:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r572) -newgrf: Support for custom (newGRF-yielded) refit masks for trains and aircrafts (pasky).

Browse Source
This commit is contained in:
darkvater 2004-11-13 21:42:35 +00:00
parent 0a2f28c2f2
commit 1f12dee3a0
2 changed files with 64 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
aircraft_gui.c
View File

@ -219,17 +219,39 @@ static void AircraftRefitWndProc(Window *w, WindowEvent *e)
x = 6;
y = 25;
sel = WP(w,refit_d).sel;
b = _aircraft_refit_types[_opt.landscape];
do {
color = 16;
if (sel == 0) {
cargo = *b;
color = 12;
#define show_cargo(ctype) { \
color = 16; \
if (sel == 0) { \
cargo = ctype; \
color = 12; \
} \
sel--; \
DrawString(x, y, _cargoc.names_s[ctype], color); \
y += 10; \
}
if (_engine_refit_masks[v->engine_type]) {
uint32 mask = _engine_refit_masks[v->engine_type];
int cid = 0;
for (; mask; mask >>= 1, cid++) {
if (!(mask & 1)) // not this cid
continue;
if (!(_local_cargo_id_landscape[cid] & (1 << _opt.landscape))) // not in this landscape
continue;
show_cargo(_local_cargo_id_ctype[cid]);
}
sel--;
DrawString(x,y,_cargoc.names_s[*b], color);
y += 10;
} while (*++b != 0xFF);
} else { // generic refit list
b = _aircraft_refit_types[_opt.landscape];
do {
show_cargo(*b);
} while (*++b != 0xFF);
}
#undef show_cargo
WP(w,refit_d).cargo = cargo;

42
train_gui.c
View File

@ -623,17 +623,39 @@ static void RailVehicleRefitWndProc(Window *w, WindowEvent *e)
x = 6;
y = 25;
sel = WP(w,refit_d).sel;
b = _rail_vehicle_refit_types[_opt.landscape];
do {
color = 16;
if (sel == 0) {
cargo = *b;
color = 12;
#define show_cargo(ctype) { \
color = 16; \
if (sel == 0) { \
cargo = ctype; \
color = 12; \
} \
sel--; \
DrawString(x, y, _cargoc.names_s[ctype], color); \
y += 10; \
}
if (_engine_refit_masks[v->engine_type]) {
uint32 mask = _engine_refit_masks[v->engine_type];
int cid = 0;
for (; mask; mask >>= 1, cid++) {
if (!(mask & 1)) // not this cid
continue;
if (!(_local_cargo_id_landscape[cid] & (1 << _opt.landscape))) // not in this landscape
continue;
show_cargo(_local_cargo_id_ctype[cid]);
}
sel--;
DrawString(x,y,_cargoc.names_s[*b], color);
y += 10;
} while (*++b != 255);
} else { // generic refit list
b = _rail_vehicle_refit_types[_opt.landscape];
do {
show_cargo(*b);
} while (*++b != 255);
}
#undef show_cargo
WP(w,refit_d).cargo = cargo;