yerf
/
Cataclysm-DDA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SpellingStandardizing

This commit is contained in:
klorpa 2020-04-02 20:14:28 -05:00
parent 1128add1a5
commit 6601f35040
38 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -1,8 +1,8 @@
# Automatically normalise line endings for all files
# Automatically normalize line endings for all files
# detected as text (Convert CRLF => LF).
* text=auto
# Explicitly normalise files with these extensions in
# Explicitly normalize files with these extensions in
# case Git doesn't detect them as text for some reason.
*.c text
*.cbp text

2
.travis.yml
View File

@ -54,7 +54,7 @@ branches:
jobs:
include:
# Initial test stage, if this fails everything else is cancelled.
# Initial test stage, if this fails everything else is canceled.
- stage: Test
# Clang is consistently the fastest to build, so use it for the initial test.
env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"

6
CMakeModules/FindCurses.cmake
View File

@ -88,7 +88,7 @@ if(NOT CURSES_USE_NCURSES)
get_filename_component(_cursesParentDir "${_cursesLibDir}" PATH)
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache wqith these variables set
# FORCE must not be used since this would break builds which preload a cache with these variables set
set(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH}"
CACHE FILEPATH "The curses include path")
set(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}"
@ -113,7 +113,7 @@ else()
# FORCE must not be used since this would break builds which preload
# however if the value of the variable has NOTFOUND in it, then
# it is OK to force, and we need to force in order to have it work.
# a cache wqith these variables set
# a cache with these variables set
# only put ncurses include and library into
# variables if they are found
if(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
@ -155,7 +155,7 @@ find_library(CURSES_FORM_LIBRARY form )
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache
# qith these variables set
# with these variables set
set(FORM_LIBRARY "${CURSES_FORM_LIBRARY}"
CACHE FILEPATH "The curses form library")

4
CMakeModules/FindSDL2_image.cmake
View File

@ -16,7 +16,7 @@
#
#
#
# For backward compatiblity the following variables are also set:
# For backward compatibility the following variables are also set:
#
# ::
#
@ -89,7 +89,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_image
REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS
VERSION_VAR SDL2_IMAGE_VERSION_STRING)
# for backward compatiblity
# for backward compatibility
set(SDL2IMAGE_LIBRARY ${SDL2_IMAGE_LIBRARIES})
set(SDL2IMAGE_INCLUDE_DIR ${SDL2_IMAGE_INCLUDE_DIRS})
set(SDL2IMAGE_FOUND ${SDL2_IMAGE_FOUND})

4
CMakeModules/FindSDL2_mixer.cmake
View File

@ -16,7 +16,7 @@
#
#
#
# For backward compatiblity the following variables are also set:
# For backward compatibility the following variables are also set:
#
# ::
#
@ -89,7 +89,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer
REQUIRED_VARS SDL2_MIXER_LIBRARIES SDL2_MIXER_INCLUDE_DIRS
VERSION_VAR SDL2_MIXER_VERSION_STRING)
# for backward compatiblity
# for backward compatibility
set(SDL2MIXER_LIBRARY ${SDL2_MIXER_LIBRARIES})
set(SDL2MIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS})
set(SDL2MIXER_FOUND ${SDL2_MIXER_FOUND})

4
CMakeModules/FindSDL2_ttf.cmake
View File

@ -15,7 +15,7 @@
#
#
#
# For backward compatiblity the following variables are also set:
# For backward compatibility the following variables are also set:
#
# ::
#
@ -88,7 +88,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_ttf
REQUIRED_VARS SDL2_TTF_LIBRARIES SDL2_TTF_INCLUDE_DIRS
VERSION_VAR SDL2_TTF_VERSION_STRING)
# for backward compatiblity
# for backward compatibility
set(SDL2TTF_LIBRARY ${SDL2_TTF_LIBRARIES})
set(SDL2TTF_INCLUDE_DIR ${SDL2_TTF_INCLUDE_DIRS})
set(SDL2TTF_FOUND ${SDL2_TTF_FOUND})

2
android/gradle.properties
View File

@ -48,7 +48,7 @@ deps=./deps.zip
# You can override this from the command line by passing "-Poverride_version=#"
override_version=
# This property controls path where overriden version number header should be generated
# This property controls path where overridden version number header should be generated
# You can override this from the command line by passing "-Pversion_header_path=#"
version_header_path=app/jni/src/version.h

2
data/json/furniture_and_terrain/terrain-manufactured.json
View File

