summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/aircraft.h2
-rw-r--r--src/aircraft_cmd.cpp2
-rw-r--r--src/economy_type.h4
-rw-r--r--src/map_func.h2
-rw-r--r--src/script/api/game/game_window.hpp.sq2
-rw-r--r--src/script/api/script_company.hpp4
-rw-r--r--src/script/api/script_window.hpp2
-rw-r--r--src/toolbar_gui.cpp18
-rw-r--r--src/vehicle_cmd.cpp2
-rw-r--r--src/vehicle_gui.cpp2
-rw-r--r--src/widgets/toolbar_widget.h2
11 files changed, 21 insertions, 21 deletions
diff --git a/src/aircraft.h b/src/aircraft.h
index f0ca1c4ab..792cbabe9 100644
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -137,7 +137,7 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
};
/**
- * Macro for iterating over all aircrafts.
+ * Macro for iterating over all aircraft.
*/
#define FOR_ALL_AIRCRAFT(var) FOR_ALL_VEHICLES_OF_TYPE(Aircraft, var)
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index c9cddbf97..5546eb058 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -749,7 +749,7 @@ int GetAircraftFlightLevel(T *v, bool takeoff)
GetAircraftFlightLevelBounds(v, &aircraft_min_altitude, &aircraft_max_altitude);
int aircraft_middle_altitude = (aircraft_min_altitude + aircraft_max_altitude) / 2;
- /* If those assumptions would be violated, aircrafts would behave fairly strange. */
+ /* If those assumptions would be violated, aircraft would behave fairly strange. */
assert(aircraft_min_altitude < aircraft_middle_altitude);
assert(aircraft_middle_altitude < aircraft_max_altitude);
diff --git a/src/economy_type.h b/src/economy_type.h
index 7e7a57241..31f74aacc 100644
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -152,12 +152,12 @@ enum ExpensesType {
EXPENSES_NEW_VEHICLES, ///< New vehicles.
EXPENSES_TRAIN_RUN, ///< Running costs trains.
EXPENSES_ROADVEH_RUN, ///< Running costs road vehicles.
- EXPENSES_AIRCRAFT_RUN, ///< Running costs aircrafts.
+ EXPENSES_AIRCRAFT_RUN, ///< Running costs aircraft.
EXPENSES_SHIP_RUN, ///< Running costs ships.
EXPENSES_PROPERTY, ///< Property costs.
EXPENSES_TRAIN_INC, ///< Income from trains.
EXPENSES_ROADVEH_INC, ///< Income from road vehicles.
- EXPENSES_AIRCRAFT_INC, ///< Income from aircrafts.
+ EXPENSES_AIRCRAFT_INC, ///< Income from aircraft.
EXPENSES_SHIP_INC, ///< Income from ships.
EXPENSES_LOAN_INT, ///< Interest payments over the loan.
EXPENSES_OTHER, ///< Other expenses.
diff --git a/src/map_func.h b/src/map_func.h
index 76894d9a4..21d69b138 100644
--- a/src/map_func.h
+++ b/src/map_func.h
@@ -147,7 +147,7 @@ static inline uint ScaleByMapSize1D(uint n)
* An offset value between to tiles.
*
* This value is used for the difference between
- * to tiles. It can be added to a tileindex to get
+ * two tiles. It can be added to a tileindex to get
* the resulting tileindex of the start tile applied
* with this saved difference.
*
diff --git a/src/script/api/game/game_window.hpp.sq b/src/script/api/game/game_window.hpp.sq
index 07e226f46..aa0b34b1e 100644
--- a/src/script/api/game/game_window.hpp.sq
+++ b/src/script/api/game/game_window.hpp.sq
@@ -1183,7 +1183,7 @@ void SQGSWindow_Register(Squirrel *engine)
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_TRAINS, "WID_TN_TRAINS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_ROADVEHS, "WID_TN_ROADVEHS");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_SHIPS, "WID_TN_SHIPS");
- SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_AIRCRAFTS, "WID_TN_AIRCRAFTS");
+ SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_AIRCRAFT, "WID_TN_AIRCRAFT");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_ZOOM_IN, "WID_TN_ZOOM_IN");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_ZOOM_OUT, "WID_TN_ZOOM_OUT");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_TN_BUILDING_TOOLS_START, "WID_TN_BUILDING_TOOLS_START");
diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.hpp
index 4bfe0d02e..dc917500b 100644
--- a/src/script/api/script_company.hpp
+++ b/src/script/api/script_company.hpp
@@ -55,12 +55,12 @@ public:
EXPENSES_NEW_VEHICLES = ::EXPENSES_NEW_VEHICLES, ///< New vehicles.
EXPENSES_TRAIN_RUN = ::EXPENSES_TRAIN_RUN, ///< Running costs trains.
EXPENSES_ROADVEH_RUN = ::EXPENSES_ROADVEH_RUN, ///< Running costs road vehicles.
- EXPENSES_AIRCRAFT_RUN = ::EXPENSES_AIRCRAFT_RUN, ///< Running costs aircrafts.
+ EXPENSES_AIRCRAFT_RUN = ::EXPENSES_AIRCRAFT_RUN, ///< Running costs aircraft.
EXPENSES_SHIP_RUN = ::EXPENSES_SHIP_RUN, ///< Running costs ships.
EXPENSES_PROPERTY = ::EXPENSES_PROPERTY, ///< Property costs.
EXPENSES_TRAIN_INC = ::EXPENSES_TRAIN_INC, ///< Income from trains.
EXPENSES_ROADVEH_INC = ::EXPENSES_ROADVEH_INC, ///< Income from road vehicles.
- EXPENSES_AIRCRAFT_INC = ::EXPENSES_AIRCRAFT_INC, ///< Income from aircrafts.
+ EXPENSES_AIRCRAFT_INC = ::EXPENSES_AIRCRAFT_INC, ///< Income from aircraft.
EXPENSES_SHIP_INC = ::EXPENSES_SHIP_INC, ///< Income from ships.
EXPENSES_LOAN_INT = ::EXPENSES_LOAN_INT, ///< Interest payments over the loan.
EXPENSES_OTHER = ::EXPENSES_OTHER, ///< Other expenses.
diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp
index a182e3ba5..c2b6662fb 100644
--- a/src/script/api/script_window.hpp
+++ b/src/script/api/script_window.hpp
@@ -2384,7 +2384,7 @@ public:
WID_TN_TRAINS = ::WID_TN_TRAINS, ///< Train menu.
WID_TN_ROADVEHS = ::WID_TN_ROADVEHS, ///< Road vehicle menu.
WID_TN_SHIPS = ::WID_TN_SHIPS, ///< Ship menu.
- WID_TN_AIRCRAFTS = ::WID_TN_AIRCRAFTS, ///< Aircraft menu.
+ WID_TN_AIRCRAFT = ::WID_TN_AIRCRAFT, ///< Aircraft menu.
WID_TN_ZOOM_IN = ::WID_TN_ZOOM_IN, ///< Zoom in the main viewport.
WID_TN_ZOOM_OUT = ::WID_TN_ZOOM_OUT, ///< Zoom out the main viewport.
WID_TN_BUILDING_TOOLS_START = ::WID_TN_BUILDING_TOOLS_START, ///< Helper for the offset of the building tools
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index f253be8b3..7966d2898 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1482,7 +1482,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_ZOOM_IN,
WID_TN_ZOOM_OUT,
WID_TN_RAILS,
@@ -1514,7 +1514,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_RAILS,
WID_TN_ROADS,
WID_TN_WATER,
@@ -1548,7 +1548,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_RAILS,
WID_TN_ROADS,
WID_TN_WATER,
@@ -1584,7 +1584,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_RAILS,
WID_TN_ROADS,
WID_TN_WATER,
@@ -1643,7 +1643,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_MUSIC_SOUND,
WID_TN_MESSAGES,
WID_TN_HELP,
@@ -1661,7 +1661,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_RAILS,
WID_TN_ROADS,
WID_TN_WATER,
@@ -1702,7 +1702,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_RAILS,
WID_TN_ROADS,
WID_TN_WATER,
@@ -1754,7 +1754,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
WID_TN_TRAINS,
WID_TN_ROADVEHS,
WID_TN_SHIPS,
- WID_TN_AIRCRAFTS,
+ WID_TN_AIRCRAFT,
WID_TN_ZOOM_IN,
WID_TN_ZOOM_OUT,
WID_TN_RAILS,
@@ -2000,7 +2000,7 @@ struct MainToolbarWindow : Window {
* Since enabled state is the default, just disable when needed */
this->SetWidgetsDisabledState(_local_company == COMPANY_SPECTATOR, WID_TN_RAILS, WID_TN_ROADS, WID_TN_WATER, WID_TN_AIR, WID_TN_LANDSCAPE, WIDGET_LIST_END);
/* disable company list drop downs, if there are no companies */
- this->SetWidgetsDisabledState(Company::GetNumItems() == 0, WID_TN_STATIONS, WID_TN_FINANCES, WID_TN_TRAINS, WID_TN_ROADVEHS, WID_TN_SHIPS, WID_TN_AIRCRAFTS, WIDGET_LIST_END);
+ this->SetWidgetsDisabledState(Company::GetNumItems() == 0, WID_TN_STATIONS, WID_TN_FINANCES, WID_TN_TRAINS, WID_TN_ROADVEHS, WID_TN_SHIPS, WID_TN_AIRCRAFT, WIDGET_LIST_END);
this->SetWidgetDisabledState(WID_TN_GOAL, Goal::GetNumItems() == 0);
this->SetWidgetDisabledState(WID_TN_STORY, StoryPage::GetNumItems() == 0);
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 9670fa05d..339365f78 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -464,7 +464,7 @@ CommandCost CmdRefitVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
byte new_subtype = GB(p2, 8, 8);
if (new_cid >= NUM_CARGO) return CMD_ERROR;
- /* For ships and aircrafts there is always only one. */
+ /* For ships and aircraft there is always only one. */
bool only_this = HasBit(p2, 7) || front->type == VEH_SHIP || front->type == VEH_AIRCRAFT;
uint8 num_vehicles = GB(p2, 16, 8);
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 8ebd73a8a..f060191c9 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2370,7 +2370,7 @@ static const uint32 _vehicle_command_translation_table[][4] = {
CMD_REVERSE_TRAIN_DIRECTION | CMD_MSG(STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN),
CMD_TURN_ROADVEH | CMD_MSG(STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN),
0xffffffff, // invalid for ships
- 0xffffffff // invalid for aircrafts
+ 0xffffffff // invalid for aircraft
},
};
diff --git a/src/widgets/toolbar_widget.h b/src/widgets/toolbar_widget.h
index 434a238ac..c317fc957 100644
--- a/src/widgets/toolbar_widget.h
+++ b/src/widgets/toolbar_widget.h
@@ -33,7 +33,7 @@ enum ToolbarNormalWidgets {
WID_TN_TRAINS = WID_TN_VEHICLE_START, ///< Train menu.
WID_TN_ROADVEHS, ///< Road vehicle menu.
WID_TN_SHIPS, ///< Ship menu.
- WID_TN_AIRCRAFTS, ///< Aircraft menu.
+ WID_TN_AIRCRAFT, ///< Aircraft menu.
WID_TN_ZOOM_IN, ///< Zoom in the main viewport.
WID_TN_ZOOM_OUT, ///< Zoom out the main viewport.
WID_TN_BUILDING_TOOLS_START, ///< Helper for the offset of the building tools
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-27 14:30:28 +0000