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

(svn r1410) Replaced all occurences of 'passanger' by 'passenger' in the code

Browse Source
This commit is contained in:
celestar
2005-01-07 08:38:27 +00:00
parent 3b18fba385
commit 91bf7a7448
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aircraft_cmd.c
View File

@@ -71,7 +71,7 @@ void DrawAircraftEngineInfo(int engine, int x, int y, int maxw)
const AircraftVehicleInfo *avi = AircraftVehInfo(engine); const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
SetDParam(0, ((_price.aircraft_base >> 3) * avi->base_cost) >> 5); SetDParam(0, ((_price.aircraft_base >> 3) * avi->base_cost) >> 5);
SetDParam(1, avi->max_speed << 3); SetDParam(1, avi->max_speed << 3);
SetDParam(2, avi->passanger_capacity); SetDParam(2, avi->passenger_capacity);
SetDParam(3, avi->mail_capacity); SetDParam(3, avi->mail_capacity);
SetDParam(4, avi->running_cost * _price.aircraft_running >> 8); SetDParam(4, avi->running_cost * _price.aircraft_running >> 8);
@@ -170,7 +170,7 @@ int32 CmdBuildAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
v->spritenum = avi->image_index; v->spritenum = avi->image_index;
// v->cargo_count = u->number_of_pieces = 0; // v->cargo_count = u->number_of_pieces = 0;
v->cargo_cap = avi->passanger_capacity; v->cargo_cap = avi->passenger_capacity;
u->cargo_cap = avi->mail_capacity; u->cargo_cap = avi->mail_capacity;
v->cargo_type = CT_PASSENGERS; v->cargo_type = CT_PASSENGERS;
@@ -423,7 +423,7 @@ int32 CmdRefitAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(v->owner) || (!CheckStoppedInHangar(v) && !(SkipStoppedInHangerCheck))) if (!CheckOwnership(v->owner) || (!CheckStoppedInHangar(v) && !(SkipStoppedInHangerCheck)))
return CMD_ERROR; return CMD_ERROR;
pass = AircraftVehInfo(v->engine_type)->passanger_capacity; pass = AircraftVehInfo(v->engine_type)->passenger_capacity;
if (new_cargo_type != CT_PASSENGERS) { if (new_cargo_type != CT_PASSENGERS) {
pass >>= 1; pass >>= 1;
if (new_cargo_type != CT_GOODS) if (new_cargo_type != CT_GOODS)

2
aircraft_gui.c
View File

@@ -21,7 +21,7 @@ void Set_DPARAM_Aircraft_Build_Window(uint16 engine_number)
SetDParam(0, avi->base_cost * (_price.aircraft_base>>3)>>5); SetDParam(0, avi->base_cost * (_price.aircraft_base>>3)>>5);
SetDParam(1, avi->max_speed * 8); SetDParam(1, avi->max_speed * 8);
SetDParam(2, avi->passanger_capacity); SetDParam(2, avi->passenger_capacity);
SetDParam(3, avi->mail_capacity); SetDParam(3, avi->mail_capacity);
SetDParam(4, avi->running_cost * _price.aircraft_running >> 8); SetDParam(4, avi->running_cost * _price.aircraft_running >> 8);

2
engine.h
View File

@@ -36,7 +36,7 @@ typedef struct AircraftVehicleInfo {
byte acceleration; byte acceleration;
byte max_speed; byte max_speed;
byte mail_capacity; byte mail_capacity;
uint16 passanger_capacity; uint16 passenger_capacity;
} AircraftVehicleInfo; } AircraftVehicleInfo;
typedef struct RoadVehicleInfo { typedef struct RoadVehicleInfo {

2
newgrf.c
View File

@@ -632,7 +632,7 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte *
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
uint16 capacity = grf_load_word(&buf); uint16 capacity = grf_load_word(&buf);
avi[i].passanger_capacity = capacity; avi[i].passenger_capacity = capacity;
} }
} break; } break;
case 0x11: { /* Mail capacity */ case 0x11: { /* Mail capacity */

2
table/engines.h
View File

@@ -413,7 +413,7 @@ AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES] = {
// image_index sfx acceleration // image_index sfx acceleration
// | base_cost | | max_speed // | base_cost | | max_speed
// | | running_cost | | mail_capacity // | | running_cost | | mail_capacity
// | | | subtype | | | | passanger_capacity // | | | subtype | | | | passenger_capacity
// | | | | | | | | | // | | | | | | | | |
{ 1, 14, 85, 1, SND_08_PLANE_TAKE_OFF, 18, 37, 4, 25 }, /* 0 */ { 1, 14, 85, 1, SND_08_PLANE_TAKE_OFF, 18, 37, 4, 25 }, /* 0 */
{ 0, 15, 100, 1, SND_08_PLANE_TAKE_OFF, 20, 37, 8, 65 }, /* 1 */ { 0, 15, 100, 1, SND_08_PLANE_TAKE_OFF, 20, 37, 8, 65 }, /* 1 */

2
vehicle.c
View File

@@ -1548,7 +1548,7 @@ int32 CmdReplaceVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
v->spritenum = avi->image_index; v->spritenum = avi->image_index;
if ( cargo_type == CT_PASSENGERS ) { if ( cargo_type == CT_PASSENGERS ) {
v->cargo_cap = avi->passanger_capacity; v->cargo_cap = avi->passenger_capacity;
u = v->next; u = v->next;
u->cargo_cap = avi->mail_capacity; u->cargo_cap = avi->mail_capacity;
} else { } else {