0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2013-06-23 22:50:33 +02:00
commit d682f7e42a
110 changed files with 193 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file

@ -868,7 +868,7 @@
[else]
[message]
speaker=unit
message= _ "I don’t see any spiders, but the water is rising to the southeast as well. The river must have lead to more tunnels than we first thought."
message= _ "I don’t see any spiders, but the water is rising to the southeast as well. The river must have led to more tunnels than we first thought."
[/message]
[/else]
[/if]

4
src/about.cpp
View file

@ -231,7 +231,7 @@ void show_about(display &disp, const std::string &campaign)
int startline = 0;
//TODO: use values proportionnal to screen ?
//TODO: use values proportional to screen ?
// distance from top of map image to top of scrolling text
const int top_margin = 60;
// distance from bottom of scrolling text to bottom of map image
@ -270,7 +270,7 @@ void show_about(display &disp, const std::string &campaign)
int image_count = 0;
int scroll_speed = 4; // scroll_speed*50 = speed of scroll in pixel per second
// initialy redraw all
// Initially redraw all
bool redraw_mapimage = true;
int max_text_width = text_rect.w;

2
src/actions/attack.cpp
View file

@ -437,7 +437,7 @@ int battle_context::choose_defender_weapon(const unit &attacker,
// Multiple options:
// First pass : get the best weight and the minimum simple rating for this weight.
// simple rating = number of blows * damage per blows (resistance taken in account) * cth * weight
// Elligible attacks for defense should have a simple rating greater or equal to this weight.
// Eligible attacks for defense should have a simple rating greater or equal to this weight.
double max_weight = 0.0;
int min_rating = 0;

8
src/actions/move.cpp
View file

@ -294,7 +294,7 @@ namespace { // Private helpers for move_unit()
const map_location::DIRECTION orig_dir_;
const map_location goto_;
// This data tracks the current state as the move is in proress.
// This data tracks the current state as the move is in progress.
int current_side_;
team * current_team_; // Will default to the original team if the moving unit becomes invalid.
bool current_uses_fog_;
@ -1077,7 +1077,7 @@ namespace { // Private helpers for move_unit()
// Sighted units feedback?
if ( playing_team_is_viewing && (enemy_count_ != 0 || friend_count_ != 0) ) {
// Create the message to display (depends on whether firends,
// Create the message to display (depends on whether friends,
// enemies, or both were sighted, and on how many of each).
utils::string_map symbols;
symbols["enemies"] = lexical_cast<std::string>(enemy_count_);
@ -1135,8 +1135,8 @@ namespace { // Private helpers for move_unit()
* instruction. (The unit itself is whatever unit is at the beginning of the
* supplied path.)
*
* @param[in] steps The route to be travelled. The unit to be moved is at the beginning of this route.
* @param[out] move_recorder Will be given the route actually travelled (which might be shorter than the route specified) so it can be stored in the replay.
* @param[in] steps The route to be traveled. The unit to be moved is at the beginning of this route.
* @param[out] move_recorder Will be given the route actually traveled (which might be shorter than the route specified) so it can be stored in the replay.
* @param undo_stack If supplied, then either this movement will be added to the stack or the stack will be cleared.
* @param[in] continued_move If set to true, this is a continuation of an earlier move (movement is not interrupted should units be spotted).
* @param[in] show_move Controls whether or not the movement is animated for the player.

4
src/actions/undo.cpp
View file

@ -424,7 +424,7 @@ void undo_list::add_recruit(const unit& u, const map_location& loc,
/**
* Adds a shroud update to the undo stack.
* This is called from within commit_vision(), so there should be no need
* for this to be publically visible.
* for this to be publicly visible.
*/
void undo_list::add_update_shroud()
{
@ -661,7 +661,7 @@ bool undo_list::recruit_action::undo(int side, undo_list & /*undos*/)
current_team.set_action_bonus_count(current_team.action_bonus_count() - 1);
// invalidate before erasing allow us
// to also do the ovelerlapped hexes
// to also do the overlapped hexes
gui.invalidate(recruit_loc);
units.erase(recruit_loc);
return true;

4
src/actions/vision.cpp
View file

@ -172,7 +172,7 @@ shroud_clearer::shroud_clearer() : jamming_(), sightings_(), view_team_(NULL)
/**
* Destructor.
* The purpose of explictly defining this is so we can log an error if the
* The purpose of explicitly defining this is so we can log an error if the
* sighted events were neither fired nor explicitly ignored.
*/
shroud_clearer::~shroud_clearer()
@ -405,7 +405,7 @@ bool shroud_clearer::clear_unit(const map_location &view_loc,
move_unit_spectator * spectator, bool instant)
{
// This is just a translation to the more general interface. It is
// mot inlined so that vision.hpp does not have to include unit.hpp.
// not inlined so that vision.hpp does not have to include unit.hpp.
return clear_unit(view_loc, view_team, viewer.underlying_id(),
viewer.vision(), viewer.get_state(unit::STATE_SLOWED),
viewer.movement_type().get_vision(), viewer.get_location(),

2
src/addon/manager.hpp
View file

@ -63,7 +63,7 @@ std::vector<std::string> available_addons();
/** Retrieves the names of all installed add-ons. */
std::vector<std::string> installed_addons();
/** Chekc whether the specified add-on is currently installed. */
/** Check whether the specified add-on is currently installed. */
bool is_addon_installed(const std::string& addon_name);
/** Archives an add-on into a config object for campaignd transactions. */

2
src/addon/manager_ui.cpp
View file

@ -591,7 +591,7 @@ void show_addons_manager_dialog(display& disp, addons_client& client, addons_lis
filter_options.push_back(row);
// Now we enter information for list row display.
// Three fields are truncated to accomodate for GUI1's limitations.
// Three fields are truncated to accommodate for GUI1's limitations.
utils::ellipsis_truncate(display_author, 14);

10
src/ana/api/ana.hpp
View file

@ -77,7 +77,7 @@
/** @namespace ana
*
* Namespace for project ana, the entire API is under this namespce.
* Namespace for project ana, the entire API is under this namespace.
*/
namespace ana
{
@ -353,7 +353,7 @@ namespace ana
/**
* Send a buffer to every connected client.
*
* @param buffer : Buffer to be sent. Should be constucted with the buffer function.
* @param buffer : Buffer to be sent. Should be constructed with the buffer function.
* @param handler : Handler of events resulting from this operation. It will be called
* with _each_ event, meaning that it will be called exactly once
* for every connected client.
@ -377,7 +377,7 @@ namespace ana
/**
* Send a buffer to every connected client that satisfies a given condition/property.
*
* @param buffer : Buffer to be sent. Should be constucted with the buffer function.
* @param buffer : Buffer to be sent. Should be constructed with the buffer function.
* @param handler : Handler of events resulting from this operation. It will be called
* exactly once for every client that holds the property.
* @param send_type : Optional, type of the send operation. Defaults to COPY_BUFFER.
@ -402,7 +402,7 @@ namespace ana
* Send a buffer to every connected client except one.
* Equals a send_all if the client doesn't exist.
*
* @param buffer : Buffer to be sent. Should be constucted with the buffer function.
* @param buffer : Buffer to be sent. Should be constructed with the buffer function.
* @param handler : Handler of a possible event resulting from this operation.
* @param send_type : Optional, type of the send operation. Defaults to COPY_BUFFER.
*
@ -424,7 +424,7 @@ namespace ana
* Send a buffer to a connected client with a given net_id.
* Does nothing if no such client exists.
*
* @param buffer : Buffer to be sent. Should be constucted with the buffer function.
* @param buffer : Buffer to be sent. Should be constructed with the buffer function.
* @param handler : Handler of a possible event resulting from this operation.
* @param send_type : Optional, type of the send operation. Defaults to COPY_BUFFER.
*

2
src/ana/api/binary_streams.hpp
View file

@ -45,7 +45,7 @@
namespace ana
{
/**
* Module for object serialization and Marshalling.
* Module for object serialization and Marshaling.
*/
namespace serializer
{

2
src/ana/src/asio_server.cpp
View file

@ -71,7 +71,7 @@ asio_server::~asio_server()
thread_it = io_threads_.erase( thread_it );
}
/* Since the asio_client_proxy destuctor removes the client from client_proxies_
/* Since the asio_client_proxy destructor removes the client from client_proxies_
I'll just delete every proxy from a different list. */
std::list<client_proxy*> copy( client_proxies_ );

4
src/attack_prediction.cpp
View file

@ -1038,7 +1038,7 @@ combatant::combat_slice::combat_slice(const std::vector<double> src_summary[2],
/**
* Creates a slice from the sumaries, and associates a number of strikes.
* Creates a slice from the summaries, and associates a number of strikes.
* This version of the constructor creates a slice consisting of everything.
*/
combatant::combat_slice::combat_slice(const std::vector<double> src_summary[2],
@ -1158,7 +1158,7 @@ void forced_levelup(std::vector<double> &hp_dist)
void conditional_levelup(std::vector<double> &hp_dist, double kill_prob)
{
/* If we kill, we will level up. So then the damage we had becomes
less probable since it's now conditional on us not levelling up.
less probable since it's now conditional on us not leveling up.
This doesn't apply to the probability of us dying, of course. */
double scalefactor = 0;
const double chance_to_survive = 1 - hp_dist.front();

2
src/builder.hpp
View file

@ -277,7 +277,7 @@ public:
*/
struct tile
{
/** Contructor for the tile() structure */
/** Constructor for the tile() structure */
tile();
struct rule_image_rand;

2
src/clipboard.cpp
View file

@ -190,7 +190,7 @@ public:
This means we are forced to use CurrentTime in many spots and
are unable to perform many safety checks.
Hence, the code below is not compliant to the ICCCM, and
may ocassionally suffer from race conditions if an X client
may occasionally suffer from race conditions if an X client
is connected to the server over a slow/high-latency link.
This implementation is also very minimal.
The text is assumed to be reasonably small, as INCR transactions

2
src/color_range.hpp
View file

@ -45,7 +45,7 @@ bool string2rgb(const std::string& s, std::vector<Uint32>& result);
* (default: white)
* 3) The minimum shadow shade of a unit's team-color portions
* (default: black)
* 4) A plain high-contrast color, used for the markers on the mini-ma
* 4) A plain high-contrast color, used for the markers on the mini-map
* (default: same as the provided average shade, or gray #808080)
*
* The first three reference colors are used for converting a source palette

24
src/commandline_options.hpp
View file

@ -38,9 +38,9 @@ public:
boost::optional<std::string> bzip2;
/// Non-empty if --campaign was given on the command line. ID of the campaign we want to start.
boost::optional<std::string> campaign;
/// Non-empty if --campaign-difficulty was given on the command line. Numerical difficulty of the campaign to be played. Dependant on --campaign.
/// Non-empty if --campaign-difficulty was given on the command line. Numerical difficulty of the campaign to be played. Dependent on --campaign.
boost::optional<int> campaign_difficulty;
/// Non-empty if --campaign-scenario was given on the command line. Chooses starting scenario in the campaign to be played. Dependant on --campaign.
/// Non-empty if --campaign-scenario was given on the command line. Chooses starting scenario in the campaign to be played. Dependent on --campaign.
boost::optional<std::string> campaign_scenario;
/// True if --clock was given on the command line. Enables
bool clock;
@ -83,27 +83,27 @@ public:
boost::optional<std::string> logdomains;
/// True if --multiplayer was given on the command line. Goes directly into multiplayer mode.
bool multiplayer;
/// Non-empty if --ai-config was given on the command line. Vector of pairs (side number, value). Dependant on --multiplayer.
/// Non-empty if --ai-config was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string> > > multiplayer_ai_config;
/// Non-empty if --algorithm was given on the command line. Vector of pairs (side number, value). Dependant on --multiplayer.
/// Non-empty if --algorithm was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string> > > multiplayer_algorithm;
/// Non-empty if --controller was given on the command line. Vector of pairs (side number, controller). Dependant on --multiplayer.
/// Non-empty if --controller was given on the command line. Vector of pairs (side number, controller). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string> > > multiplayer_controller;
/// Non-empty if --era was given on the command line. Dependant on --multiplayer.
/// Non-empty if --era was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_era;
/// True if --exit-at-and was given on the command line. Dependant on --multiplayer.
/// True if --exit-at-and was given on the command line. Dependent on --multiplayer.
bool multiplayer_exit_at_end;
/// True if --ignore-map-settings was given at the command line. Do not use map settings.
bool multiplayer_ignore_map_settings;
/// Non-empty if --label was given on the command line. Dependant on --multiplayer.
/// Non-empty if --label was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_label;
/// Non-empty if --parm was given on the command line. Vector of pairs (side number, parm name, parm value). Dependant on --multiplayer.
/// Non-empty if --parm was given on the command line. Vector of pairs (side number, parm name, parm value). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string, std::string> > > multiplayer_parm;
/// Non-empty if --scenario was given on the command line. Dependant on --multiplayer.
/// Non-empty if --scenario was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_scenario;
/// Non-empty if --side was given on the command line. Vector of pairs (side number, faction id). Dependant on --multiplayer.
/// Non-empty if --side was given on the command line. Vector of pairs (side number, faction id). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string> > > multiplayer_side;
/// Non-empty if --turns was given on the command line. Dependant on --multiplayer.
/// Non-empty if --turns was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_turns;
/// Max FPS specified by --max-fps option.
boost::optional<int> max_fps;

8
src/config.cpp
View file

@ -135,7 +135,7 @@ config::attribute_value &config::attribute_value::operator=(long long v)
// We can store this as an int.
return *this = static_cast<int>(v);
// Getting to this point should be rare. (Currently, geting here means
// Getting to this point should be rare. (Currently, getting here means
// something like there was so much draining in a campaign that the
// total damage taken is not only negative, but so negative that an
// int cannot hold the value.) So rare that it is not worth precise
@ -178,8 +178,8 @@ config::attribute_value &config::attribute_value::operator=(double v)
namespace {
/**
* Attempts to convert @a source to the template type.
* This is to avoid "overzealous reinterpretation of certain WML strings as
* numeric tpyes" (c.f. bug #19201).
* This is to avoid "overzealous reinterpretations of certain WML strings as
* numeric types" (c.f. bug #19201).
* @returns true if the conversion was successful and the source string
* can be reobtained by streaming the result.
*/
@ -959,7 +959,7 @@ void config::clear()
}
} else {
//reached end of child map for this element - all child nodes
//have beed deleted, so it's safe to clear the map, delete the
//have been deleted, so it's safe to clear the map, delete the
//node and move up one level
state.c->children.clear();
if (state.c != this) delete state.c;

2
src/dialogs.cpp
View file

@ -993,7 +993,7 @@ std::string load_game_dialog(display& disp, const config& game_config, bool* sel
gui::dialog_button* change_difficulty_option = NULL;
if(select_difficulty != NULL) {
// implmentation of gui::dialog::add_option, needed for storing a pointer to the option-box
// implementation of gui::dialog::add_option, needed for storing a pointer to the option-box
change_difficulty_option = new gui::dialog_button(disp.video(), _("Change difficulty"), gui::button::TYPE_CHECK);
change_difficulty_option->set_check(false);

2
src/events.cpp
View file

@ -473,7 +473,7 @@ int pump_info::ticks(unsigned *refresh_counter, unsigned refresh_rate) {
#if SDL_VERSION_ATLEAST(2,0,0)
/* The contanstants for the minimum and maximum are picked from the headers. */
/* The constants for the minimum and maximum are picked from the headers. */
#define INPUT_MIN 0x200
#define INPUT_MAX 0x8FF

2
src/events.hpp
View file

@ -99,7 +99,7 @@ private:
};
class pump_monitor {
//pump_monitors receive notifcation after an events::pump() occurs
//pump_monitors receive notification after an events::pump() occurs
public:
pump_monitor();
virtual ~pump_monitor();

2
src/filesystem.cpp
View file

@ -1178,7 +1178,7 @@ std::string get_wml_location(const std::string &filename, const std::string &cur
else if (filename.size() >= 2 && filename[0] == '.' && filename[1] == '/')
{
// If the filename begins with a "./", look in the same directory
// as the file currrently being preprocessed.
// as the file currently being preprocessed.
result = current_dir + filename.substr(2);
}
else if (!game_config::path.empty())

2
src/filesystem.hpp
View file

@ -251,7 +251,7 @@ std::string get_independent_image_path(const std::string &filename);
* Returns the appropriate invocation for a Wesnoth-related binary, assuming
* that it is located in the same directory as the running wesnoth binary.
* This is just a string-transformation based on argv[0], so the returned
* program is not guaranteed to actaully exist. '-debug' variants are handled
* program is not guaranteed to actually exist. '-debug' variants are handled
* correctly.
*/
std::string get_program_invocation(const std::string &program_name);

14
src/floating_point_emulation.hpp
View file

@ -53,7 +53,7 @@
* FLOATING_POINT_EMULATION_TRACER_ENABLE
* This macro allows to place trace markers in the code. When using the markers
* it's possible to gather statistics regarding the code paths being executed.
* This can be used to analyse execution and add branch prediction markers.
* This can be used to analyze execution and add branch prediction markers.
*/
#ifndef FLOATING_POINT_EMULATION_HPP_INCLUDED
@ -351,9 +351,9 @@ struct tidiv<T, 8>
};
/**
* An optimised version of the division operator.
* An optimized version of the division operator.
*
* This version is optimised to maintain the highest numeric stability when
* This version is optimized to maintain the highest numeric stability when
* dividing.
*
* As documented at operator/():
@ -401,7 +401,7 @@ struct tidiv<T, 8>
* * divide.
* * shift the result up by the required number of bits.
*
* The code has some other optimisations as well. On a 2-complement system
* The code has some other optimizations as well. On a 2-complement system
* there are additional tests required for negative and positive values, to
* remove these branches, the code uses a temporary value which contains the
* positive value.
@ -737,7 +737,7 @@ public:
value_ *= rhs.value_;
/*
* There is no need to check the range at this point. The specialised
* There is no need to check the range at this point. The specialized
* version makes a short trip to 64-bit value, so overflowing is not
* possible.
*/
@ -790,7 +790,7 @@ public:
* ---- = --------- = ---- = result
* RHS rhs * sf rhs
*
* Thus in order to get RESULT there needs to be mulitplied by sf:
* Thus in order to get RESULT there needs to be multiplied by sf:
*
* THIS
* RESULT = ---- * sf
@ -975,7 +975,7 @@ operator!=(const double lhs, const tfloat<T, S> rhs)
/**
* Multiply
*
* Specialised for the Sint32 with a shift of 8.
* Specialized for the Sint32 with a shift of 8.
*
* Instead of figuring out the optimal shift before multiplying simply multiply
* as a 64-bit value and then perform the shift. This is rather cheap on the

4
src/font.cpp
View file

@ -128,7 +128,7 @@ struct char_block_map
}
/**
* Compresses map by merging consecutive ranges with the same font, even
* if there is some unassociated ranges inbetween.
* if there is some unassociated ranges in-between.
*/
void compress()
{
@ -970,7 +970,7 @@ surface floating_label::create_surface()
// combine foreground text with its background
if(bgalpha_ != 0) {
// background is a dark tootlip box
// background is a dark tooltip box
surface background = create_neutral_surface(foreground->w + border_*2, foreground->h + border_*2);
if (background == NULL) {

6
src/formula_tokenizer.cpp
View file

@ -51,7 +51,7 @@ token get_token(iterator& i1, iterator i2) {
TOKEN_TYPE t = TOKEN_IDENTIFIER;
//check if this string matches any keyword or an operator
//possible opearators and keywords:
//possible operators and keywords:
// d, or, def, and, not, fai, where, faiend, functions
if( diff == 1 ) {
if( *it == 'd' )
@ -125,7 +125,7 @@ token get_token(iterator& i1, iterator i2) {
if( *i1 >= '0' && *i1 <= '9' ) {
//do nothing
} else {
//look for '.' in case of decimal numer
//look for '.' in case of decimal number
if( *i1 == '.' ) {
//allow only one dot in such expression
if( !dot )
@ -145,7 +145,7 @@ token get_token(iterator& i1, iterator i2) {
} else {
//current character is between ':' and '@'
//possible tokens at this point that we are intersted with:
//possible tokens at this point that we are interested in:
// ; < = > <= >=
if( *i1 == ';' ) {

4
src/game_display.hpp
View file

@ -184,7 +184,7 @@ public:
/// Removes @a this from the fake_units_ list if necessary.
~fake_unit();
/// Place @a this on @a display's fake_units_ deque.
/// Place @a this on @a display's fake_units_ dequeue.
void place_on_game_display(game_display * d);
/// Removes @a this from whatever fake_units_ list it is on (if any).
int remove_from_game_display();
@ -198,7 +198,7 @@ public:
private:
/** Temporarily place a unit on map (moving: can overlap others).
* The temp unit is added at the end of the temporary unit deque,
* The temp unit is added at the end of the temporary unit dequeue,
* and therefore gets drawn last, over other units and temp units.
* Adding the same unit twice isn't allowed.
*/

8
src/game_events.cpp
View file

@ -226,7 +226,7 @@ static void fill_wml_messages_map(std::map<std::string, int>& msg_map, std::stri
}
/**
* Shows a summary of the errors encountered in WML thusfar,
* Shows a summary of the errors encountered in WML so far,
* to avoid a lot of the same messages to be shown.
* Identical messages are shown once, with (between braces)
* the number of times that message was encountered.
@ -289,7 +289,7 @@ typedef std::map<std::string, wml_handler_function> static_wml_action_map;
static static_wml_action_map static_wml_actions;
/**
* WML_HANDLER_FUNCTION macro handles auto registeration for wml handlers
* WML_HANDLER_FUNCTION macro handles auto registration for wml handlers
*
* @param pname wml tag name
* @param pei the variable name of game_events::queued_event object inside function
@ -1716,7 +1716,7 @@ WML_HANDLER_FUNCTION(role, /*event_info*/, cfg)
const bool has_any_types = !types.empty();
std::vector<std::string>::iterator ti = types.begin(),
ti_end = types.end();
// loop to give precendence based on type order
// loop to give precedence based on type order
do {
if (has_any_types) {
item["type"] = *ti;
@ -1741,7 +1741,7 @@ WML_HANDLER_FUNCTION(role, /*event_info*/, cfg)
player_ids.insert((resources::teams->begin() + (side_num - 1))->save_id());
}
}
// loop to give precendence based on type order
// loop to give precedence based on type order
std::vector<std::string>::iterator ti = types.begin();
do {
if (has_any_types) {

2
src/game_preferences.hpp
View file

@ -259,7 +259,7 @@ class acquaintance;
// that information about them are displayed to the user in the help
// system.
void encounter_start_units(unit_map& units);
// Add all units that are recallable as encountred units.
// Add all units that are recallable as encountered units.
void encounter_recallable_units(std::vector<team>& teams);
// Add all terrains on the map as encountered terrains.
void encounter_map_terrain(gamemap& map);

2
src/gui/auxiliary/canvas.cpp
View file

@ -918,7 +918,7 @@ public:
*
* @param cfg The config object to define the image see
* http://www.wesnoth.org/wiki/GUICanvasWML#Image
* for more infomation.
* for more information.
*/
explicit timage(const config& cfg);

2
src/gui/auxiliary/canvas.hpp
View file

@ -15,7 +15,7 @@
/**
* @file
* This file contains the canvas object which is the part where the widgets
* draw (tempory) images on.
* draw (temporally) images on.
*/
#ifndef GUI_AUXILIARY_CANVAS_HPP_INCLUDED

10
src/gui/auxiliary/event/dispatcher.hpp
View file

@ -248,7 +248,7 @@ public:
* * The buttons internal click handler is invoked and sets the handled
* flag
* * The callback installed by the user is in the same queue and gets
* exectuted afterwards.
* executed afterwards.
*
* A toggle button may or may not be toggled:
* * The user inserts a callback, that validates whether the action is
@ -276,10 +276,10 @@ public:
* widget->connect_signal<EVENT_ID>(
* boost::bind(&tmy_dialog::my_member, this));
* This allows simply adding a member of a dialog to be used as a callback
* for widget without a lot of magic. Note most widgets probaly will get a
* for widget without a lot of magic. Note most widgets probably will get a
* callback like
* connect_signal_mouse_left_click(const tsignal_function& callback)
* which hides this function for the avarage use.
* which hides this function for the average use.
*
* @tparam E The event the callback needs to react to.
* @param signal The callback function.
@ -472,10 +472,10 @@ public:
/**
* The behavior of the mouse events.
*
* Normally for mouse events there's first cheched whether a dispatcher has
* Normally for mouse events there's first checked whether a dispatcher has
* captured the mouse if so it gets the event.
* If not the dispatcher is searched from the back to the front in the
* layers and it's behavious is checked.
* layers and its behavior is checked.
* * none The event is never send to the layer and goes on the the next
* layer. This is used for tooltips who might cover a button but a click
* on the tooltips should still click the button.

2
src/gui/auxiliary/event/dispatcher_private.hpp
View file

@ -138,7 +138,7 @@ struct tdispatcher_implementation
* It tests for both the event and the event_type send in the
* constructor.
*
* @tparam T A key from an event set used to instanciate
* @tparam T A key from an event set used to instantiate
* the proper @p event_signal function.
* @param event The event to get the signal for.
*

2
src/gui/auxiliary/event/distributor.cpp
View file

@ -611,7 +611,7 @@ template<
#define LOG_HEADER "distributor mouse motion [" << owner_.id() << "]: "
/**
* @todo Test wehether the state is properly tracked when an input blocker is
* @todo Test whether the state is properly tracked when an input blocker is
* used.
*/
tdistributor::tdistributor(twidget& owner

10
src/gui/auxiliary/event/distributor.hpp
View file

@ -20,9 +20,9 @@
* Contains the event distributor.
*
* The event distributor exists of several classes which are combined in one
* templated tdistributor class. The classes are closly tight together.
* templated tdistributor class. The classes are closely tight together.
*
* All classes have direct access to eachothers members since they should act
* All classes have direct access to each others members since they should act
* as one. (Since the buttons are a templated subclass it's not possible to use
* private subclasses.)
*
@ -31,7 +31,7 @@
*
* The tmouse_button classes are templated classes per mouse button, the
* template parameters are used to make the difference between the mouse
* buttons. Althought it's easily possible to add more mouse buttons in the
* buttons. Although it's easily possible to add more mouse buttons in the
* code several places only expect a left, middle and right button.
*
* tdistributor is the main class to be used in the user code. This class
@ -279,7 +279,7 @@ public:
void keyboard_add_to_chain(twidget* widget);
/**
* Remove the widget from the keyborad chain.
* Remove the widget from the keyboard chain.
*
* @param widget The widget to be removed from the chain.
*/
@ -310,7 +310,7 @@ private:
/**
* Fall back keyboard focus_ items.
*
* When the focussed widget didn't handle the keyboard event (or no handler
* When the focused widget didn't handle the keyboard event (or no handler
* for the keyboard focus_) it is send all widgets in this vector. The order
* is from rbegin() to rend(). If the keyboard_focus_ is in the vector it
* won't get the event twice. The first item added to the vector should be

14
src/gui/auxiliary/event/handler.hpp
View file

@ -64,18 +64,18 @@ enum tevent {
, SDL_LEFT_BUTTON_DOWN /**< A SDL left mouse button down event. */
, SDL_LEFT_BUTTON_UP /**< A SDL left mouse button up event. */
, LEFT_BUTTON_DOWN /**<
* A left mouse button down event for a wiget.
* A left mouse button down event for a widget.
*/
, LEFT_BUTTON_UP /**<
* A left mouse button up event for a wiget.
* A left mouse button up event for a widget.
*/
, LEFT_BUTTON_CLICK /**<
* A left mouse button click event for a
* wiget.
* widget.
*/
, LEFT_BUTTON_DOUBLE_CLICK /**<
* A left mouse button double click event for
* a wiget.
* a widget.
*/
, SDL_MIDDLE_BUTTON_DOWN /**< A SDL middle mouse button down event. */
, SDL_MIDDLE_BUTTON_UP /**< A SDL middle mouse button up event. */
@ -140,7 +140,7 @@ enum tevent {
, REQUEST_PLACEMENT /**<
* Request for somebody to place the widget.
* This may also cause updating of more
* layoyt parts.
* layout parts.
*/
};
@ -153,7 +153,7 @@ enum tevent {
*
* This version is for callbacks without extra parameters.
* NOTE some mouse functions like MOUSE_ENTER don't send the mouse coordinates
* to the callback function so they are also in this catagory.
* to the callback function so they are also in this category.
*/
typedef
boost::mpl::set<
@ -217,7 +217,7 @@ typedef
* Helper for catching use error of tdispatcher::connect_signal.
*
* This version is for callbacks with a sender aka notification messages. Like the
* onces in tset_event it has no extra parameters, but this version is only
* ones in tset_event it has no extra parameters, but this version is only
* send to the target and not using the pre and post queue.
*/
typedef

2
src/gui/auxiliary/formula.hpp
View file

@ -105,7 +105,7 @@ private:
T execute(const game_logic::map_formula_callable& variables) const;
/**
* Contains the formuale for the variable.
* Contains the formula for the variable.
*
* If the string is empty, there's no formula.
*/

2
src/gui/auxiliary/iterator/iterator.cpp
View file

@ -115,7 +115,7 @@ namespace iterator {
*
* When the iterator is created the iterator tries to go down all the child
* widgets to get at the bottom level. That widget will be visited first. Then
* it will first visit all sibblings before going up the the next layer.
* it will first visit all siblings before going up the the next layer.
*
* @todo Write the entire visiting algorithm.
*

2
src/gui/auxiliary/iterator/iterator.hpp
View file

@ -41,7 +41,7 @@ class titerator
public:
/**
* Contstructor.
* Constructor.
*
* @param root The widget where to start the iteration.
*/

2
src/gui/auxiliary/iterator/policy_order.hpp
View file

@ -190,7 +190,7 @@ public:
return *tvisit_child::get(*root_);
}
ERR_GUI_I << "The iterator ended in an unknown "
"state while deferring iteself.\n";
"state while deferring itself.\n";
throw tlogic_error("Tried to defer an invalid iterator.");
}

2
src/gui/auxiliary/notifier.hpp
View file

@ -71,7 +71,7 @@ public:
}
/**
* Disonnects a callback.
* Disconnects a callback.
*
* @param notifiee The notifiee controlling the lifetime of
* the callback. Uses since its address is an

2
src/gui/auxiliary/placer/vertical_list.hpp
View file

@ -59,7 +59,7 @@ public:
private:
/**
* The maximum number of colums to use.
* The maximum number of columns to use.
*
* This value is determined by the @p parallel_items parameter of
* @ref tplacer_::build).

2
src/gui/auxiliary/widget_definition/stacked_widget.cpp
View file

@ -40,7 +40,7 @@ tstacked_widget_definition::tresolution::tresolution(const config& cfg)
*
* == Stacked widget ==
*
* A stacked widget holds several widgets on top of eachother. This can be used
* A stacked widget holds several widgets on top of each other. This can be used
* for various effects; add an optional overlay to an image, stack it with a
* spacer to force a minimum size of a widget. The latter is handy to avoid
* making a separate definition for a single instance with a fixed size.

2
src/gui/auxiliary/window_builder.hpp
View file

@ -108,7 +108,7 @@ tbuilder_widget_ptr create_builder_widget(const config& cfg);
* Mainly used as functor for @ref register_builder_widget.
*
* @param cfg The config with the information to
* instanciate the widget.
* Instantiate the widget.
*
* @returns A generic widget builder pointer.
*/

2
src/gui/auxiliary/window_builder/control.hpp
View file

@ -34,7 +34,7 @@ public:
twidget* build(const treplacements& replacements) const;
/** @deprecated The control can initalise itself. */
/** @deprecated The control can initialize itself. */
void init_control(tcontrol* control) const;
/** Parameters for the control. */

2
src/gui/auxiliary/window_builder/instance.hpp
View file

@ -36,7 +36,7 @@ struct tbuilder_instance
* Holds a copy of the cfg parameter in the constructor.
*
* This is used when instantiating a spacer, it can still use the
* parameters orginally sent.
* parameters originally sent.
*/
config configuration;
};

2
src/gui/auxiliary/window_builder/tree_view.cpp
View file

@ -49,7 +49,7 @@ twidget* tbuilder_tree_view::build() const
{
/*
* TODO see how much we can move in the constructor instead of
* builing in several steps.
* building in several steps.
*/
ttree_view *widget = new ttree_view(nodes);

2
src/gui/dialogs/addon_connect.cpp
View file

@ -40,7 +40,7 @@ namespace gui2 {
* This text contains the name of the server to connect to. $
*
* show_help & & button & m &
* Thus button shows the in-game help about add-ons maangement when triggered. $
* Thus button shows the in-game help about add-ons management when triggered. $
*
* & 2 & button & o &
* This button closes the dialog to display a dialog for removing installed add-ons. $

2
src/gui/dialogs/campaign_difficulty.hpp
View file

@ -30,7 +30,7 @@ public:
/**
* Returns the selected item index after displaying.
* @return -1 if the dialog was cancelled.
* @return -1 if the dialog was canceled.
*/
int selected_index() const { return index_; }

2
src/gui/dialogs/dialog.cpp
View file

@ -50,7 +50,7 @@ bool tdialog::show(CVideo& video, const unsigned auto_close_time)
retval_ = window->show(restore_, auto_close_time);
/*
* It can happen that when two clicks follow eachother fast that the event
* It can happen that when two clicks follow each other fast that the event
* handling code in events.cpp generates a DOUBLE_CLICK_EVENT. For some
* reason it can happen that this event gets pushed in the queue when the
* window is shown, but processed after the window is closed. This causes

6
src/gui/dialogs/edit_label.hpp
View file

@ -27,15 +27,15 @@ public:
*
* @param label [in] The initial value of the label.
* @param label [out] The label text the user entered if the dialog
* returns @ref twindow::OK undefined otherise.
* returns @ref twindow::OK undefined otherwise.
* @param team_only [in] The initial value of the team only toggle.
* @param team_only [out] The final value of the team only toggle if the
* dialog returns @ref twindow::OK undefined
* otherise.
* otherwise.
*/
tedit_label(std::string& label, bool& team_only);
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(std::string& label, bool& team_only, CVideo& video)
{
return tedit_label(label, team_only).show(video);

6
src/gui/dialogs/editor/editor_edit_label.hpp
View file

@ -28,15 +28,15 @@ public:
*
* @param[in] text The initial value of the label.
* @param[out] text The label text the user entered if the dialog
* returns @ref twindow::OK undefined otherise.
* returns @ref twindow::OK undefined otherwise.
* @param[in] team_only The initial value of the team only toggle.
* @param[out] team_only The final value of the team only toggle if the
* dialog returns @ref twindow::OK undefined
* otherise.
* otherwise.
*/
teditor_edit_label(std::string& text, bool& immutable, bool& visible_fog, bool& visible_shroud);
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(std::string& text, bool& immutable, bool& visible_fog, bool& visible_shroud, CVideo& video)
{
return teditor_edit_label(text, immutable, visible_fog, visible_shroud).show(video);

2
src/gui/dialogs/editor_new_map.hpp
View file

@ -35,7 +35,7 @@ public:
*/
teditor_new_map(int& width, int& height);
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(int& width, int& height, CVideo& video)
{
return teditor_new_map(width, height).show(video);

2
src/gui/dialogs/editor_resize_map.hpp
View file

@ -65,7 +65,7 @@ public:
, EXPAND_DIRECTION& expand_direction
, bool& copy_edge_terrain);
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(
int& width
, int& height

2
src/gui/dialogs/folder_create.hpp
View file

@ -31,7 +31,7 @@ public:
*/
tfolder_create(std::string& folder_name);
/** The excute function; see @ref tdialog for more information. */
/** The execute function; see @ref tdialog for more information. */
static bool execute(std::string& folder_name, CVideo& video)
{
return tfolder_create(folder_name).show(video);

2
src/gui/dialogs/game_delete.hpp
View file

@ -26,7 +26,7 @@ public:
tgame_delete();
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(CVideo& video)
{
return tgame_delete().show(video);

2
src/gui/dialogs/lobby/lobby_data.hpp
View file

@ -23,7 +23,7 @@
class config;
/** This class represenst a single stored chat message */
/** This class represents a single stored chat message */
struct chat_message
{
/** Create a chat message */

4
src/gui/dialogs/lobby_main.cpp
View file

@ -612,7 +612,7 @@ void tlobby_main::update_gamelist_diff()
return;
}
if (game.display_status == game_info::UPDATED) {
LOG_LB << "Modyfying game in listbox " << game.id << " (row " << list_i << ")\n";
LOG_LB << "Modifying game in listbox " << game.id << " (row " << list_i << ")\n";
tgrid* grid = gamelistbox_->get_row_grid(list_i);
modify_grid_with_data(grid, make_game_row_data(game));
adjust_game_row_contents(game, list_i, grid);
@ -1755,7 +1755,7 @@ void tlobby_main::user_dialog_callback(user_info* info)
selected_game_id_ = info->game_id;
//the commented out code below should be enough, but that'd delete the
//playerlist and the widget calling this callback, so instead the game
//will be selected on the netxt gamelist update.
//will be selected on the next gamelist update.
/*
if (info->game_id != 0) {
for (unsigned i = 0; i < lobby_info_.games_filtered().size(); ++i) {

2
src/gui/dialogs/lobby_main.hpp
View file

@ -283,7 +283,7 @@ private:
/**
* Assemble and send a game join request. Ask for password if the game
* requires one.
* @return true iif the request was actually sent, false if not for some
* @return true iff the request was actually sent, false if not for some
* reason like user canceled the password dialog or idx was invalid.
*/
bool do_game_join(int idx, bool observe);

2
src/gui/dialogs/mp_cmd_wrapper.cpp
View file

@ -119,7 +119,7 @@ void tmp_cmd_wrapper::pre_show(CVideo& /*video*/, twindow& window)
/**
* @todo Not really happy with the retval code in general. Need to give it
* some more thought. Therefore seperated the set_retval from the
* some more thought. Therefore separated the set_retval from the
* set_active code.
*/
if(tbutton* b = find_widget<tbutton>(&window, "add_friend", false, false)) {

2
src/gui/dialogs/mp_create_game.hpp
View file

@ -44,7 +44,7 @@ private:
/**
* All fields are also in the normal field vector, but they need to be
* manually controled as well so add the pointers here as well.
* manually controlled as well so add the pointers here as well.
*/
tfield_bool

2
src/gui/dialogs/mp_host_game_prompt.hpp
View file

@ -27,7 +27,7 @@ public:
tmp_host_game_prompt();
/** The excute function see @ref tdialog for more information. */
/** The execute function see @ref tdialog for more information. */
static bool execute(CVideo& video)
{
return tmp_host_game_prompt().show(video);

2
src/gui/dialogs/network_transmission.hpp
View file

@ -72,7 +72,7 @@ private:
/**
* The subtitle for the dialog.
*
* This field commenly shows the action in progress eg connecting,
* This field commonly shows the action in progress eg connecting,
* uploading, downloading etc..
*/
std::string subtitle_;

4
src/gui/dialogs/popup.hpp
View file

@ -59,11 +59,11 @@ public:
* upon.
* @param allow_interaction Does the dialog allow interaction?
* * true a non modal window is shown
* * false a tooltip windw is shown
* * false a tooltip window is shown
* @param auto_close_time The time in ms after which the dialog will
* automatically close, if 0 it doesn't close.
* @note the timeout is a minimum time and
* there's no quarantee about how fast it closes
* there's no guarantee about how fast it closes
* after the minimum.
*/
void show(CVideo& video

2
src/gui/dialogs/simple_item_selector.hpp
View file

@ -36,7 +36,7 @@ public:
/**
* Returns the selected item index after displaying.
* @return -1 if the dialog was cancelled.
* @return -1 if the dialog was canceled.
*/
int selected_index() const { return index_; }

2
src/gui/dialogs/tip.cpp
View file

@ -130,7 +130,7 @@ static ttip& tip()
{
/*
* Allocating a static tip object causes a segmentation fault when Wesnoth
* termines. So instead create an object on the heap and never free it.
* terminates. So instead create an object on the heap and never free it.
*/
static ttip *t = new ttip();
return *t;

2
src/gui/dialogs/unit_attack.cpp
View file

@ -48,7 +48,7 @@ namespace gui2 {
* defender_name & & control & o & Shows the name of the defending unit. $
*
*
* weapon_list & & listbox & m & The list with weapons to choos from. $
* weapon_list & & listbox & m & The list with weapons to choose from. $
* -attacker_weapon & & control & o & The weapon for the attacker to use. $
* -defender_weapon & & control & o & The weapon for the defender to use. $
*

2
src/gui/dialogs/unit_create.cpp
View file

@ -171,7 +171,7 @@ void tunit_create::gender_toggle_callback(twindow& window)
ttoggle_button& female_toggle = find_widget<ttoggle_button>(
&window, "female_toggle", false);
// Ye olde ugly hack for the lack of radio buttons.
// TODO Ye olde ugly hack for the lack of radio buttons.
if(gender_ == unit_race::MALE) {
gender_ = female_toggle.get_value() ? unit_race::FEMALE : unit_race::MALE;

2
src/gui/dialogs/wml_message.cpp
View file

@ -120,7 +120,7 @@ void twml_message_::pre_show(CVideo& /*video*/, twindow& window)
options.add_row(data);
}
// Avoid negetive and 0 since item 0 is already selected.
// Avoid negative and 0 since item 0 is already selected.
if(*chosen_option_ > 0
&& static_cast<size_t>(*chosen_option_)
< option_list_.size()) {

4
src/gui/lib/types/point.hpp
View file

@ -27,10 +27,10 @@ struct tpoint
y(y_)
{}
/** x coodinate. */
/** x coordinate. */
int x;
/** y coodinate. */
/** y coordinate. */
int y;
bool operator==(const tpoint& point) const { return x == point.x && y == point.y; }

8
src/gui/widgets/control.hpp
View file

@ -94,7 +94,7 @@ public:
/**
* See @ref twidget::disable_click_dismiss.
*
* The default behavious is that a widget blocks easy close, if not it
* The default behavior is that a widget blocks easy close, if not it
* should override this function.
*/
bool disable_click_dismiss() const OVERRIDE;
@ -333,7 +333,7 @@ private:
* Contains the pointer to the configuration.
*
* Every control has a definition of how it should look, this contains a
* pointer to the definition. The definition is resolution dependant, where
* pointer to the definition. The definition is resolution dependent, where
* the resolution is the size of the Wesnoth application window. Depending
* on the resolution widgets can look different, use different fonts.
* Windows can use extra scrollbars use abbreviations as text etc.
@ -341,7 +341,7 @@ private:
tresolution_definition_ptr config_;
/**
* Load class dependant config settings.
* Load class dependent config settings.
*
* load_config will call this method after loading the config, by default it
* does nothing but classes can override it to implement custom behavior.
@ -397,7 +397,7 @@ private:
* Initializes the control.
*
* Not everything can be code in the constructor since virtual functions
* can't be used. So after contruction this function needs to be called and
* can't be used. So after construction this function needs to be called and
* only once, this happens when set_definition is called.
*/
virtual void init() {}

10
src/gui/widgets/debug.cpp
View file

@ -50,7 +50,7 @@ std::string get_child_id(
const std::string& parent_id, const unsigned row, const unsigned col)
{
// Originally used this formatter function but it managed to return empty
// trings. No idea why so switched to using the good old lexical_cast
// strings. No idea why so switched to using the good old lexical_cast
// instead.
// return (formatter() << parent_id << "_C_" << row << '_' << col).c_str();
std::string result = parent_id + "_C_"
@ -123,7 +123,7 @@ void tdebug_layout_graph::set_level(const std::string& level)
FOREACH(const AUTO& param, params) {
if(param == "all") {
level_ = ALL;
// No need to look further eventhought invalid items are now
// No need to look further eventhough invalid items are now
// ignored.
return;
} else if(param == "size") {
@ -131,7 +131,7 @@ void tdebug_layout_graph::set_level(const std::string& level)
} else if(param == "state") {
level_ |= STATE_INFO;
} else {
// loging might not be up yet.
// logging might not be up yet.
std::cerr << "Unknown level '" << param << "' is ignored.\n";
}
}
@ -150,7 +150,7 @@ void tdebug_layout_graph::set_domain(const std::string& domain)
FOREACH(const AUTO& param, params) {
if(param == "all") {
domain_ = ALL;
// No need to look further eventhought invalid items are now
// No need to look further eventhough invalid items are now
// ignored.
return;
} else if(param == "show") {
@ -158,7 +158,7 @@ void tdebug_layout_graph::set_domain(const std::string& domain)
} else if(param == "layout") {
domain_ |= LAYOUT;
} else {
// loging might not be up yet.
// logging might not be up yet.
std::cerr << "Unknown domain '" << param << "' is ignored.\n";
}
}

2
src/gui/widgets/debug.hpp
View file

@ -32,7 +32,7 @@ class twindow;
*
* The class will generate .dot files in the location where wesnoth is running
* (so needs write access there). These files can be converted to images
* containing the graphs. This is used for debugging the widget libary and its
* containing the graphs. This is used for debugging the widget library and its
* sizing algorithm.
*
* This class needs to be friends with a lot of classes so it can view the

2
src/gui/widgets/generator.cpp
View file

@ -395,7 +395,7 @@ void tvertical_list::set_visible_rectangle(const SDL_Rect& rectangle)
{
/*
* Note for most implementations this function could work only for the
* tindependent class it probably fails. Evalute to make a generic
* tindependent class it probably fails. Evaluate to make a generic
* function in the tgenerator template class and call it from the wanted
* placement functions.
*/

2
src/gui/widgets/generator.hpp
View file

@ -124,7 +124,7 @@ public:
* Returns the selected item.
*
* If a list has multiple selected items it looks whether it knows the last
* item acutally selected, if that item is selected that one is chosen.
* item actually selected, if that item is selected that one is chosen.
* Else is goes through all selected items and returns the first one
* selected.
*

2
src/gui/widgets/generator_private.hpp
View file

@ -407,7 +407,7 @@ struct tmatrix
};
/**
* Places the items independent of eachother.
* Places the items independent of each other.
*
* This is mainly meant for when only one item is shown at the same time.
*

4
src/gui/widgets/grid.cpp
View file

@ -321,7 +321,7 @@ void tgrid::request_reduce_height(const unsigned maximum_height)
* @todo Improve this code.
*
* Now we try every item to be reduced, maybe items need a flag whether
* or not to try to reduce and also eveluate whether the force
* or not to try to reduce and also evaluate whether the force
* reduction is still needed.
*/
if(too_high - reduced >= row_height_[row]) {
@ -1218,7 +1218,7 @@ void set_single_child(tgrid& grid, twidget* widget)
* = Praxis =
*
* This is the code needed to create the skeleton for the structure the extra
* flags are ommitted.
* flags are omitted.
*
* [grid]
* [row]

8
src/gui/widgets/grid.hpp
View file

@ -23,7 +23,7 @@ namespace gui2 {
* Base container class.
*
* This class holds a number of widgets and their wanted layout parameters. It
* also layouts the items in the grid and hanldes their drawing.
* also layouts the items in the grid and handles their drawing.
*/
class tgrid
: public twidget
@ -62,7 +62,7 @@ public:
/***** ***** ***** ***** ROW COLUMN MANIPULATION ***** ***** ***** *****/
/**
* Addes a row to end of the grid.
* Adds a row to end of the grid.
*
* @param count Number of rows to add, should be > 0.
*
@ -121,7 +121,7 @@ public:
const unsigned col, const unsigned flags, const unsigned border_size);
/**
* Exchangs a child in the grid.
* Exchanges a child in the grid.
*
* It replaced the child with a certain id with the new widget but doesn't
* touch the other settings of the child.
@ -304,7 +304,7 @@ private:
border_size_(0),
widget_(NULL)
// Fixme make a class wo we can store some properties in the cache
// Fixme make a class where we can store some properties in the cache
// regarding size etc.
{}

2
src/gui/widgets/helper.hpp
View file

@ -146,7 +146,7 @@ std::string debug_truncate(const std::string& text);
/**
* Helper for function wrappers.
*
* For boost bind the a function sometimes needs to return a value althought
* For boost bind the a function sometimes needs to return a value although
* the function called doesn't return one. This wrapper function can return a
* fixed result for a certain functor.
*

2
src/gui/widgets/list.cpp
View file

@ -287,7 +287,7 @@ void tlist::place(const tpoint& origin, const tpoint& size)
/**
* @todo Work-around to set the selected item visible again.
*
* At the moment the listes and dialogs in general are resized a lot as
* At the moment the lists and dialogs in general are resized a lot as
* work-around for sizing. So this function makes the selected item in view
* again. It doesn't work great in all cases but the proper fix is to avoid
* resizing dialogs a lot. Need more work later on.

2
src/gui/widgets/listbox.hpp
View file

@ -233,7 +233,7 @@ private:
/**
* @todo A listbox must have the following config parameters in the
* instanciation:
* instantiation:
* - fixed row height?
* - fixed column width?
* and if so the following ways to set them

8
src/help.cpp
View file

@ -843,7 +843,7 @@ help_manager::~help_manager()
// map = NULL;
toplevel.clear();
hidden_sections.clear();
// These last numbers must be reset so that the content is regenreated.
// These last numbers must be reset so that the content is regenerated.
// Upon next start.
last_num_encountered_units = -1;
last_num_encountered_terrains = -1;
@ -1466,7 +1466,7 @@ public:
ss << "\n";
}
// Print the extra AMLA upgrage abilities, cross-reference them
// Print the extra AMLA upgrade abilities, cross-reference them
// to their respective topics.
if (!type_.adv_abilities().empty()) {
ss << _("Ability Upgrades: ");
@ -2194,7 +2194,7 @@ int help_menu::process()
int x = mousex - menu::location().x;
const std::string icon_img = expanded(*sec) ? open_section_img : closed_section_img;
// we remove the right tickness (ne present bewteen icon and text)
// we remove the right thickness (ne present between icon and text)
int text_start = style_->item_size(indented_icon(icon_img, sec->level)).w - style_->get_thickness();
// NOTE: if you want to forbid click to the left of the icon
@ -2406,7 +2406,7 @@ void help_text_area::handle_ref_cfg(const config &cfg)
// terrains. This will lead to the unit page generator creating
// invalid references.
//
// Disabling this is a kludgy workaround until the
// Disabling this is a kludgey workaround until the
// encountered_terrains system is fixed
//
// -- Ayin apr 8 2005

2
src/help.hpp
View file

@ -40,7 +40,7 @@ void show_help(display &disp, const section &toplevel, const std::string& show_t
/// will be shown if show_topic is the empty string.
void show_help(display &disp, const std::string& show_topic="", int xloc=-1, int yloc=-1);
/// wrapper to add unit prefix and hidding symbol
/// wrapper to add unit prefix and hiding symbol
void show_unit_help(display &disp, const std::string& unit_id, bool hidden = false,
int xloc=-1, int yloc=-1);

2
src/image_modifications.cpp
View file

@ -867,7 +867,7 @@ REGISTER_MOD_PARSER(O, args)
}
//
// ~R(), ~G() and ~B() are the children of ~CS(). Merely syntatic sugar.
// ~R(), ~G() and ~B() are the children of ~CS(). Merely syntactic sugar.
// Hence they are at the end of the evaluation.
//
// Red component color-shift

2
src/language.hpp
View file

@ -86,7 +86,7 @@ const language_def& get_locale();
/** Initializes the list of textdomains from a configuration object */
void init_textdomains(const config& cfg);
/** Initializes certain english strings */
/** Initializes certain English strings */
bool init_strings(const config& cfg);
bool load_language_list();

2
src/lexical_cast.hpp
View file

@ -137,7 +137,7 @@ struct tlexical_cast
* Specialized conversion class.
*
* Specialized for returning strings from an integral type or a pointer to an
* intergral type.
* integral type.
*/
template <typename From>
struct tlexical_cast<

2
src/lua_jailbreak_exception.cpp
View file

@ -40,7 +40,7 @@ void tlua_jailbreak_exception::rethrow()
/*
* We need to call tlua_jailbreak_exception::clear() after the exception
* is thrown. The most straightforward approach would be a small helper
* class calling clear in its destructor, but alas g++ then compains about
* class calling clear in its destructor, but alas g++ then complains about
* an unused variable. Since we're sure there will be something thrown use
* that fact to make sure the the function is called.
*/

2
src/map_utils.hpp
View file

@ -37,7 +37,7 @@ const V& map_get_value_default(const std::map<K,V>& m, const K& key, const V& va
*
* @note Didn't use template<class K, class V> since that has a problem when
* deducting the type when the key is a std::string and the type send is a
* charater string, e.g. "foo". Letting the map deduct the K and V types works.
* character string, e.g. "foo". Letting the map deduct the K and V types works.
*
* @throw std::out_of_range When the key is not in the map.
*

2
src/mapgen.cpp
View file

@ -358,7 +358,7 @@ static std::string output_map(const terrain_map& terrain,
namespace {
/**
* Calculates the cost of building a road over terrain. For use in the
* Calculates the cost of building a road over terrain. For use in the
* a_star_search algorithm.
*/
struct road_path_calculator : pathfind::cost_calculator

2
src/marked-up_text.cpp
View file

@ -277,7 +277,7 @@ bool is_cjk_char(const wchar_t c)
//FIXME add range from Japanese-specific and Korean-specific section if you know the characters are used today.
if (ch < 0x2e80) return false; // shorcut for common non-CJK
if (ch < 0x2e80) return false; // shortcut for common non-CJK
return
//Han Ideographs: all except Supplement

4
src/marked-up_text.hpp
View file

@ -117,7 +117,7 @@ std::string span_color(const SDL_Color &color);
/**
* Wrap text.
*
* - If the text exceedes the specified max width, wrap it on a word basis.
* - If the text exceeds the specified max width, wrap it on a word basis.
* - If this is not possible, e.g. the word is too big to fit, wrap it on a
* - char basis.
*/
@ -128,7 +128,7 @@ std::string word_wrap_text(const std::string& unwrapped_text, int font_size,
* Draw text on the screen, fit text to maximum width, no markup, no tooltips.
*
* This method makes sure that the text fits within a given maximum width.
* If a line exceedes this width, it will be wrapped
* If a line exceeds this width, it will be wrapped
* on a word basis if possible, otherwise on a char basis.
* This method is otherwise similar to the draw_text method,
* but it doesn't support special markup or tooltips.

2
src/replay.cpp
View file

@ -308,7 +308,7 @@ void replay::add_movement(const std::vector<map_location>& steps)
/**
* Modifies the most recently recorded move to indicate that it
* stopped early (due to unforseen circumstances, such as an ambush).
* stopped early (due to unforeseen circumstances, such as an ambush).
* This will be ineffective if @a early_stop is not in the recorded path.
*/
void replay::limit_movement(const map_location& early_stop)

4
src/soundsource.hpp
View file

@ -31,7 +31,7 @@ class manager;
/*
* Sound source is an object on a map (a location) which has one or more
* sounds effects associated with it, which are played randomly and with
* appropriate delays, when sound emiting object is visible on screen.
* appropriate delays, when sound emitting object is visible on screen.
*/
class positional_source {
unsigned int last_played_;
@ -100,7 +100,7 @@ public:
/**
* Serializes information into cfg as new children of key
* "sound_source", appendend to existing content.
* "sound_source", appended to existing content.
*/
void write_sourcespecs(config& cfg) const;

2
src/team.cpp
View file

@ -137,7 +137,7 @@ void team::team_info::read(const config &cfg)
color = cfg["side"].str();
}
// If arel starting new scenario overide settings from [ai] tags
// If arel starting new scenario override settings from [ai] tags
if (!user_team_name.translatable())
user_team_name = t_string::from_serialized(user_team_name);

2
src/terrain_filter.cpp
View file

@ -86,7 +86,7 @@ terrain_filter::terrain_filter(const terrain_filter& other) :
terrain_filter& terrain_filter::operator=(const terrain_filter& other)
{
// Use copy constructor to make sure we are coherant
// Use copy constructor to make sure we are coherent
if (this != &other) {
this->~terrain_filter();
new (this) terrain_filter(other) ;

6
src/terrain_translation.cpp
View file

@ -789,9 +789,9 @@ static std::string number_to_string_(t_terrain terrain, const int start_position
}
/*
* The initialisation of tcode is done to make gcc-4.7 happy. Otherwise it
* some uninitialised fields might be used. Its analysis are wrong, but
* initialise to keep it happy.
* The initialization of tcode is done to make gcc-4.7 happy. Otherwise it
* some uninitialized fields might be used. Its analysis are wrong, but
* Initialize to keep it happy.
*/
unsigned char tcode[9] = {0};
// Insert the terrain tcode

4
src/terrain_translation.hpp
View file

@ -152,7 +152,7 @@ namespace t_translation {
*@endverbatim
* The underscore is intended for internal use.
* Other letters and characters are not validated but
* users of these letters can get nasty surprices.
* users of these letters can get nasty surprises.
* The * is used as wildcard in some cases.
* The terrain code can be two groups separated by a caret,
* the first group is the base terrain,
@ -214,7 +214,7 @@ namespace t_translation {
* readability it's allowed to pad strings with either spaces
* or tab, however the tab is deprecated.
* * A terrain string contains either a terrain or a terrain and
* starting loction. The following format is used
* starting location. The following format is used
* [S ]T
* S = starting location a positive non-zero number
* T = terrain code (see read_terrain_code)

4
src/text.hpp
View file

@ -33,7 +33,7 @@ namespace gui2 {
namespace font {
/**
* Escapses the markup characters in a text.
* Escapes the markup characters in a text.
*
* The markups escaped are the ones used in the pango markup. The special
* characters are @code <>'"&@endcode. They escaping is the same as for HTML.
@ -260,7 +260,7 @@ private:
/** The way too long text is shown depends on this mode. */
PangoEllipsizeMode ellipse_mode_;
/** The alinment of the text. */
/** The alignment of the text. */
PangoAlignment alignment_;
/** The maximum length of the text. */

2
src/tstring.hpp
View file

@ -95,7 +95,7 @@ public:
const std::string& str() const;
const char* c_str() const { return str().c_str(); }
bool translatable() const { return translatable_; }
// Warning: value() may contain platform dependant prefix bytes !
// Warning: value() may contain platform dependent prefix bytes !
// Consider base_str() for a more reliable untranslated string
const std::string& value() const { return value_; }
std::string base_str() const;

2
src/unit_abilities.cpp
View file

@ -599,7 +599,7 @@ unit_ability_list attack_type::get_specials(const std::string& special) const
}
/**
* Returns a vector of names and decriptions for the specials of *this.
* Returns a vector of names and descriptions for the specials of *this.
* Each std::pair in the vector has first = name and second = description.
*
* This uses either the active or inactive name/description for each special,

2
src/unit_animation.cpp
View file

@ -924,7 +924,7 @@ bool unit_animation::invalidate(frame_parameters& value)
}
} else {
// off screen animations only invalidate their own hex, no propagation,
// but we stil need this to play sounds
// but we still need this to play sounds
overlaped_hex_.insert(src_);
}

Some files were not shown because too many files have changed in this diff Show more