mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tons of spelling fixes (#5413) 

[ci skip]
This commit is contained in:
CraigCraig 2017-04-29 23:39:24 -05:00 committed by Michał Janiszewski
parent b45d4f328b
commit e0b875398b
47 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/OpenRCT2.cpp
View File

@ -52,7 +52,7 @@ extern "C"
#include "rct2/interop.h"
}
// The game update inverval in milliseconds, (1000 / 40fps) = 25ms
// The game update interval in milliseconds, (1000 / 40fps) = 25ms
constexpr uint32 UPDATE_TIME_MS = 25;
extern "C"
@ -86,7 +86,7 @@ namespace OpenRCT2
static uint32 _lastTick;
static uint32 _uncapTick;
/** If set, will end the OpenRCT2 game loop. Intentially private to this module so that the flag can not be set back to false. */
/** If set, will end the OpenRCT2 game loop. Intentionally private to this module so that the flag can not be set back to false. */
static bool _finished;
static bool ShouldRunVariableFrame();

2
src/openrct2/config/Config.cpp
View File

@ -171,7 +171,7 @@ namespace Config
model->load_save_sort = reader->GetSint32("load_save_sort", SORT_NAME_ASCENDING);
model->minimize_fullscreen_focus_loss = reader->GetBoolean("minimize_fullscreen_focus_loss", true);
//Default config setting is false until the games canvas can be seperated from the effect
//Default config setting is false until the games canvas can be separated from the effect
model->day_night_cycle = reader->GetBoolean("day_night_cycle", false);
model->enable_light_fx = reader->GetBoolean("enable_light_fx", false);

2
src/openrct2/core/Stopwatch.hpp
View File

@ -22,7 +22,7 @@ extern "C"
}
/**
* Class to accuately measure elapsed time with high precision.
* Class to accurately measure elapsed time with high precision.
*/
class Stopwatch final
{

4
src/openrct2/core/String.cpp
View File

@ -228,7 +228,7 @@ namespace String
va_end(args1);
va_end(args2);
// An error occured...
// An error occurred...
return nullptr;
}
@ -244,7 +244,7 @@ namespace String
va_end(args1);
va_end(args2);
// An error occured...
// An error occurred...
return nullptr;
}
}

2
src/openrct2/core/String.hpp
View File

@ -67,7 +67,7 @@ namespace String
utf8 * DiscardDuplicate(utf8 * * ptr, const utf8 * replacement);
/**
* Creates a new string containing the characters between index and and end of the input string.
* Creates a new string containing the characters between index and the end of the input string.
*/
utf8 * Substring(const utf8 * buffer, size_t index);

2
src/openrct2/drawing/drawing.h
View File

