From 8ed132a5b9d9de21eadc55ca87cf584b52673761 Mon Sep 17 00:00:00 2001 From: celestar Date: Fri, 7 Jan 2005 08:38:27 +0000 Subject: [PATCH] (svn r1410) Replaced all occurences of 'passanger' by 'passenger' in the code --- aircraft_cmd.c | 6 +++--- aircraft_gui.c | 2 +- engine.h | 2 +- newgrf.c | 2 +- table/engines.h | 2 +- vehicle.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aircraft_cmd.c b/aircraft_cmd.c index d351eb6477..86b4b0d4bc 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -71,7 +71,7 @@ void DrawAircraftEngineInfo(int engine, int x, int y, int maxw) const AircraftVehicleInfo *avi = AircraftVehInfo(engine); SetDParam(0, ((_price.aircraft_base >> 3) * avi->base_cost) >> 5); SetDParam(1, avi->max_speed << 3); - SetDParam(2, avi->passanger_capacity); + SetDParam(2, avi->passenger_capacity); SetDParam(3, avi->mail_capacity); 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->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; 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))) return CMD_ERROR; - pass = AircraftVehInfo(v->engine_type)->passanger_capacity; + pass = AircraftVehInfo(v->engine_type)->passenger_capacity; if (new_cargo_type != CT_PASSENGERS) { pass >>= 1; if (new_cargo_type != CT_GOODS) diff --git a/aircraft_gui.c b/aircraft_gui.c index 0228e36919..0439d71db1 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -21,7 +21,7 @@ void Set_DPARAM_Aircraft_Build_Window(uint16 engine_number) SetDParam(0, avi->base_cost * (_price.aircraft_base>>3)>>5); SetDParam(1, avi->max_speed * 8); - SetDParam(2, avi->passanger_capacity); + SetDParam(2, avi->passenger_capacity); SetDParam(3, avi->mail_capacity); SetDParam(4, avi->running_cost * _price.aircraft_running >> 8); diff --git a/engine.h b/engine.h index b5d9d3d97f..8215b958ba 100644 --- a/engine.h +++ b/engine.h @@ -36,7 +36,7 @@ typedef struct AircraftVehicleInfo { byte acceleration; byte max_speed; byte mail_capacity; - uint16 passanger_capacity; + uint16 passenger_capacity; } AircraftVehicleInfo; typedef struct RoadVehicleInfo { diff --git a/newgrf.c b/newgrf.c index c39f751306..4d91130878 100644 --- a/newgrf.c +++ b/newgrf.c @@ -632,7 +632,7 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte * FOR_EACH_OBJECT { uint16 capacity = grf_load_word(&buf); - avi[i].passanger_capacity = capacity; + avi[i].passenger_capacity = capacity; } } break; case 0x11: { /* Mail capacity */ diff --git a/table/engines.h b/table/engines.h index d7ab8dbd68..2185bb0a59 100644 --- a/table/engines.h +++ b/table/engines.h @@ -413,7 +413,7 @@ AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES] = { // image_index sfx acceleration // | base_cost | | max_speed // | | running_cost | | mail_capacity - // | | | subtype | | | | passanger_capacity + // | | | subtype | | | | passenger_capacity // | | | | | | | | | { 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 */ diff --git a/vehicle.c b/vehicle.c index 1d009221c3..6c892d788a 100644 --- a/vehicle.c +++ b/vehicle.c @@ -1548,7 +1548,7 @@ int32 CmdReplaceVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2) v->spritenum = avi->image_index; if ( cargo_type == CT_PASSENGERS ) { - v->cargo_cap = avi->passanger_capacity; + v->cargo_cap = avi->passenger_capacity; u = v->next; u->cargo_cap = avi->mail_capacity; } else {