diff --git a/distribution/man/openrct2.6 b/distribution/man/openrct2.6 index 954e8d2ba1..da94169582 100644 --- a/distribution/man/openrct2.6 +++ b/distribution/man/openrct2.6 @@ -144,7 +144,7 @@ Download and open a saved park. Run a headless server for a saved park. .El .Sh SEE ALSO -.Lk https://openrct2.io "Offical site" +.Lk https://openrct2.io "Official site" .sp .Lk https://github.com/OpenRCT2/OpenRCT2 "GitHub" .Sh HISTORY diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index 0471543d4b..acbd7de6ca 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -45,7 +45,7 @@ declare global { var ui: Ui; /** - * Registers the plugin. This only only be called once. + * Registers the plugin. This may only be called once. * @param metadata Information about the plugin and the entry point. */ function registerPlugin(metadata: PluginMetadata): void; @@ -144,7 +144,7 @@ declare global { configuration: Configuration; /** - * Shared generic storage for all plugins. Data is persistant across instances + * Shared generic storage for all plugins. Data is persistent across instances * of OpenRCT2 and is stored externally as a single JSON file in the OpenRCT2 * user directory. Internally it is a JavaScript object. Objects and arrays * are only copied by reference. The external file is only written when using @@ -2030,7 +2030,7 @@ declare global { } /** - * Listens for incomming connections. + * Listens for incoming connections. * Based on node.js net.Server, see https://nodejs.org/api/net.html for more information. */ interface Listener { diff --git a/src/openrct2-cli/Cli.cpp b/src/openrct2-cli/Cli.cpp index 815a29f28e..1492858ff8 100644 --- a/src/openrct2-cli/Cli.cpp +++ b/src/openrct2-cli/Cli.cpp @@ -15,7 +15,7 @@ using namespace OpenRCT2; /** - * Main entry point for non-Windows sytems. Windows instead uses its own DLL proxy. + * Main entry point for non-Windows systems. Windows instead uses its own DLL proxy. */ int main(int argc, const char** argv) { diff --git a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp index 564190045b..fb7098183c 100644 --- a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp @@ -45,7 +45,7 @@ void SwapFramebuffer::ApplyTransparency(ApplyTransparencyShader& shader, GLuint glClearBufferfv(GL_DEPTH, 0, depthValueTransparent); _opaqueFramebuffer.SwapColourBuffer(_mixFramebuffer); - // Change binding to guaruntee no undefined behavior + // Change binding to guarantee no undefined behavior _opaqueFramebuffer.Bind(); } diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp index 5ba08c1509..7fe9d33021 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp @@ -158,7 +158,7 @@ static inline void RemoveBottomEndpoint(IntervalTree& y_intersect, IntervalTree: } /* - * Determines an aproximation of the number of depth peeling iterations needed + * Determines an approximation of the number of depth peeling iterations needed * to render the command batch. It will never underestimate the number of * iterations, but it can overestimate, usually by no more than +2. */ diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h index 4e8b87ada0..4ba6f96f0b 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h +++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h @@ -14,7 +14,7 @@ #include /* - * Determines an aproximation of the number of depth peeling iterations needed + * Determines an approximation of the number of depth peeling iterations needed * to render the command batch. It will never underestimate the number of * iterations, but it can overestimate, usually by no more than +2. */ diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 072d3e2e48..3ad1ccdb4e 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -644,7 +644,7 @@ static void window_loadsave_compute_max_date_width() std::time_t long_time = mktime(&tm); - // Check how how this date is represented (e.g. 2000-02-20, or 00/02/20) + // Check how this date is represented (e.g. 2000-02-20, or 00/02/20) std::string date = Platform::FormatShortDate(long_time); maxDateWidth = gfx_get_string_width(date.c_str()) + DATE_TIME_GAP; @@ -653,7 +653,7 @@ static void window_loadsave_compute_max_date_width() tm.tm_yday = 294; long_time = mktime(&tm); - // Again, check how how this date is represented (e.g. 2000-10-20, or 00/10/20) + // Again, check how this date is represented (e.g. 2000-10-20, or 00/10/20) date = Platform::FormatShortDate(long_time); maxDateWidth = std::max(maxDateWidth, gfx_get_string_width(date.c_str()) + DATE_TIME_GAP); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index aaa236e399..4ba57e6b59 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1570,7 +1570,7 @@ static void window_options_audio_invalidate(rct_window* w) WidgetSetEnabled(w, WIDX_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); WidgetSetEnabled(w, WIDX_MUSIC_CHECKBOX, gConfigSound.master_sound_enabled); - // Initialize only on first frame, otherwise the scrollbars wont be able to be modified + // Initialize only on first frame, otherwise the scrollbars won't be able to be modified if (w->frame_no == 0) { initialize_scroll_position(w, WIDX_MASTER_VOLUME, 0, gConfigSound.master_volume); diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index b925736874..ef4a16e455 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -497,7 +497,7 @@ static void window_ride_list_invalidate(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - // if close buttton is on the right then it must move + // if close button is on the right then it must move w->widgets[WIDX_CLOSE].left = w->width - 13; w->widgets[WIDX_CLOSE].right = w->width - 3; diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 668bb927a2..3132a220e2 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -233,7 +233,7 @@ static GameActions::Result::Ptr FindValidTrackDesignPlaceHeight(CoordsXYZ& loc, tdAction.SetFlags(flags); res = GameActions::Query(&tdAction); - // If successful dont keep trying. + // If successful don't keep trying. // If failure due to no money then increasing height only makes problem worse if (res->Error == GameActions::Status::Ok || res->Error == GameActions::Status::InsufficientFunds) { diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 49b9f6e2fe..9dbe537c38 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -122,7 +122,7 @@ namespace OpenRCT2 uint32_t _lastUpdateTime = 0; bool _variableFrame = false; - // If set, will end the OpenRCT2 game loop. Intentially private to this module so that the flag can not be set back to + // If set, will end the OpenRCT2 game loop. Intentionally private to this module so that the flag can not be set back to // false. bool _finished = false; diff --git a/src/openrct2/GameStateSnapshots.h b/src/openrct2/GameStateSnapshots.h index 1b06fdb8ea..ef92bbe99e 100644 --- a/src/openrct2/GameStateSnapshots.h +++ b/src/openrct2/GameStateSnapshots.h @@ -55,7 +55,7 @@ struct GameStateCompareData_t }; /* - * Interface to create and capture game states. It only allows to have 32 active snapshots + * Interface to create and capture game states. It only allows one to have 32 active snapshots * the oldest snapshot will be removed from the buffer. Never store the snapshot pointer * as it may become invalid at any time when a snapshot is created, rather Link the snapshot * to a specific tick which can be obtained by that later again assuming its still valid. diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp index 01de237685..00c45e2090 100644 --- a/src/openrct2/actions/GameActionCompat.cpp +++ b/src/openrct2/actions/GameActionCompat.cpp @@ -143,7 +143,7 @@ money32 maze_set_track( res = GameActions::Execute(&gameAction); // NOTE: ride_construction_tooldown_construct requires them to be set. - // Refactor result type once theres no C code referencing this function. + // Refactor result type once there's no C code referencing this function. if (auto title = res->ErrorTitle.AsStringId()) gGameCommandErrorTitle = *title; else diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index 92132743e4..ed9215afe5 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -572,7 +572,7 @@ GameActions::Result::Ptr LandSmoothAction::SmoothLand(bool isExecuting) const { 0, 1, 3, 2 }, // MAP_SELECT_TYPE_EDGE_2 { 1, 2, 0, 3 }, // MAP_SELECT_TYPE_EDGE_3 }; - // Big coordinate offsets for the neigbouring tile for the given edge selection + // Big coordinate offsets for the neighbouring tile for the given edge selection static constexpr CoordsXY stepOffsets[] = { { -32, 0 }, { 0, 32 }, diff --git a/src/openrct2/common.h b/src/openrct2/common.h index dc284a5f3c..4174dae1b3 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -87,14 +87,14 @@ namespace # define _strdup(x) strdup((x)) # if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define RCT2_ENDIANESS __ORDER_LITTLE_ENDIAN__ +# define RCT2_ENDIANNESS __ORDER_LITTLE_ENDIAN__ # define LOBYTE(w) (static_cast(w)) # define HIBYTE(w) (static_cast((static_cast(w) >> 8) & 0xFF)) # endif // __BYTE_ORDER__ -# ifndef RCT2_ENDIANESS -# error Unknown endianess! -# endif // RCT2_ENDIANESS +# ifndef RCT2_ENDIANNESS +# error Unknown endianness! +# endif // RCT2_ENDIANNESS #endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) diff --git a/src/openrct2/core/Http.cURL.cpp b/src/openrct2/core/Http.cURL.cpp index 2c1345508a..d18a9c1750 100644 --- a/src/openrct2/core/Http.cURL.cpp +++ b/src/openrct2/core/Http.cURL.cpp @@ -47,7 +47,7 @@ namespace Http if (pos != std::string::npos) { std::string key = line.substr(0, pos); - // substract 4 chars for ": " and "\r\n" + // subtract 4 chars for ": " and "\r\n" std::string value = line.substr(pos + 2, line.size() - pos - 4); res->header[key] = value; } diff --git a/src/openrct2/core/JobPool.cpp b/src/openrct2/core/JobPool.cpp index b8172b7e2c..f979467bb4 100644 --- a/src/openrct2/core/JobPool.cpp +++ b/src/openrct2/core/JobPool.cpp @@ -100,7 +100,7 @@ void JobPool::ProcessQueue() unique_lock lock(_mutex); do { - // Wait for work or cancelation. + // Wait for work or cancellation. _condPending.wait(lock, [this]() { return _shouldStop || !_pending.empty(); }); if (!_pending.empty()) diff --git a/src/openrct2/drawing/ImageImporter.cpp b/src/openrct2/drawing/ImageImporter.cpp index 04558eedf4..b537255fbc 100644 --- a/src/openrct2/drawing/ImageImporter.cpp +++ b/src/openrct2/drawing/ImageImporter.cpp @@ -30,7 +30,7 @@ ImportResult ImageImporter::Import( if ((flags & IMPORT_FLAGS::KEEP_PALETTE) && image.Depth != 8) { - throw std::invalid_argument("Image is not palletted, it has bit depth of " + std::to_string(image.Depth)); + throw std::invalid_argument("Image is not paletted, it has bit depth of " + std::to_string(image.Depth)); } const auto width = image.Width; diff --git a/src/openrct2/drawing/SSE41Drawing.cpp b/src/openrct2/drawing/SSE41Drawing.cpp index 76472438e8..e633b58478 100644 --- a/src/openrct2/drawing/SSE41Drawing.cpp +++ b/src/openrct2/drawing/SSE41Drawing.cpp @@ -59,7 +59,7 @@ void mask_sse4_1( #else # ifdef OPENRCT2_X86 -# error You have to compile this file with SSE4.1 enabled, when targetting x86! +# error You have to compile this file with SSE4.1 enabled, when targeting x86! # endif void mask_sse4_1( diff --git a/src/openrct2/localisation/Convert.cpp b/src/openrct2/localisation/Convert.cpp index 666e9e7c9c..3d9966b152 100644 --- a/src/openrct2/localisation/Convert.cpp +++ b/src/openrct2/localisation/Convert.cpp @@ -17,7 +17,7 @@ /** * Decodes an RCT2 string to a wide char string still in the original code page. - * An RCT2 string is a multi-byte string where every two-byte code point is preceeded with a byte value of 255. + * An RCT2 string is a multi-byte string where every two-byte code point is preceded with a byte value of 255. */ static std::wstring DecodeToWideChar(std::string_view src) { diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index ec8affcb6d..a1bf227d8a 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -941,7 +941,7 @@ static void research_update_first_of_type(ResearchItem* researchItem) auto rideType = researchItem->baseRideType; if (rideType >= RIDE_TYPE_COUNT) { - log_error("Research item has non-existant ride type index %d", rideType); + log_error("Research item has non-existent ride type index %d", rideType); return; } diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 768df41ae4..d836a166d6 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -268,7 +268,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port) BeginServerLog(); // We need to wait for the map load before we execute any actions. - // If the client has the title screen running then theres a potential + // If the client has the title screen running then there's a potential // risk of tick collision with the server map and title screen map. GameActions::SuspendQueue(); @@ -3571,7 +3571,7 @@ GameActions::Result::Ptr network_modify_groups( case ModifyGroupType::SetPermissions: { if (groupId == 0) - { // cant change admin group permissions + { // can't change admin group permissions return std::make_unique( GameActions::Status::Disallowed, STR_THIS_GROUP_CANNOT_BE_MODIFIED); } diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index c37cde71dc..9a0b84a7ce 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -906,7 +906,7 @@ static std::vector GetNetworkInterfaces() return {}; } - // Get all the network interfaces, requires a trial and error approch + // Get all the network interfaces, requires a trial and error approach // until we find the capacity required to store all of them. DWORD len = 0; size_t capacity = 16; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index bfee63950d..97f8e21d04 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -1196,7 +1196,7 @@ void Guest::CheckIfLost() /** * * rct2: 0x69C26B - * Check if cant find ride. + * Check if can't find ride. */ void Guest::CheckCantFindRide() { @@ -1228,7 +1228,7 @@ void Guest::CheckCantFindRide() /** * * rct2: 0x69C2D0 - * Check if cant find exit. + * Check if can't find exit. */ void Guest::CheckCantFindExit() { diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 431af56dac..2f24c6361f 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -84,7 +84,7 @@ static TileElement* get_banner_on_path(TileElement* path_element) // Found a banner if (bannerElement->GetType() == TILE_ELEMENT_TYPE_BANNER) return bannerElement; - // Last element so there cant be any other banners + // Last element so there can't be any other banners if (bannerElement->IsLastForTile()) return nullptr; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index ef932ce624..dc722228ae 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -257,7 +257,7 @@ enum class PeepRideSubState : uint8_t AtEntrance = 0, InEntrance = 1, FreeVehicleCheck = 2, // Spend money on ride - LeaveEntrance = 3, // Calculate what direction and where to go after commiting to entering vehicle + LeaveEntrance = 3, // Calculate what direction and where to go after committing to entering vehicle ApproachVehicle = 4, EnterVehicle = 5, OnRide = 6, diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 2b39473b19..28ddc40536 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -55,7 +55,7 @@ const wchar_t* _wszArchitecture = WSZ(OPENRCT2_ARCHITECTURE); // Note: uploading gzipped crash dumps manually requires specifying // 'Content-Encoding: gzip' header in HTTP request, but we cannot do that, // so just hope the file name with '.gz' suffix is enough. -// For docs on uplading to backtrace.io check +// For docs on uploading to backtrace.io check // https://documentation.backtrace.io/product_integration_minidump_breakpad/ static bool UploadMinidump(const std::map& files, int& error, std::wstring& response) { @@ -274,7 +274,7 @@ static bool OnCrash( } else { - MessageBoxW(nullptr, L"Dump uploaded succesfully.", WSZ(OPENRCT2_NAME), MB_OK | MB_ICONINFORMATION); + MessageBoxW(nullptr, L"Dump uploaded successfully.", WSZ(OPENRCT2_NAME), MB_OK | MB_ICONINFORMATION); } } HRESULT coInitializeResult = CoInitialize(nullptr); diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index 9477f5903e..31fb2d7173 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -146,7 +146,7 @@ private: td->ride_mode = RideMode::PoweredLaunch; } - // Convert RCT1 vehicle type to RCT2 vehicle type. Intialise with an string consisting of 8 spaces. + // Convert RCT1 vehicle type to RCT2 vehicle type. Initialise with a string consisting of 8 spaces. rct_object_entry vehicleObject = { 0x80, " " }; if (td4Base.type == RIDE_TYPE_MAZE) { diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index 0a9bf98d06..d2542aabbc 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -142,7 +142,7 @@ enum RCT12_FOOTPATH_PROPERTIES_TYPE_MASK = (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7), }; -// Masks and flags for values stored in in RCT12TileElement.properties.path.additions +// Masks and flags for values stored in RCT12TileElement.properties.path.additions enum { RCT12_FOOTPATH_PROPERTIES_ADDITIONS_TYPE_MASK = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3), diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 070c19df9f..5e0dedbb77 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1439,7 +1439,7 @@ void S6Exporter::ExportTileElements() void S6Exporter::ExportTileElement(RCT12TileElement* dst, TileElement* src) { - // Todo: allow for changing defition of OpenRCT2 tile element types - replace with a map + // Todo: allow for changing definition of OpenRCT2 tile element types - replace with a map uint8_t tileElementType = src->GetType(); dst->ClearAs(tileElementType); dst->SetDirection(src->GetDirection()); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 94d51f3e7a..7bc48be7d7 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1056,7 +1056,7 @@ public: void ImportTileElement(TileElement* dst, const RCT12TileElement* src) { - // Todo: allow for changing defition of OpenRCT2 tile element types - replace with a map + // Todo: allow for changing definition of OpenRCT2 tile element types - replace with a map uint8_t tileElementType = src->GetType(); dst->ClearAs(tileElementType); dst->SetDirection(src->GetDirection()); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index eeca788f8f..2b267a8c0c 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -9892,7 +9892,7 @@ Vehicle* Vehicle::GetCar(size_t carIndex) const car = GetEntity(car->next_vehicle_on_train); if (car == nullptr) { - log_error("Tried to get non-existant car from index!"); + log_error("Tried to get non-existent car from index!"); return nullptr; } } diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 91c58bf067..731922ab31 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -282,7 +282,7 @@ static int8_t climate_step_weather_level(int8_t currentWeatherLevel, int8_t next /** * Calculates future weather development. - * RCT2 implements this as discrete probability distributions dependant on month and climate + * RCT2 implements this as discrete probability distributions dependent on month and climate * for nextWeather. The other weather parameters are then looked up depending only on the * next weather. */ diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 8415f80f8b..5dfbefffe5 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -1258,7 +1258,7 @@ static void footpath_fix_ownership(const CoordsXY& mapPos) { ownership = OWNERSHIP_UNOWNED; } - // If the tile is safe to own construction rights of, do not erase contruction rights. + // If the tile is safe to own construction rights of, do not erase construction rights. else { ownership = surfaceElement->GetOwnership(); diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 6a033139cb..94435e0f6c 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -89,7 +89,7 @@ enum FOOTPATH_PROPERTIES_TYPE_MASK = (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7), }; -// Masks and flags for values stored in in TileElement.properties.path.edges +// Masks and flags for values stored in TileElement.properties.path.edges enum { FOOTPATH_PROPERTIES_EDGES_EDGES_MASK = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3), diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 9179d8b882..637169cbfc 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -121,7 +121,7 @@ void SmallSceneryElement::IncreaseAge(const CoordsXY& sceneryPos) { uint8_t newAge = age++; - // Only invalidate tiles when scenery crosses the withering threshholds, and can be withered. + // Only invalidate tiles when scenery crosses the withering thresholds, and can be withered. if (newAge == SCENERY_WITHER_AGE_THRESHOLD_1 || newAge == SCENERY_WITHER_AGE_THRESHOLD_2) { rct_scenery_entry* entry = GetEntry(); diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index e167ab49a4..f725273cb0 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -388,21 +388,21 @@ static uint8_t TestTrackElementPaintCalls(uint8_t rideType, uint8_t trackType, u std::vector newCalls; newCalls.insert(newCalls.begin(), callBuffer, callBuffer + callCount); - bool sucess = true; + bool success = true; if (oldCalls.size() != newCalls.size()) { *error += String::Format( "Call counts don't match (was %d, expected %d). %s\n", newCalls.size(), oldCalls.size(), caseName.c_str()); - sucess = false; + success = false; } else if (!FunctionCall::AssertsEquals(oldCalls, newCalls)) { *error += String::Format("Calls don't match. %s\n", caseName.c_str()); - sucess = false; + success = false; } - if (!sucess) + if (!success) { *error += " Expected:\n"; *error += Printer::PrintFunctionCalls(oldCalls, height); diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index 7758f80920..bc203938d5 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -110,7 +110,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds) ride_set_status(&ferrisWheel, RIDE_STATUS_OPEN); execute(ferrisWheel.id, 0, true); - // Ignore intesity to stimulate peeps to queue into ferris wheel + // Ignore intensity to stimulate peeps to queue into ferris wheel gCheatsIgnoreRideIntensity = true; // Insert a rich guest @@ -170,7 +170,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests) ride_set_status(&carRide, RIDE_STATUS_OPEN); execute(carRide.id, 0, true); - // Ignore intesity to stimulate peeps to queue into the ride + // Ignore intensity to stimulate peeps to queue into the ride gCheatsIgnoreRideIntensity = true; // Create some guests diff --git a/test/tests/sawyercoding_test.cpp b/test/tests/sawyercoding_test.cpp index c23bd95ce9..aa92b59552 100644 --- a/test/tests/sawyercoding_test.cpp +++ b/test/tests/sawyercoding_test.cpp @@ -83,7 +83,7 @@ TEST_F(SawyerCodingTest, write_read_chunk_rotate) // Note we only check if provided data decompresses to the same data, not if it compresses the same. // The reason for that is we may improve encoding at some point, but the test won't be affected, -// as we already do a decode test and rountrip (encode + decode), which validates all uses. +// as we already do a decode test and roundtrip (encode + decode), which validates all uses. TEST_F(SawyerCodingTest, decode_chunk_none) {