mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15705) -Fix: Do not show passenger-/mail-capacity if the aircraft carries only cargo.

release/0.7
frosch 2009-03-13 23:49:12 +00:00
parent 40745dc0d9
commit fa35dc10e5
4 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ai/api/ai_engine.cpp
View File

@ -64,10 +64,11 @@
{ {
if (!IsValidEngine(engine_id)) return -1; if (!IsValidEngine(engine_id)) return -1;
switch (::GetEngine(engine_id)->type) { const Engine *e = ::GetEngine(engine_id);
switch (e->type) {
case VEH_ROAD: case VEH_ROAD:
case VEH_TRAIN: { case VEH_TRAIN: {
uint16 *capacities = GetCapacityOfArticulatedParts(engine_id, ::GetEngine(engine_id)->type); uint16 *capacities = GetCapacityOfArticulatedParts(engine_id, e->type);
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoID c = 0; c < NUM_CARGO; c++) {
if (capacities[c] == 0) continue; if (capacities[c] == 0) continue;
return capacities[c]; return capacities[c];
@ -75,15 +76,13 @@
return -1; return -1;
} break; } break;
case VEH_SHIP: { case VEH_SHIP:
const ShipVehicleInfo *vi = ::ShipVehInfo(engine_id); return e->u.ship.capacity;
return vi->capacity; break;
} break;
case VEH_AIRCRAFT: { case VEH_AIRCRAFT:
const AircraftVehicleInfo *vi = ::AircraftVehInfo(engine_id); return AircraftDefaultCargoCapacity(e->GetDefaultCargoType(), &e->u.air);
return vi->passenger_capacity; break;
} break;
default: NOT_REACHED(); default: NOT_REACHED();
} }

19
src/ai/api/ai_event_types.cpp
View File

@ -28,10 +28,11 @@ CargoID AIEventEnginePreview::GetCargoType()
int32 AIEventEnginePreview::GetCapacity() int32 AIEventEnginePreview::GetCapacity()
{ {
switch (::GetEngine(engine)->type) { const Engine *e = ::GetEngine(engine);
switch (e->type) {
case VEH_ROAD: case VEH_ROAD:
case VEH_TRAIN: { case VEH_TRAIN: {
uint16 *capacities = GetCapacityOfArticulatedParts(engine, ::GetEngine(engine)->type); uint16 *capacities = GetCapacityOfArticulatedParts(engine, e->type);
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoID c = 0; c < NUM_CARGO; c++) {
if (capacities[c] == 0) continue; if (capacities[c] == 0) continue;
return capacities[c]; return capacities[c];
@ -39,15 +40,13 @@ int32 AIEventEnginePreview::GetCapacity()
return -1; return -1;
} break; } break;
case VEH_SHIP: { case VEH_SHIP:
const ShipVehicleInfo *vi = ::ShipVehInfo(engine); return e->u.ship.capacity;
return vi->capacity; break;
} break;
case VEH_AIRCRAFT: { case VEH_AIRCRAFT:
const AircraftVehicleInfo *vi = ::AircraftVehInfo(engine); return AircraftDefaultCargoCapacity(e->GetDefaultCargoType(), &e->u.air);
return vi->passenger_capacity; break;
} break;
default: NOT_REACHED(); default: NOT_REACHED();
} }

7
src/build_vehicle_gui.cpp
View File

@ -237,8 +237,11 @@ static int CDECL ShipEngineCapacitySorter(const void *a, const void *b)
/* Aircraft sorting functions */ /* Aircraft sorting functions */
static int CDECL AircraftEngineCargoSorter(const void *a, const void *b) static int CDECL AircraftEngineCargoSorter(const void *a, const void *b)
{ {
int va = AircraftVehInfo(*(const EngineID*)a)->passenger_capacity; const Engine *e_a = GetEngine(*(const EngineID*)a);
int vb = AircraftVehInfo(*(const EngineID*)b)->passenger_capacity; const Engine *e_b = GetEngine(*(const EngineID*)b);
int va = AircraftDefaultCargoCapacity(e_a->GetDefaultCargoType(), &e_a->u.air);
int vb = AircraftDefaultCargoCapacity(e_b->GetDefaultCargoType(), &e_b->u.air);
int r = va - vb; int r = va - vb;
if (r == 0) { if (r == 0) {

17
src/engine_gui.cpp
View File

@ -14,6 +14,7 @@
#include "engine_gui.h" #include "engine_gui.h"
#include "articulated_vehicles.h" #include "articulated_vehicles.h"
#include "rail.h" #include "rail.h"
#include "aircraft.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
@ -144,16 +145,26 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw) static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw)
{ {
const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
const Engine *e = GetEngine(engine); const Engine *e = GetEngine(engine);
CargoID cargo = e->GetDefaultCargoType();
if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {
SetDParam(0, e->GetCost()); SetDParam(0, e->GetCost());
SetDParam(1, e->GetDisplayMaxSpeed()); SetDParam(1, e->GetDisplayMaxSpeed());
SetDParam(2, avi->passenger_capacity); SetDParam(2, e->u.air.passenger_capacity);
SetDParam(3, avi->mail_capacity); SetDParam(3, e->u.air.mail_capacity);
SetDParam(4, e->GetRunningCost()); SetDParam(4, e->GetRunningCost());
DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw); DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw);
} else {
SetDParam(0, e->GetCost());
SetDParam(1, e->GetDisplayMaxSpeed());
SetDParam(2, cargo);
SetDParam(3, AircraftDefaultCargoCapacity(cargo, &e->u.air));
SetDParam(4, e->GetRunningCost());
DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw);
}
} }
static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw) static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw)