diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-24 09:50:51 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-24 09:50:51 -0500 |
commit | 42c04eb9ff6b36614de58eb3017735071f710ce2 (patch) | |
tree | d38334c7d4483e086750961285273a73cdd7af20 | |
parent | 3ed0f149cfa5f8e40ccb554c550415ac63c6895b (diff) | |
download | crawl-ref-42c04eb9ff6b36614de58eb3017735071f710ce2.tar.gz crawl-ref-42c04eb9ff6b36614de58eb3017735071f710ce2.zip |
Add more spelling fixes.
-rw-r--r-- | crawl-ref/source/command.cc | 24 | ||||
-rw-r--r-- | crawl-ref/source/command.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/directn.cc | 50 | ||||
-rw-r--r-- | crawl-ref/source/directn.h | 10 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 8 | ||||
-rw-r--r-- | crawl-ref/source/externs.h | 8 | ||||
-rw-r--r-- | crawl-ref/source/hiscores.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/macro.cc | 18 | ||||
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mstuff2.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/output.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spells1.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.h | 10 | ||||
-rw-r--r-- | crawl-ref/source/spl-util.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/spl-util.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilesdl.cc | 6 |
18 files changed, 89 insertions, 89 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 7380faa190..aae5fa1e20 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -736,7 +736,7 @@ static bool _cmdhelp_textfilter(const std::string &tag) return (false); } -static const char *targeting_help_1 = +static const char *targetting_help_1 = "<h>Examine surroundings ('<w>x</w><h>' in main):\n" "<w>Esc</w> : cancel (also <w>Space</w>, <w>x</w>)\n" "<w>Dir.</w>: move cursor in that direction\n" @@ -750,13 +750,13 @@ static const char *targeting_help_1 = "<w>_</w> : cycle through altars\n" "<w><<</w>/<w>></w> : cycle through up/down stairs\n" "<w>Tab</w> : cycle through shops and portals\n" - "<w>Ctrl-F</w> : change monster targeting mode\n" + "<w>Ctrl-F</w> : change monster targetting mode\n" #ifndef USE_TILE - "<w>Ctrl-L</w> : toggle targeting via monster list\n" + "<w>Ctrl-L</w> : toggle targetting via monster list\n" #endif "<w>Ctrl-P</w> : repeat prompt\n" " \n" - "<h>Targeting (zapping wands, casting spells, etc.):\n" + "<h>targetting (zapping wands, casting spells, etc.):\n" "The keys from examine surroundings also work here.\n" "In addition, you can use:\n" "<w>Enter</w> : fire at target (<w>Space</w>, <w>Del</w>)\n" @@ -768,7 +768,7 @@ static const char *targeting_help_1 = "<w>Shift-Dir</w> : shoot straight-line beam\n" #ifdef WIZARD " \n" - "<h>Wizard targeting commands:</h>\n" + "<h>Wizard targetting commands:</h>\n" "<w>g</w>: give item to monster\n" "<w>s</w>: force monster to shout or speak\n" "<w>S</w>: make monster a summoned monster\n" @@ -782,7 +782,7 @@ static const char *targeting_help_1 = #endif ; -static const char *targeting_help_2 = +static const char *targetting_help_2 = "<h>Firing or throwing a missile:\n" "<w>(</w> : cycle to next suitable missile.\n" "<w>)</w> : cycle to previous suitable missile.\n" @@ -1942,7 +1942,7 @@ static int _show_keyhelp_menu(const std::vector<formatted_string> &lines, "<w>F</w>. Monsters\n" "<w>G</w>. Items\n" "<w>H</w>. Spellcasting\n" - "<w>I</w>. Targeting\n" + "<w>I</w>. targetting\n" "<w>J</w>. Religion\n" "<w>K</w>. Mutations\n" "<w>L</w>. Licence, Contact, History\n" @@ -2040,14 +2040,14 @@ void show_levelmap_help() show_specific_help( getHelpString("level-map") ); } -void show_targeting_help() +void show_targetting_help() { column_composer cols(2, 41); // Page size is number of lines - one line for --more-- prompt. cols.set_pagesize(get_number_of_lines() - 1); - cols.add_formatted(0, targeting_help_1, true, true); - cols.add_formatted(1, targeting_help_2, true, true); + cols.add_formatted(0, targetting_help_1, true, true); + cols.add_formatted(1, targetting_help_2, true, true); _show_keyhelp_menu(cols.formatted_lines(), false, true); } void show_interlevel_travel_branch_help() @@ -2269,7 +2269,7 @@ static void _add_formatted_keyhelp(column_composer &cols) "<h>Additional help:\n" "Many commands have context sensitive \n" "help, among them <w>X</w>, <w>x</w>, <w>f</w> (or any \n" - "form of targeting), <w>Ctrl-G</w> or <w>G</w>, and \n" + "form of targetting), <w>Ctrl-G</w> or <w>G</w>, and \n" "<w>Ctrl-F</w>.\n" "You can read descriptions of your \n" "current spells (<w>I</w>), skills (<w>m?</w>) and \n" @@ -2335,7 +2335,7 @@ static void _add_formatted_tutorial_help(column_composer &cols) "<w>X</w> : show map of the whole level\n" "<w>Ctrl-X</w> : list monsters, items, features in sight\n" "\n" - "<h>Targeting (for spells and missiles)\n" + "<h>targetting (for spells and missiles)\n" "Use <w>+</w> (or <w>=</w>) and <w>-</w> to cycle between\n" "hostile monsters. <w>Enter</w> or <w>.</w> or <w>Del</w>\n" "all fire at the selected target.\n" diff --git a/crawl-ref/source/command.h b/crawl-ref/source/command.h index 6d28a0ab55..09d9a7cca1 100644 --- a/crawl-ref/source/command.h +++ b/crawl-ref/source/command.h @@ -26,7 +26,7 @@ void list_jewellery(); void swap_inv_slots(int slot1, int slot2, bool verbose); void show_levelmap_help(); -void show_targeting_help(); +void show_targetting_help(); void show_interlevel_travel_branch_help(); void show_interlevel_travel_depth_help(); void show_stash_search_help(); diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 328896c011..a26972cad8 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -117,12 +117,12 @@ static char _find_square( const coord_def& where, bool need_path, int mode = TARG_ANY, int range = -1, bool wrap = false, int los = LOS_ANY); -static int _targeting_cmd_to_compass( command_type command ); +static int _targetting_cmd_to_compass( command_type command ); static void _describe_oos_square(const coord_def& where); static void _extend_move_to_edge(dist &moves); static std::string _get_monster_desc(const monsters *mon); -void direction_choose_compass( dist& moves, targeting_behaviour *beh) +void direction_choose_compass( dist& moves, targetting_behaviour *beh) { moves.isValid = true; moves.isTarget = false; @@ -188,7 +188,7 @@ void direction_choose_compass( dist& moves, targeting_behaviour *beh) break; } - const int i = _targeting_cmd_to_compass(key_command); + const int i = _targetting_cmd_to_compass(key_command); if (i != -1) { moves.delta = Compass[i]; @@ -206,7 +206,7 @@ void direction_choose_compass( dist& moves, targeting_behaviour *beh) #endif } -static int _targeting_cmd_to_compass( command_type command ) +static int _targetting_cmd_to_compass( command_type command ) { switch ( command ) { @@ -231,7 +231,7 @@ static int _targeting_cmd_to_compass( command_type command ) } } -static int _targeting_cmd_to_feature( command_type command ) +static int _targetting_cmd_to_feature( command_type command ) { switch ( command ) { @@ -315,15 +315,15 @@ static bool _is_target_in_range(const coord_def& where, int range) return (grid_distance(you.pos(), where) <= range); } -// We handle targeting for repeating commands and re-doing the +// We handle targetting for repeating commands and re-doing the // previous command differently (i.e., not just letting the keys // stuffed into the macro buffer replay as-is) because if the player // targeted a monster using the movement keys and the monster then // moved between repetitions, then simply replaying the keys in the // buffer will target an empty square. -static void _direction_again(dist& moves, targeting_type restricts, +static void _direction_again(dist& moves, targetting_type restricts, targ_mode_type mode, int range, bool just_looking, - const char *prompt, targeting_behaviour *beh) + const char *prompt, targetting_behaviour *beh) { moves.isValid = false; moves.isTarget = false; @@ -983,15 +983,15 @@ static bool _blocked_ray(const coord_def &where, return (false); } -void direction(dist& moves, targeting_type restricts, +void direction(dist& moves, targetting_type restricts, targ_mode_type mode, int range, bool just_looking, bool needs_path, bool may_target_monster, bool may_target_self, const char *prompt, - targeting_behaviour *beh, bool cancel_at_self) + targetting_behaviour *beh, bool cancel_at_self) { if (!beh) { - static targeting_behaviour stock_behaviour; + static targetting_behaviour stock_behaviour; beh = &stock_behaviour; } beh->just_looking = just_looking; @@ -1254,7 +1254,7 @@ void direction(dist& moves, targeting_type restricts, case CMD_TARGET_UP_LEFT: case CMD_TARGET_UP: case CMD_TARGET_UP_RIGHT: - i = _targeting_cmd_to_compass(key_command); + i = _targetting_cmd_to_compass(key_command); moves.target += Compass[i]; break; @@ -1266,7 +1266,7 @@ void direction(dist& moves, targeting_type restricts, case CMD_TARGET_DIR_UP_LEFT: case CMD_TARGET_DIR_UP: case CMD_TARGET_DIR_UP_RIGHT: - i = _targeting_cmd_to_compass(key_command); + i = _targetting_cmd_to_compass(key_command); if (restricts != DIR_TARGET) { @@ -1356,7 +1356,7 @@ void direction(dist& moves, targeting_type restricts, case CMD_TARGET_FIND_UPSTAIR: case CMD_TARGET_FIND_DOWNSTAIR: { - const int thing_to_find = _targeting_cmd_to_feature(key_command); + const int thing_to_find = _targetting_cmd_to_feature(key_command); if (_find_square_wrapper(moves.target, objfind_pos, 1, _find_feature, needs_path, thing_to_find, range, true, Options.target_los_first ? @@ -1374,7 +1374,7 @@ void direction(dist& moves, targeting_type restricts, case CMD_TARGET_CYCLE_TARGET_MODE: mode = static_cast<targ_mode_type>((mode + 1) % TARG_NUM_MODES); - mprf("Targeting mode is now: %s", + mprf("targetting mode is now: %s", (mode == TARG_ANY) ? "any" : (mode == TARG_ENEMY) ? "enemies" : (mode == TARG_HOSTILE) ? "hostiles" @@ -1643,7 +1643,7 @@ void direction(dist& moves, targeting_type restricts, break; case CMD_TARGET_HELP: - show_targeting_help(); + show_targetting_help(); force_redraw = true; redraw_screen(); mesclr(true); @@ -3563,32 +3563,32 @@ static void _describe_cell(const coord_def& where, bool in_range) } /////////////////////////////////////////////////////////////////////////// -// targeting_behaviour +// targetting_behaviour -targeting_behaviour::targeting_behaviour(bool look_around) +targetting_behaviour::targetting_behaviour(bool look_around) : just_looking(look_around), compass(false) { } -targeting_behaviour::~targeting_behaviour() +targetting_behaviour::~targetting_behaviour() { } -int targeting_behaviour::get_key() +int targetting_behaviour::get_key() { if (!crawl_state.is_replaying_keys()) flush_input_buffer(FLUSH_BEFORE_COMMAND); - return unmangle_direction_keys(getchm(KMC_TARGETING), KMC_TARGETING, + return unmangle_direction_keys(getchm(KMC_TARGETTING), KMC_TARGETTING, false, false); } -command_type targeting_behaviour::get_command(int key) +command_type targetting_behaviour::get_command(int key) { if (key == -1) key = get_key(); - command_type cmd = key_to_command(key, KMC_TARGETING); + command_type cmd = key_to_command(key, KMC_TARGETTING); if (cmd >= CMD_MIN_TARGET && cmd < CMD_TARGET_CYCLE_TARGET_MODE) return (cmd); @@ -3605,12 +3605,12 @@ command_type targeting_behaviour::get_command(int key) return (cmd); } -bool targeting_behaviour::should_redraw() +bool targetting_behaviour::should_redraw() { return (false); } -void targeting_behaviour::mark_ammo_nonchosen() +void targetting_behaviour::mark_ammo_nonchosen() { // Nothing to be done. } diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h index 9f95c8129a..5577183e07 100644 --- a/crawl-ref/source/directn.h +++ b/crawl-ref/source/directn.h @@ -116,11 +116,11 @@ public: extern crawl_view_geometry crawl_view; // An object that modifies the behaviour of the direction prompt. -class targeting_behaviour +class targetting_behaviour { public: - targeting_behaviour(bool just_looking = false); - virtual ~targeting_behaviour(); + targetting_behaviour(bool just_looking = false); + virtual ~targetting_behaviour(); // Returns a keystroke for the prompt. virtual int get_key(); @@ -150,11 +150,11 @@ struct dist int prev_target; // previous target }; -void direction( dist &moves, targeting_type restricts = DIR_NONE, +void direction( dist &moves, targetting_type restricts = DIR_NONE, targ_mode_type mode = TARG_ANY, int range = -1, bool just_looking = false, bool needs_path = true, bool may_target_monster = true, bool may_target_self = false, - const char *prompt = NULL, targeting_behaviour *mod = NULL, + const char *prompt = NULL, targetting_behaviour *mod = NULL, bool cancel_at_self = false ); bool in_los_bounds(const coord_def& p); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index f8fa4f225c..1638578076 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -619,7 +619,7 @@ enum command_type CMD_MAX_OVERMAP = CMD_MAP_EXIT_MAP, - // targeting commands + // targetting commands CMD_TARGET_DOWN_LEFT, CMD_MIN_TARGET = CMD_TARGET_DOWN_LEFT, CMD_TARGET_DOWN, @@ -1514,7 +1514,7 @@ enum KeymapContext { KMC_DEFAULT, // For no-arg getchm(), must be zero. KMC_LEVELMAP, // When in the 'X' level map - KMC_TARGETING, // Only during 'x' and other targeting modes + KMC_TARGETTING, // Only during 'x' and other targetting modes KMC_CONFIRM, // When being asked y/n/q questions KMC_MENU, // For menus #ifdef USE_TILE @@ -2908,12 +2908,12 @@ enum stat_type STAT_RANDOM = 255 // leave at 255, added for increase_stats() handling {dlb} }; -enum targeting_type +enum targetting_type { DIR_NONE, DIR_TARGET, DIR_DIR, - DIR_TARGET_OBJECT // New as of 27-August-2009, for item-targeting spells + DIR_TARGET_OBJECT // New as of 27-August-2009, for item-targetting spells }; enum torment_source_type diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index f6104eaa72..95428d89c0 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1954,7 +1954,7 @@ public: bool show_more_prompt; bool show_gold_turns; // Show gold and turns in HUD. - bool show_beam; // Show targeting beam by default. + bool show_beam; // Show targetting beam by default. long autopickups; // items to autopickup bool show_inventory_weights; // show weights in inventory listings @@ -1977,7 +1977,7 @@ public: // chunks if no safe ones are present bool easy_eat_contaminated; // like easy_eat_gourmand, but // always active. - bool default_target; // start targeting on a real target + bool default_target; // start targetting on a real target bool autopickup_no_burden; // don't autopickup if it changes burden bool note_all_skill_levels; // take note for all skill levels (1-27) @@ -1995,7 +1995,7 @@ public: int colour[16]; // macro fg colours to other colours int background; // select default background colour int channels[NUM_MESSAGE_CHANNELS]; // msg channel colouring - int target_range; // for whether targeting is out of range + int target_range; // for whether targetting is out of range bool use_old_selection_order; // use old order of species/classes in // selection screen @@ -2138,7 +2138,7 @@ public: std::vector<std::string> dump_order; bool level_map_title; // Show title in level map - bool target_zero_exp; // If true, targeting targets zero-exp + bool target_zero_exp; // If true, targetting targets zero-exp // monsters. bool target_wrap; // Wrap around from last to first target bool target_oos; // 'x' look around can target out-of-LOS diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 2b1a02db14..672982e9c4 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -425,7 +425,7 @@ static const char *kill_method_names[] = "mon", "pois", "cloud", "beam", "deaths_door", "lava", "water", "stupidity", "weakness", "clumsiness", "trap", "leaving", "winning", "quitting", "draining", "starvation", "freezing", "burning", - "wild_magic", "xom", "statue", "rotting", "targeting", "spore", + "wild_magic", "xom", "statue", "rotting", "targetting", "spore", "tso_smiting", "petrification", "unknown", "something", "falling_down_stairs", "acid", "curare", "melting", "bleeding", "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed", @@ -1677,7 +1677,7 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) break; case KILLED_BY_TARGETTING: - desc += terse? "shot self" : "Killed themselves with bad targeting"; + desc += terse? "shot self" : "Killed themselves with bad targetting"; needs_damage = true; break; @@ -1720,7 +1720,7 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) case KILLED_BY_SELF_AIMED: if (terse) - desc += "suicidal targeting"; + desc += "suicidal targetting"; else { desc += "Shot themselves with a "; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 5b47066e01..beb1ef5331 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1177,7 +1177,7 @@ int get_next_fire_item(int current, int direction) return fire_order[0]; } -class fire_target_behaviour : public targeting_behaviour +class fire_target_behaviour : public targetting_behaviour { public: fire_target_behaviour() @@ -1187,7 +1187,7 @@ public: m_slot = you.m_quiver->get_fire_item(&m_noitem_reason); } - // targeting_behaviour API + // targetting_behaviour API virtual command_type get_command(int key = -1); virtual bool should_redraw(); virtual void mark_ammo_nonchosen(); @@ -1307,14 +1307,14 @@ command_type fire_target_behaviour::get_command(int key) return (CMD_NO_CMD); } case '?': - show_targeting_help(); + show_targetting_help(); redraw_screen(); message_ammo_prompt(); need_prompt = true; return (CMD_NO_CMD); } - return targeting_behaviour::get_command(key); + return targetting_behaviour::get_command(key); } static bool _fire_choose_item_and_target(int& slot, dist& target, @@ -3854,7 +3854,7 @@ void zap_wand(int slot) dist zap_wand; int item_slot; - // Unless the character knows the type of the wand, the targeting + // Unless the character knows the type of the wand, the targetting // system will default to enemies. -- [ds] targ_mode_type targ_mode = TARG_ENEMY; diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 4614a0b712..156730e64f 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -60,7 +60,7 @@ static macromap *all_maps[] = { &Keymaps[KMC_DEFAULT], &Keymaps[KMC_LEVELMAP], - &Keymaps[KMC_TARGETING], + &Keymaps[KMC_TARGETTING], &Keymaps[KMC_CONFIRM], &Macros, @@ -763,7 +763,7 @@ void macro_add_query( void ) else if (input == 't') { keymap = true; - keymc = KMC_TARGETING; + keymc = KMC_TARGETTING; } else if (input == 'c') { @@ -793,12 +793,12 @@ void macro_add_query( void ) macromap &mapref = (keymap ? Keymaps[keymc] : Macros); mprf(MSGCH_PROMPT, "Input %s%s trigger key: ", - keymap ? (keymc == KMC_DEFAULT ? "default " : - keymc == KMC_LEVELMAP ? "level-map " : - keymc == KMC_TARGETING ? "targeting " : - keymc == KMC_CONFIRM ? "confirm " : - keymc == KMC_MENU ? "menu " - : "buggy") : "", + keymap ? (keymc == KMC_DEFAULT ? "default " : + keymc == KMC_LEVELMAP ? "level-map " : + keymc == KMC_TARGETTING ? "targetting " : + keymc == KMC_CONFIRM ? "confirm " : + keymc == KMC_MENU ? "menu " + : "buggy") : "", (keymap ? "keymap" : "macro") ); keyseq key; @@ -1131,7 +1131,7 @@ KeymapContext context_for_command(command_type cmd) return KMC_LEVELMAP; if (cmd >= CMD_MIN_TARGET && cmd <= CMD_MAX_TARGET) - return KMC_TARGETING; + return KMC_TARGETTING; #ifdef USE_TILE if (cmd >= CMD_MIN_DOLL && cmd <= CMD_MAX_DOLL) diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index ce318957df..66e1abeeb6 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4269,7 +4269,7 @@ static void _handle_behaviour(monsters *mon) return; } // If we're not forcing monsters to attack, just make sure they're - // not targeting the player in arena mode. + // not targetting the player in arena mode. else if (mon->foe == MHITYOU) mon->foe = MHITNOT; } diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 15bd46a7f3..cb88e2ea8e 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -183,7 +183,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, ASSERT(!(flags & (SPFLAG_TESTING | SPFLAG_MAPPING))); // Targeted spells need a valid target. - ASSERT(!(flags & SPFLAG_TARGETING_MASK) || in_bounds(pbolt.target)); + ASSERT(!(flags & SPFLAG_TARGETTING_MASK) || in_bounds(pbolt.target)); #endif if (do_noise) @@ -744,7 +744,7 @@ void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast) && pbolt.name[0] != '0' && !pbolt.is_enchantment(); - const bool targeted = (flags & SPFLAG_TARGETING_MASK) + const bool targeted = (flags & SPFLAG_TARGETTING_MASK) && (pbolt.target != monster->pos() || visible_beam); if (targeted) @@ -856,7 +856,7 @@ void mons_cast_noise(monsters *monster, bolt &pbolt, spell_type spell_cast) else if (pbolt.target == monster->pos()) target = monster->pronoun(PRONOUN_REFLEXIVE); // Monsters should only use targeted spells while foe == MHITNOT - // if they're targeting themselves. + // if they're targetting themselves. else if (monster->foe == MHITNOT && !monster->confused()) target = "NONEXISTENT FOE"; else if (!invalid_monster_index(monster->foe) diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 36827ad37f..759a08019a 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1494,7 +1494,7 @@ static void _print_next_monster_desc(const std::vector<monster_pane_info>& mons, { int printed = 0; - // for targeting + // for targetting if (idx >= 0) { textcolor(WHITE); diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 95a9df1302..7cc35a178c 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -535,7 +535,7 @@ bool conjure_flame(int pow, const coord_def& where) return (false); } - // Note that self-targeting is handled by SPFLAG_NOT_SELF. + // Note that self-targetting is handled by SPFLAG_NOT_SELF. monsters *monster = monster_at(where); if (monster) { diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index dfe3135ca8..f436f3c059 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1168,11 +1168,11 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) int potion = -1; - // XXX: This handles only some of the cases where spells need targeting... + // XXX: This handles only some of the cases where spells need targetting... // there are others that do their own that will be missed by this // (and thus will not properly ESC without cost because of it). // Hopefully, those will eventually be fixed. -- bwr - if ((flags & SPFLAG_TARGETING_MASK) && spell != SPELL_PORTAL_PROJECTILE) + if ((flags & SPFLAG_TARGETTING_MASK) && spell != SPELL_PORTAL_PROJECTILE) { targ_mode_type targ = (testbits(flags, SPFLAG_HELPFUL) ? TARG_FRIEND : TARG_ENEMY); @@ -1180,7 +1180,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) if (testbits(flags, SPFLAG_NEUTRAL)) targ = TARG_ANY; - targeting_type dir = + targetting_type dir = ( (spell == SPELL_APPORTATION) ? DIR_TARGET_OBJECT : testbits(flags, SPFLAG_TARGET) ? DIR_TARGET : testbits(flags, SPFLAG_GRID) ? DIR_TARGET : diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h index bece3831e2..a16a3d8b7a 100644 --- a/crawl-ref/source/spl-cast.h +++ b/crawl-ref/source/spl-cast.h @@ -15,11 +15,11 @@ enum spflag_type { SPFLAG_NONE = 0x00000, - SPFLAG_DIR_OR_TARGET = 0x00001, // use DIR_NONE targeting - SPFLAG_TARGET = 0x00002, // use DIR_TARGET targeting - SPFLAG_GRID = 0x00004, // use DIR_GRID targeting - SPFLAG_DIR = 0x00008, // use DIR_DIR targeting - SPFLAG_TARGETING_MASK = 0x0000f, // used to test for targeting + SPFLAG_DIR_OR_TARGET = 0x00001, // use DIR_NONE targetting + SPFLAG_TARGET = 0x00002, // use DIR_TARGET targetting + SPFLAG_GRID = 0x00004, // use DIR_GRID targetting + SPFLAG_DIR = 0x00008, // use DIR_DIR targetting + SPFLAG_TARGETTING_MASK = 0x0000f, // used to test for targetting SPFLAG_HELPFUL = 0x00010, // TARG_FRIENDS used SPFLAG_NEUTRAL = 0x00020, // TARG_ANY used SPFLAG_NOT_SELF = 0x00040, // aborts on isMe diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 0e9d3db292..9b01324ddc 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -115,7 +115,7 @@ void init_spell_descs(void) data.title); } - if (data.flags & SPFLAG_TARGETING_MASK) + if (data.flags & SPFLAG_TARGETTING_MASK) { if (data.min_range <= -1 || data.max_range <= 0) { @@ -359,7 +359,7 @@ bool spell_harms_target(spell_type spell) if (flags & (SPFLAG_HELPFUL | SPFLAG_NEUTRAL)) return false; - if (flags & SPFLAG_TARGETING_MASK) + if (flags & SPFLAG_TARGETTING_MASK) return true; return false; @@ -739,7 +739,7 @@ void apply_area_cloud( cloud_func func, const coord_def& where, // Select a spell direction and fill dist and pbolt appropriately. // Return false if the user canceled, true otherwise. bool spell_direction( dist &spelld, bolt &pbolt, - targeting_type restrict, targ_mode_type mode, + targetting_type restrict, targ_mode_type mode, int range, bool needs_path, bool may_target_monster, bool may_target_self, const char *prompt, diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index dd0e78319f..fb53816af8 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -109,7 +109,7 @@ void apply_area_cloud(cloud_func func, const coord_def& where, int spread_rate = -1); bool spell_direction( dist &spelld, bolt &pbolt, - targeting_type restrict = DIR_NONE, + targetting_type restrict = DIR_NONE, targ_mode_type mode = TARG_ENEMY, // pbolt.range if applicable, otherwise LOS_RADIUS int range = 0, diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index ac2d652a17..2674d98b79 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -770,9 +770,9 @@ int TilesFramework::getch_ck() = (mouse_control::current_mode() == MOUSE_MODE_TARGET_PATH || mouse_control::current_mode() == MOUSE_MODE_TARGET_DIR); - // When moving the mouse via cursor when targeting update more often. - // For beams, the beam drawing already handles this, and when not targeting - // the normal drawing routines handle it. + // When moving the mouse via cursor when targetting update more often. + // For beams, the beam drawing already handles this, and when not + // targetting the normal drawing routines handle it. const unsigned int ticks_per_cursor_redraw = (mouse_target_mode ? 100 : 30); const unsigned int ticks_per_screen_redraw = Options.tile_update_rate; |