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

Various Spellchecks (#3741)

This commit is contained in:
CraigCraig 2016-05-26 02:49:19 -05:00 committed by Michael Steenbeek
parent 95249cf1df
commit 3f9afb9744
21 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/language/en-GB.txt
View File

@ -573,9 +573,9 @@ STR_0568 :
STR_0569 :Riding in special harnesses below the track, riders experience the feeling of flight as they swoop through the air
STR_0570 :
STR_0571 :Circular cars spin around as they travel along the zig-zagging wooden track
STR_0572 :Large capacity boats travel along a wide water channel, propelled up slopes by a conveyer belt, accelerating down steep slopes to soak the riders with a gaint splash
STR_0573 :Powered helicoper shaped cars running on a steel track, controlled by the pedalling of the riders
STR_0574 :Riders are held in special harnesses in a lying-down position, travlling through twisted track and inversions either on their backs or facing the ground
STR_0572 :Large capacity boats travel along a wide water channel, propelled up slopes by a conveyor belt, accelerating down steep slopes to soak the riders with a giant splash
STR_0573 :Powered helicopter shaped cars running on a steel track, controlled by the pedalling of the riders
STR_0574 :Riders are held in special harnesses in a lying-down position, travelling through twisted track and inversions either on their backs or facing the ground
STR_0575 :Powered trains hanging from a single rail transport people around the park
STR_0576 :
STR_0577 :Bogied cars run on wooden tracks, turning around on special reversing sections
@ -2254,7 +2254,7 @@ STR_2246 :November
STR_2247 :December
STR_2248 :Can't demolish ride/attraction...
STR_2249 :{BABYBLUE}New ride/attraction now available:{NEWLINE}{STRINGID}
STR_2250 :{BABYBLUE}New scenery/themeing now available:{NEWLINE}{STRINGID}
STR_2250 :{BABYBLUE}New scenery/theming now available:{NEWLINE}{STRINGID}
STR_2251 :Can only be built on paths!
STR_2252 :Can only be built across paths!
STR_2253 :Transport Rides
@ -2263,7 +2263,7 @@ STR_2255 :Roller Coasters
STR_2256 :Thrill Rides
STR_2257 :Water Rides
STR_2258 :Shops & Stalls
STR_2259 :Scenery & Themeing
STR_2259 :Scenery & Theming
STR_2260 :No funding
STR_2261 :Minimum funding
STR_2262 :Normal funding
@ -2277,7 +2277,7 @@ STR_2269 :{WINDOW_COLOUR_2}Type: {BLACK}{STRINGID}
STR_2270 :{WINDOW_COLOUR_2}Progress: {BLACK}{STRINGID}
STR_2271 :{WINDOW_COLOUR_2}Expected: {BLACK}{STRINGID}
STR_2272 :{WINDOW_COLOUR_2}Ride/attraction:{NEWLINE}{BLACK}{STRINGID}
STR_2273 :{WINDOW_COLOUR_2}Scenery/themeing:{NEWLINE}{BLACK}{STRINGID}
STR_2273 :{WINDOW_COLOUR_2}Scenery/theming:{NEWLINE}{BLACK}{STRINGID}
STR_2274 :{SMALLFONT}{BLACK}Show details of this invention or development
STR_2275 :{SMALLFONT}{BLACK}Show funding and options for research & development
STR_2276 :{SMALLFONT}{BLACK}Show research & development status
@ -2288,7 +2288,7 @@ STR_2280 :Roller Coaster
STR_2281 :Thrill Ride
STR_2282 :Water Ride
STR_2283 :Shop/Stall
STR_2284 :Scenery/Themeing
STR_2284 :Scenery/Theming
STR_2285 :Initial research
STR_2286 :Designing
STR_2287 :Completing design
@ -2480,7 +2480,7 @@ STR_2472 :{SMALLFONT}{BLACK}Research new roller coasters
STR_2473 :{SMALLFONT}{BLACK}Research new thrill rides
STR_2474 :{SMALLFONT}{BLACK}Research new water rides
STR_2475 :{SMALLFONT}{BLACK}Research new shops and stalls
STR_2476 :{SMALLFONT}{BLACK}Research new scenery and themeing
STR_2476 :{SMALLFONT}{BLACK}Research new scenery and theming
STR_2477 :{SMALLFONT}{BLACK}Select operating mode for this ride/attraction
STR_2478 :{SMALLFONT}{BLACK}Show graph of velocity against time
STR_2479 :{SMALLFONT}{BLACK}Show graph of altitude against time
@ -3463,7 +3463,7 @@ STR_5121 :Research
STR_5122 :Select rides by track type (like in RCT1)
STR_5123 :Renew rides
STR_5124 :<not used anymore>
STR_5125 :All destructable
STR_5125 :All destructible
STR_5126 :Random title music
STR_5127 :{SMALLFONT}{BLACK}While dragging, paint landscape instead of changing elevation
STR_5128 :Selection size
@ -4298,7 +4298,7 @@ STR_DTLS :Central to this large developing park is a giant triple-track racin
<Canary Mines>
STR_SCNR :Canary Mines
STR_PARK :Canary Mines
STR_DTLS :This abandoned mine already has the makings of a tourist attraction with its minature railway and a pair of vertical drop roller coasters
STR_DTLS :This abandoned mine already has the makings of a tourist attraction with its miniature railway and a pair of vertical drop roller coasters
<Barony Bridge>
STR_SCNR :Barony Bridge
@ -4555,7 +4555,7 @@ STR_DTLS :In this tiny park you must finish building the five existing coaste
<Nevermore Park>
STR_SCNR :Nevermore Park
STR_PARK :Nevermore Park
STR_DTLS :A large park with a novel transporation system around its edge
STR_DTLS :A large park with a novel transportation system around its edge
<Pacifica>
STR_SCNR :Pacifica

2
distribution/changelog.txt
View File

@ -96,7 +96,7 @@
- Fix: [#2407] save game prompt delay is not reset on start scenario
- Fix: [#2415] day / night cycle did not update colours during gameplay
- Fix: [#2425] new campaign for ride shows invalid list when over 40 rides
- Fix: [#2417] peep direction assertion somtimes during pathfinding
- Fix: [#2417] peep direction assertion sometimes during pathfinding
- Fix: [#2158] video freeze when window is maximised, minimised and then restored
- Fix: [#2434] dropdown menus linger when toolbars are hidden

2
src/config.c
View File

@ -1206,7 +1206,7 @@ static void title_sequence_open(const char *path, const char *customName)
}
// Check if the preset is already loaded
// No nead to read the first two presets as they're hardcoded in
// No need to read the first two presets as they're hardcoded in
for (preset = 0; preset < gConfigTitleSequences.num_presets; preset++) {
if (_stricmp(path, gConfigTitleSequences.presets[preset].name) == 0) {
return;

4
src/game.c
View File

@ -351,7 +351,7 @@ void game_logic_update()
network_update();
if (network_get_mode() == NETWORK_MODE_CLIENT && network_get_status() == NETWORK_STATUS_CONNECTED && network_get_authstatus() == NETWORK_AUTH_OK) {
if (gCurrentTicks >= network_get_server_tick()) {
// dont run past the server
// don't run past the server
return;
}
}
@ -555,7 +555,7 @@ int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int *
}
}
// Error occured
// Error occurred
// Decrement nest count
gGameCommandNestLevel--;

4
src/interface/console.c
View File

@ -139,7 +139,7 @@ void console_update()
}
}
// Remove unwated characters in console input
// Remove unwanted characters in console input
utf8_remove_format_codes(_consoleCurrentLine, false);
}
@ -1036,7 +1036,7 @@ utf8* console_window_table[] = {
console_command console_command_table[] = {
{ "clear", cc_clear, "Clears the console.", "clear"},
{ "hide", cc_hide, "Hides the console.", "hide"},
{ "echo", cc_echo, "Echos the text to the console.", "echo <text>" },
{ "echo", cc_echo, "Echoes the text to the console.", "echo <text>" },
{ "help", cc_help, "Lists commands or info about a command.", "help [command]" },
{ "get", cc_get, "Gets the value of the specified variable.", "get <variable>" },
{ "set", cc_set, "Sets the variable to the specified value.", "set <variable> <value>" },

2
src/interface/title_sequences.c
View File

@ -265,7 +265,7 @@ void title_sequence_remove_save(int preset, int index)
strcat(path, gConfigTitleSequences.presets[preset].saves[index]);
platform_file_delete(path);
// Remove all references to this save in the commands and decrement save indecies
// Remove all references to this save in the commands and decrement save indices
for (int i = 0; i < gConfigTitleSequences.presets[preset].num_commands; i++) {
if (gConfigTitleSequences.presets[preset].commands[i].command == TITLE_SCRIPT_LOAD) {
if (gConfigTitleSequences.presets[preset].commands[i].saveIndex == index)

4
src/interface/viewport.c
View File

@ -434,7 +434,7 @@ void sub_6E7DE1(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport){
uint8 zoom = (1 << viewport->zoom);
// Note: do not do the subtraction and then divide!
// Note: Due to arithmatic shift != /zoom a shift will have to be used
// Note: Due to arithmetic shift != /zoom a shift will have to be used
// hopefully when 0x006E7FF3 is finished this can be converted to /zoom.
sint16 x_diff = (viewport->view_x >> viewport->zoom) - (x >> viewport->zoom);
sint16 y_diff = (viewport->view_y >> viewport->zoom) - (y >> viewport->zoom);
@ -1136,7 +1136,7 @@ static bool sub_67933B_679788_679C4A_67A117(uint8 *esi, sint16 x_start_point, si
}
if (round > 1) {
// This matches the original implementation, but allows empty lines to cause false postives on zoom 0
// This matches the original implementation, but allows empty lines to cause false positives on zoom 0
if (ceil2(no_pixels, round) == 0) continue;
}

2
src/interface/viewport_interaction.c
View File

@ -90,7 +90,7 @@ int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info *
break;
}
// If nothing is under cursor, find a closeby peep
// If nothing is under cursor, find a close by peep
if (info->type == VIEWPORT_INTERACTION_ITEM_NONE) {
info->peep = viewport_interaction_get_closest_peep(x, y, 32);
if (info->peep == NULL)

4
src/interface/window.c
View File

@ -250,7 +250,7 @@ static void window_viewport_wheel_input(rct_window *w, int wheel)
static bool window_other_wheel_input(rct_window *w, int widgetIndex, int wheel)
{
// HACK: Until we have a new window system that allows us to add new events like mouse wheel easily,
// this selective approch will have to do.
// this selective approach will have to do.
// Allow mouse wheel scrolling to increment or decrement the land tool size for various windows
int previewWidgetIndex;
@ -653,7 +653,7 @@ void window_close(rct_window* window)
if (window == NULL)
return;
// Make a copy of the window class and number incase
// Make a copy of the window class and number in case
// the window order is changed by the close event.
rct_windowclass cls = window->classification;
rct_windownumber number = window->number;

2
src/management/award.c
View File

@ -404,7 +404,7 @@ static int award_is_deserved_best_restrooms(int awardType, int activeAwardTypes)
return (guestsWhoNeedRestroom <= 16);
}
/** More than half of the rides have satisfication <= 6 and park rating <= 650. */
/** More than half of the rides have satisfaction <= 6 and park rating <= 650. */
static int award_is_deserved_most_disappointing(int awardType, int activeAwardTypes)
{
unsigned int i, countedRides, disappointingRides;

2
src/network/network.cpp
View File

@ -1926,7 +1926,7 @@ void Network::Server_Handle_GAMECMD(NetworkConnection& connection, NetworkPacket
Server_Send_SHOWERROR(connection, STR_CANT_DO_THIS, STR_PERMISSION_DENIED);
return;
}
// Incase someone modifies the code / memory to enable cluster build,
// In case someone modifies the code / memory to enable cluster build,
// require a small delay in between placing scenery to provide some security, as
// cluster mode is a for loop that runs the place_scenery code multiple times.
if (commandCommand == GAME_COMMAND_PLACE_SCENERY) {

2
src/paint/map_element/entrance.c
View File

@ -72,7 +72,7 @@ void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_
else{
image_id |= style->sprite_index + direction;
}
// Format modifed to stop repeated code
// Format modified to stop repeated code
// Each entrance is split into 2 images for drawing
// Certain entrance styles have another 2 images to draw for coloured windows

14
src/peep/peep.c
View File

@ -1314,7 +1314,7 @@ void peep_sprite_remove(rct_peep* peep){
}
/**
* New function removes peep from park existance. Works with staff.
* New function removes peep from park existence. Works with staff.
*/
void peep_remove(rct_peep* peep){
if (peep->type == PEEP_TYPE_GUEST){
@ -4057,7 +4057,7 @@ static void peep_update_queuing(rct_peep* peep){
}
if (peep->time_in_queue >= 3500 && (0xFFFF & scenario_rand()) <= 93)
{
//Create the ive been waiting in line ages thought
//Create the I have been waiting in line ages thought
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_QUEUING_AGES, peep->current_ride);
}
}
@ -4610,7 +4610,7 @@ static int peep_update_walking_find_bin(rct_peep* peep){
uint8 chosen_edge = scenario_rand() & 0x3;
// Note: Bin qunatity is inverted 0 = full, 3 = empty
// Note: Bin quantity is inverted 0 = full, 3 = empty
uint8 bin_quantities = map_element->properties.path.addition_status;
// Rotate the bin to the correct edge. Makes it easier for next calc.
@ -4932,7 +4932,7 @@ static void peep_update_using_bin(rct_peep* peep){
// Place new amount in bin by first clearing the value
map_element->properties.path.addition_status &= ~(3 << selected_bin);
// Then placeing the new value.
// Then placing the new value.
map_element->properties.path.addition_status |= space_left_in_bin << selected_bin;
map_invalidate_tile_zoom0(peep->next_x, peep->next_y, map_element->base_height << 3, map_element->clearance_height << 3);
@ -5770,7 +5770,7 @@ static void peep_update(rct_peep *peep)
case PEEP_STATE_INSPECTING:
peep_update_fixing(stepsToTake, peep);
break;
//There shouldnt be any more
//There shouldn't be any more
default:
assert(0);
break;
@ -6929,7 +6929,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m
return peep_return_to_center_of_tile(peep);
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)){
// If the park is open and leaving flag isnt set return to center
// If the park is open and leaving flag isn't set return to center
if (gParkFlags & PARK_FLAGS_PARK_OPEN)
return peep_return_to_center_of_tile(peep);
}
@ -9689,7 +9689,7 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu
if (ride->excitement != (ride_rating)0xFFFF) {
// If a peep has already decided that they're going to go on a ride, they'll skip the weather and
// excitment check and will only do a basic intensity check when they arrive at the ride itself.
// excitement check and will only do a basic intensity check when they arrive at the ride itself.
if (rideIndex == peep->guest_heading_to_ride_id) {
if (ride->intensity > RIDE_RATING(10, 00) && !gCheatsIgnoreRideIntensity) {
peep_ride_is_too_intense(peep, rideIndex, peepAtRide);

2
src/util/util.c
View File

@ -192,7 +192,7 @@ bool strequals(const char *a, const char *b, int length, bool caseInsensitive)
strncmp(a, b, length) == 0;
}
/* case insensitve compare */
/* case insensitive compare */
int strcicmp(char const *a, char const *b)
{
for (;; a++, b++) {

2
src/windows/banner.c
View File

@ -288,7 +288,7 @@ static void window_banner_invalidate(rct_window *w)
rct_widget* colour_btn = &window_banner_widgets[WIDX_MAIN_COLOUR];
colour_btn->type = WWT_EMPTY;
//sceneray item not sure why we use this instead of banner?
//scenery item not sure why we use this instead of banner?
rct_scenery_entry* sceneryEntry = get_banner_entry(banner->type);
if (sceneryEntry->banner.flags & 1) colour_btn->type = WWT_COLOURBTN;

8
src/windows/cheats.c
View File

@ -132,8 +132,8 @@ enum WINDOW_CHEATS_WIDGET_IDX {
#define YOS TAB_HEIGHT + YSPA // Y offset from top (includes tabs height)
#define BTNW 110 // button width
#define BTNH 16 // button height
#define OPTW 220 // Option (checkbox) width (two colums)
#define OPTH 10 // Option (checkbox) height (two colums)
#define OPTW 220 // Option (checkbox) width (two columns)
#define OPTH 10 // Option (checkbox) height (two columns)
#define GROUP_SPACE 6
#define YPL(ROW) ((sint16)(YOS + ((BTNH + YSPA) * ROW)))
@ -215,7 +215,7 @@ static rct_widget window_cheats_misc_widgets[] = {
{ WWT_DROPDOWN_BUTTON, 1, WPL(1) - 10, WPL(1), YPL(4) + 8, YPL(4) + 12, STR_NUMERIC_DOWN, STR_NONE }, // decrease rating
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(5), HPL(5), STR_CHEAT_WIN_SCENARIO, STR_NONE}, // Win scenario
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(5), HPL(5), STR_CHEAT_HAVE_FUN, STR_NONE}, // Have fun!
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP }, // neverending marketing campaigns
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP }, // never ending marketing campaigns
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(7.25), HPL(9.5), STR_CHEAT_CLIMATE_GROUP, STR_NONE }, // Climate group
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(8), HPL(8), STR_CHEAT_FREEZE_CLIMATE, STR_CHEAT_FREEZE_CLIMATE_TIP }, // Freeze climate
{ WWT_DROPDOWN, 1, XPL(1), WPL(1), YPL(9) + 2, YPL(9) + 13, STR_NONE, STR_FORCE_WEATHER_TOOLTIP }, // Force weather
@ -235,7 +235,7 @@ static rct_widget window_cheats_misc_widgets[] = {
static rct_widget window_cheats_rides_widgets[] = {
MAIN_CHEATS_WIDGETS,
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(0), HPL(0), STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP }, // Renew rides
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP }, // All destructable
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP }, // All destructible
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP }, // Fix all rides
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(11), OHPL(11), STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP },// 410 km/h lift hill etc.
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(9), OHPL(9), STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP }, // Disable brakes failure

2
src/windows/finances.c
View File

@ -843,7 +843,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin
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;

2
src/windows/guest.c
View File

@ -2018,7 +2018,7 @@ void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi)
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, 0);
// If this is the last visable line end drawing.
// If this is the last visible line end drawing.
if (y > w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].bottom - 32) return;
}
}

2
src/windows/install_track.c
View File

@ -300,7 +300,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
gfx_draw_string_left(dpi, STR_MAX_POSITIVE_VERTICAL_G, &gForces, 0, x, y);
y += 10;
// Maximum negative verical Gs
// Maximum negative vertical Gs
gForces = td6->max_negative_vertical_g * 32;
gfx_draw_string_left(dpi, STR_MAX_NEGATIVE_VERTICAL_G, &gForces, 0, x, y);
y += 10;

4
src/world/climate.c
View File

@ -176,7 +176,7 @@ void climate_force_weather(uint8 weather){
climate_update();
// Incase of change in gloom level force a complete redraw
// In case of change in gloom level force a complete redraw
gfx_invalidate_screen();
}
@ -195,7 +195,7 @@ static void climate_determine_future_weather(int randomDistribution)
sint8 month = gDateMonthsElapsed & 7;
rct_weather_transition transition = climate_table[month];
// Generate a random variable with values 0 upto distribution_size-1 and chose weather from the distribution table accordingly
// Generate a random variable with values 0 up to distribution_size-1 and chose weather from the distribution table accordingly
sint8 next_weather = transition.distribution[ ((randomDistribution & 0xFF) * transition.distribution_size) >> 8 ];
gClimateNextWeather = next_weather;

2
src/world/scenery.c
View File

@ -111,7 +111,7 @@ void scenery_update_age(int x, int y, rct_map_element *mapElement)
return;
}
// Check map elements above, presumebly to see if map element is blocked from rain
// Check map elements above, presumably to see if map element is blocked from rain
mapElementAbove = mapElement;
while (!(mapElementAbove->flags & 7)) {
mapElementAbove++;