@ -72,7 +72,7 @@ assert_struct_size(rct_g1_element_32bit, 0x10);
enum {
G1_FLAG_BMP = (1 << 0), // Image data is encoded as raw pixels (no transparancy)
G1_FLAG_BMP = (1 << 0), // Image data is encoded as raw pixels (no transparency)
G1_FLAG_1 = (1 << 1),
G1_FLAG_RLE_COMPRESSION = (1 << 2), // Image data is encoded using RCT2's form of run length encoding
G1_FLAG_HAS_ZOOM_SPRITE = (1 << 4), // Use a different sprite for higher zoom levels

2
src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp
View File

@ -572,7 +572,7 @@ private:
static void ResetWindowVisbilities()
{
// reset window visibilty status to unknown
// reset window visibility status to unknown
for (rct_window *w = g_window_list; w < gWindowNextSlot; w++)
{
w->visibility = VC_UNKNOWN;

6
src/openrct2/drawing/string.c
View File

@ -245,7 +245,7 @@ sint32 gfx_wrap_string(utf8 *text, sint32 width, sint32 *outNumLines, sint32 *ou
/**
* Draws i formatted text string left aligned at i specified position but clips
* the text with an elipsis if the text width exceeds the specified width.
* the text with an ellipsis if the text width exceeds the specified width.
* rct2: 0x006C1B83
* dpi (edi)
* format (bx)
@ -270,7 +270,7 @@ void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, rct_string_id format,
/**
* Draws i formatted text string centred at i specified position but clips the
* text with an elipsis if the text width exceeds the specified width.
* text with an ellipsis if the text width exceeds the specified width.
* rct2: 0x006C1BBA
* dpi (edi)
* format (bx)
@ -1386,7 +1386,7 @@ void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, sint32 avai
// TODO: Replace with unicode ellipsis when supported
safe_strcpy(buffer, "...", bufferSize);
// Abreviate beginning with xth separator
// Abbreviate beginning with xth separator
sint32 begin = -1;
for (sint32 x = 0; x < path_separators; x++){
do {

4
src/openrct2/interface/Fonts.cpp
View File

@ -154,13 +154,13 @@ void TryLoadFonts()
{
return;
}
Console::Error::WriteLine("Unable to initialise prefered TrueType font -- falling back to Arial.");
Console::Error::WriteLine("Unable to initialise preferred TrueType font -- falling back to Arial.");
if (LoadFont(&TTFFontArial))
{
return;
}
Console::Error::WriteLine("Unable to initialise prefered TrueType font -- Falling back to sprite font.");
Console::Error::WriteLine("Unable to initialise preferred TrueType font -- Falling back to sprite font.");
}
#endif // NO_TTF
LoadSpriteFont();

2
src/openrct2/interface/console.c
View File

@ -1078,7 +1078,7 @@ static sint32 cc_set(const utf8 **argv, sint32 argc)
static sint32 cc_twitch(const utf8 **argv, sint32 argc)
{
#ifdef DISABLE_TWITCH
console_writeline_error("OpenRCT2 build not compiled with Twitch integeration.");
console_writeline_error("OpenRCT2 build not compiled with Twitch integration.");
#else
// TODO add some twitch commands
#endif

2
src/openrct2/interface/viewport.c
View File

@ -997,7 +997,7 @@ void viewport_set_visibility(uint8 mode)
/**
* Stores some info about the element pointed at, if requested for this particular type through the interaction mask.
* Origninaly checked 0x0141F569 at start
* Originally checked 0x0141F569 at start
* rct2: 0x00688697
*/
static void store_interaction_info(paint_struct *ps)

2
src/openrct2/interface/window.c
View File

@ -2486,7 +2486,7 @@ void window_start_textbox(rct_window *call_w, sint32 call_widget, rct_string_id
// Clear the text input buffer
memset(gTextBoxInput, 0, maxLength);
// Enter in the the text input buffer any existing
// Enter in the text input buffer any existing
// text.
if (existing_text != STR_NONE)
format_string(gTextBoxInput, TEXT_INPUT_SIZE, existing_text, &existing_args);

4
src/openrct2/intro.c
View File

@ -55,7 +55,7 @@ void intro_update()
case INTRO_STATE_PUBLISHER_BEGIN:
load_palette();
// Set the Y for the Infogrammes logo
// Set the Y for the Infogrames logo
_introStateCounter = -580;
// Play the chain lift sound
@ -64,7 +64,7 @@ void intro_update()
gIntroState++;
break;
case INTRO_STATE_PUBLISHER_SCROLL:
// Move the Infogrammes logo down
// Move the Infogrames logo down
_introStateCounter += 5;
// Check if logo is off the screen...ish

2
src/openrct2/management/finance.c
View File

@ -327,7 +327,7 @@ void game_command_set_current_loan(sint32* eax, sint32* ebx, sint32* ecx, sint32
/**
* Shift the expenditure table history one month to the left
* If the table is full, acumulate the sum of the oldest month first
* If the table is full, accumulate the sum of the oldest month first
* rct2: 0x0069DEAD
*/
void finance_shift_expenditure_table()

2
src/openrct2/management/finance.h
View File

@ -54,7 +54,7 @@ extern money32 gCurrentExpenditure;
extern money32 gCurrentProfit;
/**
* The total profit for the entire scenario that preceeds
* The total profit for the entire scenario that precedes
* the current financial table.
*/
extern money32 gHistoricalProfit;

8
src/openrct2/network/NetworkKey.cpp
View File

@ -305,7 +305,7 @@ std::string NetworkKey::PublicKeyString()
* public key. Serves a purpose of easy identification keys in multiplayer
* overview, multiplayer settings.
*
* In particular, any of digest functions applied to a standarised key
* In particular, any of digest functions applied to a standardised key
* representation, like PEM, will be sufficient.
*
* @return returns a string containing key hash.
@ -387,7 +387,7 @@ bool NetworkKey::Sign(const uint8 * md, const size_t len, char ** signature, siz
/* Allocate memory for the signature based on size in slen */
if ((sig = (unsigned char*)OPENSSL_malloc((sint32)(sizeof(unsigned char) * (*out_size)))) == NULL)
{
log_error("Failed to crypto-allocate space fo signature");
log_error("Failed to crypto-allocate space for signature");
EVP_MD_CTX_destroy(mdctx);
return false;
}
@ -419,7 +419,7 @@ bool NetworkKey::Verify(const uint8 * md, const size_t len, const char * sig, co
if (1 != EVP_DigestVerifyInit(mdctx, nullptr, EVP_sha256(), nullptr, _key))
{
log_error("Failed to initalise verification routine");
log_error("Failed to initialise verification routine");
EVP_MD_CTX_destroy(mdctx);
return false;
}
@ -435,7 +435,7 @@ bool NetworkKey::Verify(const uint8 * md, const size_t len, const char * sig, co
if (1 == EVP_DigestVerifyFinal(mdctx, (uint8 *)sig, siglen))
{
EVP_MD_CTX_destroy(mdctx);
log_verbose("Succesfully verified signature");
log_verbose("Successfully verified signature");
return true;
}
else

2
src/openrct2/object/ObjectManager.cpp
View File

@ -418,7 +418,7 @@ private:
}
}
// HACK Scenery window will lose its tabs after changing the the scenery group indexing
// HACK Scenery window will lose its tabs after changing the scenery group indexing
// for now just close it, but it will be better to later tell it to invalidate the tabs
window_close_by_class(WC_SCENERY);
}

2
src/openrct2/paint/map_element/path.c
View File

@ -607,7 +607,7 @@ static void sub_6A3F61(rct_map_element * map_element, uint16 bp, uint16 height,
gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
}
// Draw additional path bits (bins, benchs, lamps, queue screens)
// Draw additional path bits (bins, benches, lamps, queue screens)
rct_scenery_entry* sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element));
switch (sceneryEntry->path_bit.draw_type) {
case PATH_BIT_DRAW_TYPE_LIGHTS:

4
src/openrct2/paint/map_element/surface.c
View File

@ -516,7 +516,7 @@ static void viewport_surface_draw_land_side_top(enum edge_t edge, uint8 height,
const uint8 rotation = get_current_rotation();
uint8 cur_height = min(regs.ch, regs.ah);
if (regs.ch != regs.ah) {
// neightbour tile corners aren't level
// neighbour tile corners aren't level
uint32 image_offset = 3;
if (regs.ch > regs.ah) {
image_offset = 4;
@ -778,7 +778,7 @@ static void viewport_surface_draw_water_side_top(enum edge_t edge, uint8 height,
const uint8 rotation = get_current_rotation();
uint8 cur_height = min(regs.ch, regs.ah);
if (regs.ch != regs.ah) {
// neightbour tile corners aren't level
// neighbour tile corners aren't level
uint32 image_offset = 3;
if (regs.ch > regs.ah) {
image_offset = 4;

6
src/openrct2/peep/peep.c
View File

@ -9121,7 +9121,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep
/* If this map element is the search goal the current search path ends here. */
if (new_score == 0) {
/* If the search result is better than the best so far (in the paramaters),
/* If the search result is better than the best so far (in the parameters),
* then update the parameters with this search before continuing to the next map element. */
if (new_score < *endScore || (new_score == *endScore && counter < *endSteps )) {
// Update the search results
@ -9174,7 +9174,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep
* thereafter stay on thin paths. */
/* So, if the current path is also wide the goal could still
* be reachable from here.
* If the search result is better than the best so far (in the paramaters),
* If the search result is better than the best so far (in the parameters),
* then update the parameters with this search before continuing to the next map element. */
if (footpath_element_is_wide(currentMapElement) &&
(new_score < *endScore || (new_score == *endScore && counter < *endSteps ))) {
@ -9330,7 +9330,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep
/* If the junction search limit is reached, the
* current search path ends here. The goal may still
* be reachable from here.
* If the search result is better than the best so far (in the paramaters),
* If the search result is better than the best so far (in the parameters),
* then update the parameters with this search before continuing to the next map element. */
if (_peepPathFindNumJunctions <= 0) {
if (new_score < *endScore || (new_score == *endScore && counter < *endSteps )) {

8
src/openrct2/peep/peep.h
View File

@ -50,8 +50,8 @@ enum PEEP_THOUGHT_TYPE {
PEEP_THOUGHT_TYPE_GOOD_VALUE = 10, // "X is really good value"
PEEP_THOUGHT_TYPE_ALREADY_GOT = 11, // "I've already got"
PEEP_THOUGHT_TYPE_CANT_AFFORD = 12, // "I can't afford"
PEEP_THOUGHT_TYPE_NOT_HUNGRY = 13, // "I'm not not hungry"
PEEP_THOUGHT_TYPE_NOT_THIRSTY = 14, // "I'm not not thirsty"
PEEP_THOUGHT_TYPE_NOT_HUNGRY = 13, // "I'm not hungry"
PEEP_THOUGHT_TYPE_NOT_THIRSTY = 14, // "I'm not thirsty"
PEEP_THOUGHT_TYPE_DROWNING = 15, // "Help! I'm drowning!"
PEEP_THOUGHT_TYPE_LOST = 16, // "I'm lost!"
PEEP_THOUGHT_TYPE_WAS_GREAT = 17, // "X was great"
@ -75,7 +75,7 @@ enum PEEP_THOUGHT_TYPE {
PEEP_THOUGHT_TYPE_VERY_CLEAN = 35, // "This park is very clean and tidy"
PEEP_THOUGHT_TYPE_FOUNTAINS = 36, // "The jumping fountains are great"
PEEP_THOUGHT_TYPE_MUSIC = 37, // "The music is nice here"
PEEP_THOUGHT_TYPE_BALLOON = 38, // "This baloon from X is really good value"
PEEP_THOUGHT_TYPE_BALLOON = 38, // "This balloon from X is really good value"
PEEP_THOUGHT_TYPE_TOY = 39, // "This cuddly toy from X is really good value"
PEEP_THOUGHT_TYPE_MAP = 40,
PEEP_THOUGHT_TYPE_PHOTO = 41, // "This on ride photo from X is really good value"
@ -296,7 +296,7 @@ enum PEEP_FLAGS {
PEEP_FLAGS_PAINTING = (1 << 7),
PEEP_FLAGS_WOW = (1 << 8), // Makes a peep WOW2
PEEP_FLAGS_LITTER = (1 << 9), // Makes the peep throw litter
PEEP_FLAGS_LOST = (1 << 10), // Makes the peep feel lost (animation trigerred)
PEEP_FLAGS_LOST = (1 << 10), // Makes the peep feel lost (animation triggered)
PEEP_FLAGS_HUNGER = (1 << 11), // Makes the peep become hungry quicker
PEEP_FLAGS_BATHROOM = (1 << 12), // Makes the peep want to go to the bathroom
PEEP_FLAGS_CROWDED = (1 << 13), // The peep will start feeling crowded

2
src/openrct2/platform/crash.cpp
View File

@ -61,7 +61,7 @@ static bool OnCrash(const wchar_t * dumpPath,
{
if (!succeeded)
{
constexpr const char * DumpFailedMessage = "Failed to create the dump. Please file an issue with OpenRCT2 on GitHub and provide latest save, and provide information about what you did before the crash occured.";
constexpr const char * DumpFailedMessage = "Failed to create the dump. Please file an issue with OpenRCT2 on GitHub and provide latest save, and provide information about what you did before the crash occurred.";
printf("%s\n", DumpFailedMessage);
if (!gOpenRCT2SilentBreakpad)
{

2
src/openrct2/platform/shared.c
View File

@ -634,7 +634,7 @@ sint32 platform_scancode_to_rct_keycode(sint32 sdl_key)
{
char keycode = (char)SDL_GetKeyFromScancode((SDL_Scancode)sdl_key);
// Until we reshufle the text files to use the new positions
// Until we reshuffle the text files to use the new positions
// this will suffice to move the majority to the correct positions.
// Note any special buttons PgUp PgDwn are mapped wrong.
if (keycode >= 'a' && keycode <= 'z')

2
src/openrct2/rct1/S4Importer.cpp
View File

@ -640,7 +640,7 @@ private:
{
memset(dst, 0, sizeof(rct_ride));
// This is a pecularity of this exact version number, which only Heide-Park seems to use.
// This is a peculiarity of this exact version number, which only Heide-Park seems to use.
if (_s4.game_version == 110018 && src->type == RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER)
{
dst->type = RIDE_TYPE_COMPACT_INVERTED_COASTER;

6
src/openrct2/ride/ride.c
View File

@ -602,7 +602,7 @@ bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32
/**
* Returns the begin position / direction and end position / direction of the
* track piece that procedes the given location. Gets the previous track block
* track piece that proceeds the given location. Gets the previous track block
* coordinates from the coordinates of the first of element of a track block.
* Use track_block_get_previous if you are unsure if you are on the first
* element of a track block
@ -2454,11 +2454,11 @@ static void ride_breakdown_status_update(sint32 rideIndex)
{
rct_ride *ride = get_ride(rideIndex);
// Warn player if ride hasnt been fixed for ages
// Warn player if ride hasn't been fixed for ages
if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) {
ride->not_fixed_timeout++;
// When there has been a full 255 timeout ticks this
// will force timeout ticks to keep issueing news every
// will force timeout ticks to keep issuing news every
// 16 ticks. Note there is no reason to do this.
if (ride->not_fixed_timeout == 0)
ride->not_fixed_timeout -= 16;

2
src/openrct2/ride/ride.h
View File

@ -302,7 +302,7 @@ typedef struct rct_ride {
uint32 no_primary_items_sold; // 0x1A4
uint32 no_secondary_items_sold; // 0x1A8
uint8 breakdown_sound_modifier; // 0x1AC
// Used to oscilate the sound when ride breaks down.
// Used to oscillate the sound when ride breaks down.
// 0 = no change, 255 = max change
uint8 not_fixed_timeout; // 0x1AD
uint8 last_crash_type; // 0x1AE

2
src/openrct2/ride/ride_ratings.c
View File

@ -822,7 +822,7 @@ static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings
}
/**
* Lowers excitment, the higher the intensity.
* Lowers excitement, the higher the intensity.
* rct2: 0x0065E7A3
*/
static void ride_ratings_apply_intensity_penalty(rating_tuple *ratings)

2
src/openrct2/ride/track_design.c
View File

@ -1262,7 +1262,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint
* bl == 0, Draw outlines on the ground
* bl == 1,
* bl == 2,
* bl == 3, Returns the z value of a succesful placement. Only lower 16 bits are the value, the rest may be garbage?
* bl == 3, Returns the z value of a successful placement. Only lower 16 bits are the value, the rest may be garbage?
* bl == 4,
* bl == 5, Returns cost to create the track. All 32 bits are used. Places the track. (used by the preview)
* bl == 6, Clear white outlined track.

4
src/openrct2/ride/transport/miniature_railway.c
View File

@ -1253,7 +1253,7 @@ static void paint_miniature_railway_track_left_eighth_to_diag(uint8 rideIndex, u
bool isSupported = false;
bool isRightEighthToOrthog = mapElement->properties.track.type == TRACK_ELEM_RIGHT_EIGHTH_TO_ORTHOGONAL;
// Right eigth to orthogonal calls this function but we do not want to have a support call for it
// Right eighth to orthogonal calls this function but we do not want to have a support call for it
// for track sequence 4
if (trackSequence != 4 || !isRightEighthToOrthog) {
isSupported = wooden_a_supports_paint_setup(supportType[direction][trackSequence], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL);
@ -1403,7 +1403,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(uint8 rideIndex,
bool isSupported = false;
bool isLeftEighthToOrthog = mapElement->properties.track.type == TRACK_ELEM_LEFT_EIGHTH_TO_ORTHOGONAL;
// Right eigth to orthogonal calls this function but we do not want to have a support call for it
// Right eighth to orthogonal calls this function but we do not want to have a support call for it
// for track sequence 4
if (trackSequence != 4 || !isLeftEighthToOrthog) {
isSupported = wooden_a_supports_paint_setup(supportType[direction][trackSequence], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL);

2
src/openrct2/util/util.c
View File

@ -495,7 +495,7 @@ uint8 *util_zlib_deflate(const uint8 *data, size_t data_in_size, size_t *data_ou
return buffer;
}
// Type-independant code left as macro to reduce duplicate code.
// Type-independent code left as macro to reduce duplicate code.
#define add_clamp_body(value, value_to_add, min_cap, max_cap) \
if ((value_to_add > 0) && (value > (max_cap - value_to_add))) { \
value = max_cap; \

2
src/openrct2/windows/editor_inventions_list.c
View File

@ -846,7 +846,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix
researchItemEndMarker = RESEARCHED_ITEMS_SEPARATOR;
}
// Since this is now a do while need to conteract the +10
// Since this is now a do while need to counteract the +10
itemY = -10;
do{
itemY += 10;

4
src/openrct2/windows/editor_object_selection.c
View File

@ -276,12 +276,12 @@ static rct_object_entry DefaultSelectedObjects[] = {
{ 0x00000080, { "FAID1 " }, 0 }, // Ride: First Aid Room
{ 0x00000080, { "INFOK " }, 0 }, // Ride: Information Kiosk
{ 0x00000080, { "DRNKS " }, 0 }, // Ride: Drinks Stall
{ 0x00000080, { "CNDYF " }, 0 }, // Ride: Cotten Candy Stall
{ 0x00000080, { "CNDYF " }, 0 }, // Ride: Cotton Candy Stall
{ 0x00000080, { "BURGB " }, 0 }, // Ride: Burger Bar
{ 0x00000080, { "BALLN " }, 0 }, // Ride: Balloon Stall
{ 0x00000080, { "ARRT1 " }, 0 }, // Ride: Corkscrew Roller Coaster
{ 0x00000080, { "RBOAT " }, 0 }, // Ride: Rowing Boats
{ 0x00000088, { "PKENT1 " }, 0 }, // Park Entrace: Traditional Park Entrance
{ 0x00000088, { "PKENT1 " }, 0 }, // Park Entrance: Traditional Park Entrance
{ 0x00000089, { "WTRCYAN " }, 0 }, // Water: Natural Water
{ 0x00000085, { "TARMACB " }, 0 }, // Footpath: Brown Tarmac Footpath
{ 0x00000085, { "PATHSPCE" }, 0 }, // Footpath: Space Style Footpath

6
src/openrct2/windows/finances.c
View File

@ -958,7 +958,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli
if (balance == MONEY32_UNDEFINED)
continue;
// Modifier balance then keep halfing until less than 255 pixels
// Modifier balance then keep halving until less than 255 pixels
balance = abs(balance) >> yAxisScale;
while (balance > 255) {
balance /= 2;
@ -1064,7 +1064,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo
if (balance == MONEY32_UNDEFINED)
continue;
// Modifier balance then keep halfing until less than 127 pixels
// Modifier balance then keep halving until less than 127 pixels
balance = abs(balance) >> yAxisScale;
while (balance > 127) {
balance /= 2;
@ -1148,7 +1148,7 @@ static void window_finances_marketing_invalidate(rct_window *w)
window_finances_marketing_widgets[WIDX_ACITVE_CAMPAGINS_GROUP].bottom = y - 20;
window_finances_marketing_widgets[WIDX_CAMPAGINS_AVAILABLE_GROUP].top = y - 13;
// Update new campagin button visibility
// Update new campaign button visibility
for (i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) {
rct_widget *campaginButton = &window_finances_marketing_widgets[WIDX_CAMPAIGN_1 + i];

2
src/openrct2/windows/land_rights.c
View File

@ -210,7 +210,7 @@ static void window_land_rights_invalidate(rct_window *w)
SPR_LAND_TOOL_SIZE_0 + gLandToolSize :
0xFFFFFFFF;
// Disable ownership and/or construction buying functions if there're no tiles left for sale
// Disable ownership and/or construction buying functions if there are no tiles left for sale
if (gLandRemainingOwnershipSales == 0) {
w->disabled_widgets |= (1 << WIDX_BUY_LAND_RIGHTS);
window_land_rights_widgets[WIDX_BUY_LAND_RIGHTS].tooltip = STR_NO_LAND_RIGHTS_FOR_SALE_TIP;

2
src/openrct2/windows/map.c
View File

@ -298,7 +298,7 @@ static void window_map_mouseup(rct_window *w, sint32 widgetIndex)
if (tool_set(w, widgetIndex, 2))
break;
_activeTool = 2;
// Prevent mountain tool tool size.
// Prevent mountain tool size.
gLandToolSize = max(MINIMUM_TOOL_SIZE, gLandToolSize);
show_gridlines();
show_land_rights();

2
src/openrct2/windows/options.c
View File

@ -324,7 +324,7 @@ static rct_widget window_options_misc_widgets[] = {
{ WWT_DROPDOWN, 1, 155, 299, 144, 155, STR_NONE, STR_NONE }, // Autosave dropdown
{ WWT_DROPDOWN_BUTTON, 1, 288, 298, 145, 154, STR_DROPDOWN_GLYPH, STR_AUTOSAVE_FREQUENCY_TIP }, // Autosave dropdown button
{ WWT_DROPDOWN, 1, 155, 299, 159, 170, STR_NONE, STR_NONE }, // Title sequence dropdown
{ WWT_DROPDOWN_BUTTON, 1, 288, 298, 160, 169, STR_DROPDOWN_GLYPH, STR_TITLE_SEQUENCE_TIP }, // Title seqeuence dropdown button
{ WWT_DROPDOWN_BUTTON, 1, 288, 298, 160, 169, STR_DROPDOWN_GLYPH, STR_TITLE_SEQUENCE_TIP }, // Title sequence dropdown button
{ WWT_DROPDOWN_BUTTON, 1, 26, 185, 174, 185, STR_EDIT_TITLE_SEQUENCES_BUTTON, STR_EDIT_TITLE_SEQUENCES_BUTTON_TIP }, // Edit title sequences button
{ WWT_CHECKBOX, 2, 10, 299, 189, 200, STR_AUTO_STAFF_PLACEMENT, STR_AUTO_STAFF_PLACEMENT_TIP }, // Auto staff placement
{ WWT_CHECKBOX, 2, 10, 299, 204, 215, STR_HANDYMEN_MOW_BY_DEFAULT, STR_HANDYMEN_MOW_BY_DEFAULT_TIP }, // Handymen mow by default

4
src/openrct2/windows/text_input.c
View File

@ -105,7 +105,7 @@ void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_i
// Clear the text input buffer
memset(text_input, 0, maxLength);
// Enter in the the text input buffer any existing
// Enter in the text input buffer any existing
// text.
if (existing_text != STR_NONE)
format_string(text_input, maxLength, existing_text, &existing_args);
@ -164,7 +164,7 @@ void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_stri
// Clear the text input buffer
memset(text_input, 0, maxLength);
// Enter in the the text input buffer any existing
// Enter in the text input buffer any existing
// text.
if (existing_text != NULL)
safe_strcpy(text_input, existing_text, maxLength);

2
src/openrct2/windows/title_editor.c
View File

@ -139,7 +139,7 @@ enum WINDOW_TITLE_EDITOR_WIDGET_IDX {
WIDX_TITLE_EDITOR_SKIP,
};
// Increase BW if certain launguages do not fit
// Increase BW if certain languages do not fit
// BW should be a multiple of 4
#define WW 320
#define WH 270

2
src/openrct2/windows/title_scenarioselect.c
View File

@ -434,7 +434,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Scenario score
if (scenario->highscore != NULL) {
// TODO: Should probably be translateable
// TODO: Should probably be translatable
const utf8 *completedByName = "???";
if (!str_is_null_or_empty(scenario->highscore->name)) {
completedByName = scenario->highscore->name;

10
src/openrct2/windows/top_toolbar.c
View File

@ -185,7 +185,7 @@ static rct_widget window_top_toolbar_widgets[] = {
{ WWT_TRNBTN, 1, 0x0046 + 30, 0x0063 + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // Zoom out
{ WWT_TRNBTN, 1, 0x0064 + 30, 0x0081 + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP }, // Zoom in
{ WWT_TRNBTN, 1, 0x0082 + 30, 0x009F + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP }, // Rotate camera
{ WWT_TRNBTN, 1, 0x00A0 + 30, 0x00BD + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP }, // Transparancy menu
{ WWT_TRNBTN, 1, 0x00A0 + 30, 0x00BD + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP }, // Transparency menu
{ WWT_TRNBTN, 1, 0x00BE + 30, 0x00DB + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP }, // Map
{ WWT_TRNBTN, 2, 0x010B, 0x0128, 0, 27, 0x20000000 | SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP }, // Land
@ -1243,7 +1243,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid
rotation -= get_current_rotation();
rotation &= 0x3;
// Also places it in lower but think thats for clobering
// Also places it in lower but think thats for clobbering
*parameter_1 = (selected_scenery & 0xFF) << 8;
*parameter_2 = (cl ^ (1 << 1)) | (gWindowSceneryPrimaryColour << 8);
*parameter_3 = rotation | (gWindowScenerySecondaryColour << 16);
@ -1321,7 +1321,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid
rotation -= get_current_rotation();
rotation &= 0x3;
// Also places it in lower but think thats for clobering
// Also places it in lower but think thats for clobbering
*parameter_1 = (selected_scenery & 0xFF) << 8;
*parameter_2 = 0 | (gWindowSceneryPrimaryColour << 8);
*parameter_3 = rotation | (gWindowScenerySecondaryColour << 16);
@ -1405,7 +1405,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid
return;
_unkF64F15 = gWindowScenerySecondaryColour | (gWindowSceneryTertiaryColour << 8);
// Also places it in lower but think thats for clobering
// Also places it in lower but think thats for clobbering
*parameter_1 = (selected_scenery & 0xFF) << 8;
*parameter_2 = cl | (gWindowSceneryPrimaryColour << 8);
*parameter_3 = 0;
@ -1506,7 +1506,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid
z /= 2;
// Also places it in lower but think thats for clobering
// Also places it in lower but think thats for clobbering
*parameter_1 = (selected_scenery & 0xFF) << 8;
*parameter_2 = z | (rotation << 8);
*parameter_3 = gWindowSceneryPrimaryColour;

2
src/openrct2/world/entrance.cpp
View File

@ -465,7 +465,7 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8
rct_ride* ride = get_ride(rideIndex);
if (ride->type == RIDE_TYPE_NULL)
{
log_warning("Invalide ride id %u for entrance/exit removal", rideIndex);
log_warning("Invalid ride id %u for entrance/exit removal", rideIndex);
return MONEY32_UNDEFINED;
}

2
src/openrct2/world/footpath.c
View File

@ -1767,7 +1767,7 @@ void footpath_update_path_wide_flags(sint32 x, sint32 y)
* they were cleared. Consequently only the wide flag for this single
* tile is modified by this update.
* This is important for avoiding glitches in pathfinding that occurs
* between between the batches of updates to the path wide flags.
* between the batches of updates to the path wide flags.
* Corresponding pathList[] indexes for the following tiles
* are: 2, 3, 4, 5.
* Note: indexes 3, 4, 5 are reset in the current call;

2
src/openrct2/world/map.c
View File

@ -3929,7 +3929,7 @@ static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr)
element->properties.surface.terrain = 0;
element->properties.surface.grass_length = 1;
element->properties.surface.ownership = 0;
// Because this element is not completely removed, the pointer must be updated muanually
// Because this element is not completely removed, the pointer must be updated manually
// The rest of the elements are removed from the array, so the pointer doesn't need to be updated.
(*elementPtr)++;
break;

2
src/openrct2/world/mapgen.c
View File

@ -190,7 +190,7 @@ void mapgen_generate(mapgen_settings *settings)
mapgen_simplex(settings);
mapgen_smooth_height(2 + (util_rand() % 6));
} else {
// Keep overwriting the map with rough cicular blobs of different sizes and heights.
// Keep overwriting the map with rough circular blobs of different sizes and heights.
// This procedural method can produce intersecting contour like land and lakes.
// Large blobs, general shape of map
mapgen_blobs(6, _heightSize / 2, _heightSize * 4, 4, 16);

2
src/openrct2/world/sprite.c
View File

@ -158,7 +158,7 @@ void reset_sprite_list()
*
* rct2: 0x0069EBE4
* This function looks as though it sets some sort of order for sprites.
* Sprites can share thier position if this is the case.
* Sprites can share their position if this is the case.
*/
void reset_sprite_spatial_index()
{

4
src/openrct2/world/tile_inspector.c
View File

@ -696,7 +696,7 @@ sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elemen
}
}
// TODO: Only invalidate when one of the affacted tiles is selected
// TODO: Only invalidate when one of the affected tiles is selected
window_invalidate_by_class(WC_TILE_INSPECTOR);
return 0;
@ -830,7 +830,7 @@ sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, b
}
}
// TODO: Only invalidate when one of the affacted tiles is selected
// TODO: Only invalidate when one of the affected tiles is selected
window_invalidate_by_class(WC_TILE_INSPECTOR);
return 0;

18
test/tests/IniWriterTest.cpp
View File

@ -32,7 +32,7 @@ TEST_F(IniWriterTest, create_one_section)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 12);
ASSERT_LE(ms.GetPosition(), 13); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 13); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -53,7 +53,7 @@ TEST_F(IniWriterTest, create_multiple_sections)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 48);
ASSERT_LE(ms.GetPosition(), 55); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 55); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -72,7 +72,7 @@ TEST_F(IniWriterTest, create_loose_bool_entry)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 16);
ASSERT_LE(ms.GetPosition(), 17); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 17); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -91,7 +91,7 @@ TEST_F(IniWriterTest, create_loose_enum_entry)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 34);
ASSERT_LE(ms.GetPosition(), 36); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 36); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -109,7 +109,7 @@ TEST_F(IniWriterTest, create_loose_float_entry)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 16);
ASSERT_LE(ms.GetPosition(), 17); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 17); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -132,7 +132,7 @@ TEST_F(IniWriterTest, create_loose_sint32_entry)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 73);
ASSERT_LE(ms.GetPosition(), 78); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 78); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -151,7 +151,7 @@ TEST_F(IniWriterTest, create_loose_string_entry)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 43);
ASSERT_LE(ms.GetPosition(), 44); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 44); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -175,7 +175,7 @@ TEST_F(IniWriterTest, create_multiple_section_with_values)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 99);
ASSERT_LE(ms.GetPosition(), 108); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 108); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();
@ -198,7 +198,7 @@ TEST_F(IniWriterTest, create_duplicate_sections)
uint8 null_terminator = 0;
ms.Write(&null_terminator, 1);
ASSERT_GE(ms.GetPosition(), 33);
ASSERT_LE(ms.GetPosition(), 43); // Accomodate for varying-sized newline (Windows)
ASSERT_LE(ms.GetPosition(), 43); // Accommodate for varying-sized newline (Windows)
ASSERT_EQ(ms.GetLength(), ms.GetPosition());
ms.SetPosition(0);
const char * ini = (const char *)ms.ReadString();