@ -1041,7 +1041,7 @@
"type": "terrain",
"id": "t_potential_trans",
"name": "potential transformer",
"description": "A specialised type of electrical transformer, ",
"description": "A specialized type of electrical transformer, ",
"symbol": "8",
"color": "i_light_gray",
"looks_like": "t_machinery_electronic",

2
data/json/items/comestibles/junkfood.json
View File

@ -25,7 +25,7 @@
"id": "toastem2",
"name": "toast-em",
"copy-from": "toastem",
"description": "Dry toaster pastries, usually coated with solid frosting, these are blueberry flavored!",
"description": "Dry toaster pastries, usually coated with solid frosting. These are blueberry flavored!",
"fun": 15
},
{

4
data/json/items/resources/tailoring.json
View File

@ -191,8 +191,8 @@
"id": "sheet_lycra",
"type": "AMMO",
"category": "spare_parts",
"name": { "str": "lycra sheet" },
"description": "A sheet of synthetic fabric blended with stretchy lycra fibers, suitable for making flexible yet strong clothing.",
"name": { "str": "Lycra sheet" },
"description": "A sheet of synthetic fabric blended with stretchy Lycra fibers, suitable for making flexible yet strong clothing.",
"weight": "3 g",
"volume": "300 ml",
"price": 5000,

4
data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
View File

@ -216,8 +216,8 @@
"type": "general",
"context": "none",
"value": "asked",
"no": "Here in the center, Alonso is a bit lonely. We get a few brave, strong travellers like yourself, though, and seeing them brightens Alonso's day.",
"yes": "Could be better. I don't really got any friends here in the center, but seeing travellers like you always brightens my day."
"no": "Here in the center, Alonso is a bit lonely. We get a few brave, strong travelers like yourself, though, and seeing them brightens Alonso's day.",
"yes": "Could be better. I don't really got any friends here in the center, but seeing travelers like you always brightens my day."
},
"responses": [
{ "text": "What were you saying before?", "topic": "TALK_NONE" },

2
data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json
View File

@ -115,7 +115,7 @@
"dynamic_line": "It is nice to meet you too. To what do I owe the pleasure?",
"responses": [
{
"text": "I'm just a traveller, taking the chance to have some living human company. What's up in your life these days?",
"text": "I'm just a traveler, taking the chance to have some living human company. What's up in your life these days?",
"topic": "TALK_REFUGEE_Boris_2"
},
{ "text": "I just wanted to say hi. I'll be on my way.", "topic": "TALK_DONE" }

2
data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json
View File

@ -115,7 +115,7 @@
"id": "TALK_REFUGEE_Garry_1_firstmeet",
"dynamic_line": "Nice to meet you too. Are you staying here, or something?",
"responses": [
{ "text": "No, I'm a traveller. What's up with you?", "topic": "TALK_REFUGEE_Garry_2" },
{ "text": "No, I'm a traveler. What's up with you?", "topic": "TALK_REFUGEE_Garry_2" },
{ "text": "Nope, in fact I'm leaving right now.", "topic": "TALK_DONE" }
]
},

2
data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json
View File

@ -114,7 +114,7 @@
"id": "TALK_REFUGEE_Mangalpreet_1_firstmeet",
"dynamic_line": "Yes, I'm glad to meet you too. Will you be staying with us? I thought they were taking no more refugees.",
"responses": [
{ "text": "I'm a traveller actually. Just saying hello.", "topic": "TALK_REFUGEE_Mangalpreet_2" },
{ "text": "I'm a traveler actually. Just saying hello.", "topic": "TALK_REFUGEE_Mangalpreet_2" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
]
},

2
data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
View File

@ -166,7 +166,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Pablo_Background2_survivors",
"dynamic_line": "From the bus? A few of us made it in the end; the Singh family were on that bus with us. We were some of the last refugees to arrive. They put us into a room for processing, where a bunch of the wounded were being handled as best as they could manage. They were short staffed though, and they missed one. We all thought he was just having a nap, but he wasn't, and when he got back up as a zombie, there was a huge panic. Gunshots in a small, crowded room, and trampling… it was really ugly. We were close to the door and managed to get out right away, but then a couple panicking people closed the place off and left innocent people in there for what seemed like ages, calling it an 'outbreak'. By the time leveller heads prevailed, there weren't many people left in there to recover.",
"dynamic_line": "From the bus? A few of us made it in the end; the Singh family were on that bus with us. We were some of the last refugees to arrive. They put us into a room for processing, where a bunch of the wounded were being handled as best as they could manage. They were short staffed though, and they missed one. We all thought he was just having a nap, but he wasn't, and when he got back up as a zombie, there was a huge panic. Gunshots in a small, crowded room, and trampling… it was really ugly. We were close to the door and managed to get out right away, but then a couple panicking people closed the place off and left innocent people in there for what seemed like ages, calling it an 'outbreak'. By the time leveler heads prevailed, there weren't many people left in there to recover.",
"responses": [
{
"text": "I've been back to the quarantined area, cleared it out. It was ugly back there.",

2
data/json/player_activities.json
View File

@ -364,7 +364,7 @@
"id": "ACT_TRAVELLING",
"type": "activity_type",
"activity_level": "NO_EXERCISE",
"verb": "travelling",
"verb": "traveling",
"suspendable": false,
"based_on": "neither",
"no_resume": true

2
doc/JSON_INFO.md
View File

@ -1218,7 +1218,7 @@ Vehicle components when installed on a vehicle.
### Part Resistance
```C++
"all" : 0.0f, // Initial value of all resistances, overriden by more specific types
"all" : 0.0f, // Initial value of all resistances, overridden by more specific types
"physical" : 10, // Initial value for bash, cut and stab
"non_physical" : 10, // Initial value for acid, heat, cold, electricity and biological
"biological" : 0.2f, // Resistances to specific types. Those override the general ones.

8
src/activity_handlers.cpp
View File

@ -1282,7 +1282,7 @@ void activity_handlers::butcher_finish( player_activity *act, player *p )
// all action types - yields
butchery_drops_harvest( &corpse_item, *corpse, *p, roll_butchery, action, roll_drops );
// after this point, if there was a liquid handling from the harvest,
// and the liquid handling was interrupted, then the activity was cancelled,
// and the liquid handling was interrupted, then the activity was canceled,
// therefore operations on this activities targets and values may be invalidated.
// reveal hidden items / hidden content
if( action != F_DRESS && action != SKIN ) {
@ -2980,7 +2980,7 @@ void activity_handlers::drive_do_turn( player_activity *act, player *p )
}
p->moves = 0;
} else {
p->add_msg_if_player( m_info, _( "Auto-drive cancelled." ) );
p->add_msg_if_player( m_info, _( "Auto-drive canceled." ) );
if( !player_veh->omt_path.empty() ) {
player_veh->omt_path.clear();
}
@ -3594,7 +3594,7 @@ void activity_handlers::build_do_turn( player_activity *act, player *p )
p->disp_name() );
return;
}
// if you ( or NPC ) are finishing someone elses started construction...
// if you ( or NPC ) are finishing someone else's started construction...
const construction &built = pc->id.obj();
if( !p->has_trait( trait_DEBUG_HS ) && !p->meets_skill_requirements( built ) ) {
add_msg( m_info, _( "%s can't work on this construction anymore." ), p->disp_name() );
@ -3627,7 +3627,7 @@ void activity_handlers::build_do_turn( player_activity *act, player *p )
pc->counter = std::min( pc->counter, 10000000 );
// If construction_progress has reached 100% or more
if( pc->counter >= 10000000 ) {
// Activity is cancelled in complete_construction()
// Activity is canceled in complete_construction()
complete_construction( p );
}
}

4
src/activity_item_handling.cpp
View File

@ -736,7 +736,7 @@ void activity_on_turn_pickup()
if( !g->u.activity.coords.empty() && g->u.activity.coords.at( 0 ) != g->u.pos() ) {
g->u.cancel_activity();
if( g->u.is_player() ) {
g->u.add_msg_if_player( _( "Moving cancelled auto-pickup." ) );
g->u.add_msg_if_player( _( "Moving canceled auto-pickup." ) );
}
return;
}
@ -2864,7 +2864,7 @@ bool generic_multi_activity_handler( player_activity &act, player &p, bool check
std::unordered_set<tripoint> src_set = generic_multi_activity_locations( p, activity_to_restore );
// now we have our final set of points
std::vector<tripoint> src_sorted = get_sorted_tiles_by_distance( abspos, src_set );
// now loop through the work-spot tiles and judge whether its worth travelling to it yet
// now loop through the work-spot tiles and judge whether its worth traveling to it yet
// or if we need to fetch something first.
for( const tripoint &src : src_sorted ) {
const tripoint &src_loc = g->m.getlocal( src );

2
src/character.cpp
View File

@ -3380,7 +3380,7 @@ void Character::item_encumb( std::array<encumbrance_data, num_bp> &vals,
const_cast<Character *>( this )->position_to_wear_new_item( new_item );
}
// Track highest layer observed so far so we can penalise out-of-order
// Track highest layer observed so far so we can penalize out-of-order
// items
std::array<layer_level, num_bp> highest_layer_so_far;
std::fill( highest_layer_so_far.begin(), highest_layer_so_far.end(),

2
src/character.h
View File

@ -883,7 +883,7 @@ class Character : public Creature, public visitable<Character>
void update_fuel_storage( const itype_id &fuel );
/**Get stat bonus from bionic*/
int get_mod_stat_from_bionic( const Character::stat &Stat ) const;
// route for overmap-scale travelling
// route for overmap-scale traveling
std::vector<tripoint> omt_path;
/** Handles bionic effects over time of the entered bionic */

6
src/faction.cpp
View File

@ -509,9 +509,9 @@ int npc::faction_display( const catacurses::window &fac_w, const int width ) con
cata::optional<basecamp *> temp_camp = overmap_buffer.find_camp( dest->xy() );
if( temp_camp ) {
dest_camp = *temp_camp;
dest_string = _( "travelling to: " ) + dest_camp->camp_name();
dest_string = _( "traveling to: " ) + dest_camp->camp_name();
} else {
dest_string = string_format( _( "travelling to: (%d, %d)" ), dest->x, dest->y );
dest_string = string_format( _( "traveling to: (%d, %d)" ), dest->x, dest->y );
}
mission_string = _( "Current Mission: " ) + dest_string;
} else {
@ -548,7 +548,7 @@ int npc::faction_display( const catacurses::window &fac_w, const int width ) con
nc_color see_color;
bool u_has_radio = g->u.has_item_with_flag( "TWO_WAY_RADIO", true );
bool guy_has_radio = has_item_with_flag( "TWO_WAY_RADIO", true );
// TODO: NPCS on mission contactable same as travelling
// TODO: NPCS on mission contactable same as traveling
if( has_companion_mission() && mission != NPC_MISSION_TRAVELLING ) {
can_see = _( "Not interactable while on a mission" );
see_color = c_light_red;

8
src/faction_camp.cpp
View File

@ -173,10 +173,10 @@ std::map<std::string, miss_data> miss_info = {{
}
},
{
"travelling", {
"Travelling", to_translation( "Travelling" ),
to_translation( "Busy travelling!\n" ),
"Recall ally from travelling", to_translation( "Recall ally from travelling" )
"traveling", {
"Travelling", to_translation( "Traveling" ),
to_translation( "Busy traveling!\n" ),
"Recall ally from traveling", to_translation( "Recall ally from traveling" )
}
},
{

2
src/game.cpp
View File

@ -2552,7 +2552,7 @@ bool game::try_get_right_click_action( action_id &act, const tripoint &mouse_tar
if( cleared_destination ) {
// Produce no-op if auto-move had just been cleared on this action
// e.g. from a previous single left mouse click. This has the effect
// of right-click cancelling an auto-move before it is initiated.
// of right-click canceling an auto-move before it is initiated.
return false;
}

2
src/item_factory.cpp
View File

@ -1865,7 +1865,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std
slot.latent_heat = latent_heat / jo.get_tags( "material" ).size();
}
if( is_junkfood ) { // Junk food never gets old by default, but this can still be overriden.
if( is_junkfood ) { // Junk food never gets old by default, but this can still be overridden.
slot.monotony_penalty = 0;
}
assign( jo, "monotony_penalty", slot.monotony_penalty, strict );

8
src/iuse.cpp
View File

@ -2576,13 +2576,13 @@ static digging_moves_and_byproducts dig_pit_moves_and_byproducts( player *p, ite
//
// A shallow pit gets used to do things like build an improvised shelter or start
// the foundation for a wall, and is ostensibly a relatively quick effort: a
// survior might get a crude digging implement (e.g. digging stick) and attempt to
// survivor might get a crude digging implement (e.g. digging stick) and attempt to
// dig out the start of an improvised shelter, or they might have a proper shovel
// and be digging a foundation footing. Referencing the 2018 IBC
// https://codes.iccsafe.org/content/IRC2018/chapter-4-foundations we can see in
// R403.1.4 the requirement that "exterior footings shall be placed not less than
// 12 inches (305 mm) below the undisturbed ground surface. You'd need even more
// space for the actual footing, but that's close enough. I don't think surviviors
// space for the actual footing, but that's close enough. I don't think survivors
// care about building to code, but let's call it 12 inches (0.3048 meters) at the
// maximum for a shallow pit depth.
//
@ -2612,9 +2612,9 @@ static digging_moves_and_byproducts dig_pit_moves_and_byproducts( player *p, ite
// requiring saws to remove tree roots), using an appropriate (but manual)
// implement designed for the task (e.g. a shovel). The Canadian Centre for
// Occupational Health and Safety has some interesting recommendations on the rate
// of shovelling, weight of the load, and throw distance at
// of shoveling, weight of the load, and throw distance at
// https://www.ccohs.ca/oshanswers/ergonomics/shovel.html. Of particular interest
// is the table of "recommended workload for continuous shovelling", which gives a
// is the table of "recommended workload for continuous shoveling", which gives a
// weight per minute and a total weight per 15 minutes, as well as a description of
// the conditions. It also discusses the need to take breaks, for example
// alternating 15 minutes of shoveling and 15 minutes of rest in extreme

2
src/lightmap.cpp
View File

@ -1014,7 +1014,7 @@ void castLight( Out( &output_cache )[MAPSIZE_X][MAPSIZE_Y],
float away = start - ( -distance + 0.5f ) / ( -distance -
0.5f ); //The distance between our first leadingEdge and start
//We initialise delta.x to -distance adjusted so that the commented start < leadingEdge condition below is never false
//We initialize delta.x to -distance adjusted so that the commented start < leadingEdge condition below is never false
delta.x = -distance + std::max( static_cast<int>( ceil( away * ( -distance - 0.5f ) ) ),
0 );

12
src/list.h
View File

@ -203,7 +203,7 @@ template <class element_type, class element_allocator_type = std::allocator<elem
group_pointer_type last_endpoint_group, block_pointer, last_searched_group;
size_type size;
struct ebco_pair2 : allocator_type { // empty-base-class optimisation
struct ebco_pair2 : allocator_type { // empty-base-class optimization
size_type capacity; // Total element capacity of all initialized groups
explicit ebco_pair2( const size_type number_of_elements ) noexcept: capacity(
number_of_elements ) {}
@ -781,7 +781,7 @@ template <class element_type, class element_allocator_type = std::allocator<elem
}
inline LIST_FORCE_INLINE list_iterator &operator++() noexcept {
assert( node_pointer != nullptr ); // covers uninitialised list_iterator
assert( node_pointer != nullptr ); // covers uninitialized list_iterator
node_pointer = node_pointer->next;
return *this;
}
@ -793,7 +793,7 @@ template <class element_type, class element_allocator_type = std::allocator<elem
}
inline LIST_FORCE_INLINE list_iterator &operator--() noexcept {
assert( node_pointer != nullptr ); // covers uninitialised list_iterator
assert( node_pointer != nullptr ); // covers uninitialized list_iterator
node_pointer = node_pointer->previous;
return *this;
}
@ -885,7 +885,7 @@ template <class element_type, class element_allocator_type = std::allocator<elem
}
inline LIST_FORCE_INLINE list_reverse_iterator &operator++() noexcept {
assert( node_pointer != nullptr ); // covers uninitialised list_reverse_iterator
assert( node_pointer != nullptr ); // covers uninitialized list_reverse_iterator
node_pointer = node_pointer->previous;
return *this;
}
@ -962,11 +962,11 @@ template <class element_type, class element_allocator_type = std::allocator<elem
group_vector groups;
node_base end_node;
node_pointer_type
last_endpoint; // last_endpoint being NULL means no elements have been constructed, but there may still be groups available due to clear() or reservee()
last_endpoint; // last_endpoint being NULL means no elements have been constructed, but there may still be groups available due to clear() or reserve()
iterator end_iterator; // end_iterator is always the last entry point in last group in list (or one past the end of group)
iterator begin_iterator;
// Packaging the group allocator with least-used member variables, for empty-base-class optimisation
// Packaging the group allocator with least-used member variables, for empty-base-class optimization
struct ebco_pair1 : node_pointer_allocator_type {
size_type total_number_of_elements;
explicit ebco_pair1( const size_type total_num_elements ) noexcept: total_number_of_elements(

2
src/monmove.cpp
View File

@ -1582,7 +1582,7 @@ bool monster::move_to( const tripoint &p, bool force, bool step_on_critter,
factor = 1;
break;
}
// TODO: make this take terrain type into account so diggers travelling under sand will create mounds of sand etc.
// TODO: make this take terrain type into account so diggers traveling under sand will create mounds of sand etc.
if( one_in( factor ) ) {
g->m.ter_set( pos(), t_dirtmound );
}

2
src/npc.h
View File

@ -862,7 +862,7 @@ class npc : public player
bool is_hallucination() const override; // true if the NPC isn't actually real
// Ally of or travelling with p
// Ally of or traveling with p
bool is_friendly( const player &p ) const;
// Leading the player
bool is_leader() const;

2
src/npcmove.cpp
View File

@ -2820,7 +2820,7 @@ void npc::pick_up_item()
}
if( !rules.has_flag( ally_rule::allow_pick_up ) && is_player_ally() ) {
add_msg( m_debug, "%s::pick_up_item(); Cancelling on player's request", name );
add_msg( m_debug, "%s::pick_up_item(); Canceling on player's request", name );
fetching_item = false;
moves -= 1;
return;

2
src/overmap.h
View File

@ -515,7 +515,7 @@ std::string oter_no_dir( const oter_id &oter );
/**
* Return 0, 1, 2, 3 respectively if the suffix is _north, _west, _south, _east
* Return 0 if there's' no suffix
* Return 0 if there's no suffix
*/
int oter_get_rotation( const oter_id &oter );

2
src/overmap_ui.cpp
View File

@ -606,7 +606,7 @@ void draw( const catacurses::window &w, const catacurses::window &wbar, const tr
npc *npc_to_add = npc_to_get.get();
followers.push_back( npc_to_add );
}
// get all travelling NPCs for the debug menu to show pathfinding routes.
// get all traveling NPCs for the debug menu to show pathfinding routes.
for( auto &elem : overmap_buffer.get_npcs_near_player( 200 ) ) {
if( !elem ) {
continue;

2
src/player_activity.cpp
View File

@ -167,7 +167,7 @@ void player_activity::do_turn( player &p )
// it just sets a destination, clears the activity, then moves afterwards
// so set stamina -1 if that is the case
// to simulate that the next step will surely use up some stamina anyway
// this is to ensure that resting will occur when travelling overburdened
// this is to ensure that resting will occur when traveling overburdened
const int adjusted_stamina = travel_activity ? p.get_stamina() - 1 : p.get_stamina();
if( adjusted_stamina < previous_stamina && p.get_stamina() < p.get_stamina_max() / 3 ) {
if( one_in( 50 ) ) {

4
src/string_input_popup.h
View File

@ -103,7 +103,7 @@ class string_input_popup // NOLINT(cata-xy)
}
/**
* Set / get the text that can be modified by the user.
* Note that cancelling the query makes this an empty string.
* Note that canceling the query makes this an empty string.
* It's optional default is an empty string.
*/
/**@{*/
@ -252,7 +252,7 @@ class string_input_popup // NOLINT(cata-xy)
* Edit values in place. This combines: calls to @ref text to set the
* current value, @ref query to get user input and setting the
* value back into the parameter object (when the popup was not
* canceled). Cancelling the popup keeps the value unmodified.
* canceled). Canceling the popup keeps the value unmodified.
*/
/**@{*/
void edit( std::string &value );

2
src/ui.cpp
View File

@ -156,7 +156,7 @@ void uilist::init()
disabled_color = c_dark_gray; // disabled menu entry
allow_disabled = false; // disallow selecting disabled options
allow_anykey = false; // do not return on unbound keys
allow_cancel = true; // allow cancelling with "QUIT" action
allow_cancel = true; // allow canceling with "QUIT" action
allow_additional = false; // do not return on unhandled additional actions
hilight_full = true; // render hilight_color background over the entire line (minus padding)
hilight_disabled =

2
src/vehicle.cpp
View File

@ -2920,7 +2920,7 @@ std::vector<int> vehicle::all_parts_at_location( const std::string &location ) c
}
// another NPC probably removed a part in the time it took to walk here and start the activity.
// as the part index was first "chosen" before the NPC started travelling here.
// as the part index was first "chosen" before the NPC started traveling here.
// therefore the part index is now invalid shifted by one or two ( depending on how many other NPCs working on this vehicle )
// so loop over the part indexes in reverse order to get the next one down that matches the part type we wanted to remove
int vehicle::get_next_shifted_index( int original_index, player &p )

2
tests/catch/catch.hpp
View File

@ -2251,7 +2251,7 @@ namespace Catch {
{}
};
// Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
// Specialized comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
template<typename LhsT, typename RhsT>
auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
template<typename T>