diff options
| -rw-r--r-- | src/aircraft_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/console_cmds.cpp | 2 | ||||
| -rw-r--r-- | src/core/pool_type.hpp | 6 | ||||
| -rw-r--r-- | src/gfx_layout.cpp | 4 | ||||
| -rw-r--r-- | src/newgrf.cpp | 2 | ||||
| -rw-r--r-- | src/newgrf_airport.h | 2 | ||||
| -rw-r--r-- | src/newgrf_engine.cpp | 12 | ||||
| -rw-r--r-- | src/script/api/script_airport.hpp | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index fb817b351..8cc009d3d 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -242,7 +242,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine * /* Prevent building aircraft types at places which can't handle them */ if (!CanVehicleUseStation(e->index, st)) return CMD_ERROR; - /* Make sure all aircraft end up in the first tile of the hanger. */ + /* Make sure all aircraft end up in the first tile of the hangar. */ tile = st->airport.GetHangarTile(st->airport.GetHangarNum(tile)); if (flags & DC_EXEC) { diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index a131131ad..4f4210923 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -965,7 +965,7 @@ DEF_CONSOLE_CMD(ConExec) } if (ferror(script_file)) { - IConsoleError("Encountered errror while trying to read from script file"); + IConsoleError("Encountered error while trying to read from script file"); } _script_running = false; diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp index f19e44479..c703b7cdc 100644 --- a/src/core/pool_type.hpp +++ b/src/core/pool_type.hpp @@ -100,7 +100,7 @@ struct Pool : PoolBase { virtual void CleanPool(); /** - * Returs Titem with given index + * Returns Titem with given index * @param index of item to get * @return pointer to Titem * @pre index < this->first_unused @@ -234,7 +234,7 @@ struct Pool : PoolBase { } /** - * Returs Titem with given index + * Returns Titem with given index * @param index of item to get * @return pointer to Titem * @pre index < this->first_unused @@ -245,7 +245,7 @@ struct Pool : PoolBase { } /** - * Returs Titem with given index + * Returns Titem with given index * @param index of item to get * @return pointer to Titem * @note returns NULL for invalid index diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp index 8f18ff1be..618474e06 100644 --- a/src/gfx_layout.cpp +++ b/src/gfx_layout.cpp @@ -190,7 +190,7 @@ Font *ParagraphLayout::VisualRun::getFont() const } /** - * Get the number of glyhps in this run. + * Get the number of glyphs in this run. * @return The number of glyphs. */ int ParagraphLayout::VisualRun::getGlyphCount() const @@ -199,7 +199,7 @@ int ParagraphLayout::VisualRun::getGlyphCount() const } /** - * Get the glyhps of this run. + * Get the glyphs of this run. * @return The glyphs. */ const GlyphID *ParagraphLayout::VisualRun::getGlyphs() const diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 280dda293..e32ba1a15 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5771,7 +5771,7 @@ static uint32 GetParamVal(byte param, uint32 *cond_val) case 0x88: // GRF ID check return 0; - /* case 0x99: Global ID offest not implemented */ + /* case 0x99: Global ID offset not implemented */ default: /* GRF Parameter */ diff --git a/src/newgrf_airport.h b/src/newgrf_airport.h index e9cf76511..5a917c6bd 100644 --- a/src/newgrf_airport.h +++ b/src/newgrf_airport.h @@ -91,7 +91,7 @@ enum TTDPAirportType { struct HangarTileTable { TileIndexDiffC ti; ///< Tile offset from the top-most airport tile. Direction dir; ///< Direction of the exit. - byte hangar_num; ///< The hanger to which this tile belongs. + byte hangar_num; ///< The hangar to which this tile belongs. }; /** diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 0c2e190ad..c48aaad9b 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -177,22 +177,22 @@ static byte MapAircraftMovementState(const Aircraft *v) switch (v->state) { case HANGAR: /* The international airport is a special case as helicopters can land in - * front of the hanger. Helicopters also change their air.state to + * front of the hangar. Helicopters also change their air.state to * AMED_HELI_LOWER some time before actually descending. */ /* This condition only occurs for helicopters, during descent, - * to a landing by the hanger of an international airport. */ + * to a landing by the hangar of an international airport. */ if (amdflag & AMED_HELI_LOWER) return AMS_TTDP_HELI_LAND_AIRPORT; /* This condition only occurs for helicopters, before starting descent, - * to a landing by the hanger of an international airport. */ + * to a landing by the hangar of an international airport. */ if (amdflag & AMED_SLOWTURN) return AMS_TTDP_FLIGHT_TO_TOWER; /* The final two conditions apply to helicopters or aircraft. - * Has reached hanger? */ + * Has reached hangar? */ if (amdflag & AMED_EXACTPOS) return AMS_TTDP_HANGAR; - /* Still moving towards hanger. */ + /* Still moving towards hangar. */ return AMS_TTDP_TO_HANGAR; case TERM1: @@ -320,7 +320,7 @@ static byte MapAircraftMovementAction(const Aircraft *v) case STARTTAKEOFF: // Accelerating down runway case ENDTAKEOFF: // Ascent case HELITAKEOFF: - /* @todo Need to find which terminal (or hanger) we've come from. How? */ + /* @todo Need to find which terminal (or hangar) we've come from. How? */ return AMA_TTDP_PAD1_TO_TAKEOFF; case FLYING: diff --git a/src/script/api/script_airport.hpp b/src/script/api/script_airport.hpp index ddf51860a..e4c0a217d 100644 --- a/src/script/api/script_airport.hpp +++ b/src/script/api/script_airport.hpp @@ -125,11 +125,11 @@ public: static int32 GetNumHangars(TileIndex tile); /** - * Get the first hanger tile of the airport. + * Get the first hangar tile of the airport. * @param tile Any tile of the airport. * @pre ScriptMap::IsValidTile(tile). * @pre GetNumHangars(tile) > 0. - * @return The first hanger tile of the airport. + * @return The first hangar tile of the airport. * @note Possible there are more hangars, but you won't be able to find them * without walking over all the tiles of the airport and using * IsHangarTile() on them. |