diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/birth.cc | 1 | ||||
-rw-r--r-- | src/bldg.cc | 1 | ||||
-rw-r--r-- | src/cmd1.cc | 1 | ||||
-rw-r--r-- | src/cmd2.cc | 1 | ||||
-rw-r--r-- | src/cmd5.cc | 1 | ||||
-rw-r--r-- | src/cmd6.cc | 1 | ||||
-rw-r--r-- | src/cmd7.cc | 1 | ||||
-rw-r--r-- | src/dungeon.cc | 1 | ||||
-rw-r--r-- | src/externs.h | 110 | ||||
-rw-r--r-- | src/files.cc | 1 | ||||
-rw-r--r-- | src/lua_bind.cc | 1 | ||||
-rw-r--r-- | src/melee1.cc | 1 | ||||
-rw-r--r-- | src/melee2.cc | 1 | ||||
-rw-r--r-- | src/modules.cc | 1 | ||||
-rw-r--r-- | src/monster2.cc | 1 | ||||
-rw-r--r-- | src/object2.cc | 1 | ||||
-rw-r--r-- | src/powers.cc | 1 | ||||
-rw-r--r-- | src/q_thief.cc | 1 | ||||
-rw-r--r-- | src/randart.cc | 1 | ||||
-rw-r--r-- | src/spells1.cc | 1 | ||||
-rw-r--r-- | src/spells2.cc | 1 | ||||
-rw-r--r-- | src/spells2.hpp | 112 | ||||
-rw-r--r-- | src/spells3.cc | 1 | ||||
-rw-r--r-- | src/traps.cc | 1 | ||||
-rw-r--r-- | src/wizard2.cc | 1 | ||||
-rw-r--r-- | src/xtra2.cc | 1 |
26 files changed, 136 insertions, 110 deletions
diff --git a/src/birth.cc b/src/birth.cc index ef723220..fe65ad45 100644 --- a/src/birth.cc +++ b/src/birth.cc @@ -20,6 +20,7 @@ #include "notes.hpp" #include "q_rand.h" #include "skills.hpp" +#include "spells2.hpp" #include "spells3.hpp" #include "spells5.hpp" #include "store.hpp" diff --git a/src/bldg.cc b/src/bldg.cc index 59d9fa60..414f1758 100644 --- a/src/bldg.cc +++ b/src/bldg.cc @@ -20,6 +20,7 @@ #include "q_library.h" #include "q_fireprof.h" #include "q_bounty.h" +#include "spells2.hpp" #include "store.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/cmd1.cc b/src/cmd1.cc index a37d3788..4dff0df2 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -18,6 +18,7 @@ #include "quark.h" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells3.hpp" #include "traps.hpp" #include "xtra1.hpp" diff --git a/src/cmd2.cc b/src/cmd2.cc index 9f0c186f..b1504acb 100644 --- a/src/cmd2.cc +++ b/src/cmd2.cc @@ -16,6 +16,7 @@ #include "hooks.h" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells3.hpp" #include "traps.hpp" #include "xtra1.hpp" diff --git a/src/cmd5.cc b/src/cmd5.cc index c475fff3..b58df8f0 100644 --- a/src/cmd5.cc +++ b/src/cmd5.cc @@ -15,6 +15,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "quark.h" #include "wizard2.hpp" diff --git a/src/cmd6.cc b/src/cmd6.cc index 220d945b..43033fbe 100644 --- a/src/cmd6.cc +++ b/src/cmd6.cc @@ -20,6 +20,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "store.hpp" #include "wizard2.hpp" diff --git a/src/cmd7.cc b/src/cmd7.cc index 012d72de..4b3e4ec0 100644 --- a/src/cmd7.cc +++ b/src/cmd7.cc @@ -18,6 +18,7 @@ #include "quark.h" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/dungeon.cc b/src/dungeon.cc index 2a067110..e52b00e7 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -28,6 +28,7 @@ #include "skills.hpp" #include "spell_type.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "squeltch.hpp" #include "store.hpp" diff --git a/src/externs.h b/src/externs.h index e49b79d3..cf90a208 100644 --- a/src/externs.h +++ b/src/externs.h @@ -760,116 +760,6 @@ extern s16b m_bonus(int max, int level); extern void object_gain_level(object_type *o_ptr); extern s32b flag_cost(object_type * o_ptr, int plusses); -/* spells2.c */ -extern void curse_artifact(object_type * o_ptr); -extern void grow_things(s16b type, int rad); -extern void grow_grass(int rad); -extern void grow_trees(int rad); -extern bool_ hp_player(int num); -extern bool_ heal_insanity(int val); -extern void warding_glyph(void); -extern void explosive_rune(void); -extern bool_ do_dec_stat(int stat, int mode); -extern bool_ do_res_stat(int stat, bool_ full); -extern bool_ do_inc_stat(int stat); -extern void identify_hooks(int i, object_type *o_ptr, identify_mode type); -extern bool_ identify_pack(void); -extern void identify_pack_fully(void); -extern bool_ remove_curse(void); -extern bool_ remove_all_curse(void); -extern bool_ restore_level(void); -extern void self_knowledge(FILE *fff); -extern bool_ lose_all_info(void); -extern bool_ detect_traps(int rad); -extern bool_ detect_doors(int rad); -extern bool_ detect_stairs(int rad); -extern bool_ detect_treasure(int rad); -extern bool_ detect_objects_gold(int rad); -extern bool_ detect_objects_normal(int rad); -extern bool_ detect_monsters_normal(int rad); -extern bool_ detect_monsters_invis(int rad); -extern bool_ detect_monsters_xxx(u32b match_flag, int rad); -extern bool_ detect_all(int rad); -extern void stair_creation(void); -extern bool_ wall_stone(int y, int x); -extern bool_ enchant(object_type *o_ptr, int n, int eflag); -extern bool_ enchant_spell(int num_hit, int num_dam, int num_ac, int num_pval); -extern bool_ ident_spell(void); -extern bool_ ident_all(void); -extern bool_ identify_fully(void); -extern bool_ recharge(int num); -extern void aggravate_monsters(int who); -extern bool_ genocide_aux(bool_ player_cast, char typ); -extern bool_ genocide(bool_ player_cast); -extern bool_ mass_genocide(bool_ player_cast); -extern void do_probe(int m_idx); -extern bool_ probing(void); -extern void change_wild_mode(void); -extern bool_ banish_evil(int dist); -extern bool_ dispel_evil(int dam); -extern bool_ dispel_good(int dam); -extern bool_ dispel_undead(int dam); -extern bool_ dispel_monsters(int dam); -extern void destroy_area(int y1, int x1, int r); -extern void earthquake(int cy, int cx, int r); -extern void lite_room(int y1, int x1); -extern void unlite_room(int y1, int x1); -extern bool_ lite_area(int dam, int rad); -extern bool_ unlite_area(int dam, int rad); -extern bool_ fire_cloud(int typ, int dir, int dam, int rad, int time); -extern bool_ fire_wave(int typ, int dir, int dam, int rad, int time, s32b eff); -extern bool_ fire_wall(int typ, int dir, int dam, int time); -extern bool_ fire_ball(int typ, int dir, int dam, int rad); -extern bool_ fire_bolt(int typ, int dir, int dam); -extern bool_ fire_beam(int typ, int dir, int dam); -extern void call_chaos(void); -extern bool_ fire_bolt_or_beam(int prob, int typ, int dir, int dam); -extern bool_ lite_line(int dir); -extern bool_ drain_life(int dir, int dam); -extern bool_ wall_to_mud(int dir); -extern bool_ disarm_trap(int dir); -extern bool_ wizard_lock(int dir); -extern bool_ slow_monster(int dir); -extern bool_ sleep_monster(int dir); -extern bool_ confuse_monster(int dir, int plev); -extern bool_ fear_monster(int dir, int plev); -extern bool_ poly_monster(int dir); -extern bool_ teleport_monster(int dir); -extern bool_ trap_creation(void); -extern bool_ destroy_doors_touch(void); -extern bool_ destroy_traps_touch(void); -extern bool_ sleep_monsters_touch(void); -extern bool_ alchemy(void); -extern void activate_ty_curse(void); -extern void activate_dg_curse(void); -extern void summon_cyber(void); -extern bool_ confuse_monsters(int dam); -extern bool_ charm_monsters(int dam); -extern bool_ charm_animals(int dam); -extern bool_ stun_monsters(int dam); -extern bool_ banish_monsters(int dist); -extern bool_ turn_monsters(int dam); -extern bool_ charm_monster(int dir, int plev); -extern bool_ control_one_undead(int dir, int plev); -extern bool_ charm_animal(int dir, int plev); -extern bool_ mindblast_monsters(int dam); -extern void alter_reality(void); -extern void report_magics(void); -extern void teleport_swap(int dir); -extern void swap_position(int lty, int ltx); -extern bool_ item_tester_hook_recharge(object_type *o_ptr); -extern bool_ project_hack(int typ, int dam); -extern void project_meteor(int radius, int typ, int dam, u32b flg); -extern bool_ item_tester_hook_artifactable(object_type *o_ptr); -extern bool_ passwall(int dir, bool_ safe); -extern bool_ project_hook(int typ, int dir, int dam, int flg); -extern bool_ reset_recall(bool_ no_trepas_max_depth); -extern void geomancy_random_wall(int y, int x); -extern void geomancy_random_floor(int y, int x, bool_ kill_wall); -extern void geomancy_dig(int oy, int ox, int dir, int length); -extern void channel_the_elements(int y, int x, int level); -extern void random_resistance (object_type * o_ptr, bool_ is_scroll, int specific); - /* spells4.c */ extern s32b SCHOOL_AIR; diff --git a/src/files.cc b/src/files.cc index 57f0ea99..f4621afd 100644 --- a/src/files.cc +++ b/src/files.cc @@ -15,6 +15,7 @@ #include "mimic.hpp" #include "notes.hpp" #include "skills.hpp" +#include "spells2.hpp" #include "xtra1.hpp" #include <memory> diff --git a/src/lua_bind.cc b/src/lua_bind.cc index 624e7e09..428dfc26 100644 --- a/src/lua_bind.cc +++ b/src/lua_bind.cc @@ -16,6 +16,7 @@ #include "corrupt.hpp" #include "skills.hpp" #include "spell_type.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "range.h" diff --git a/src/melee1.cc b/src/melee1.cc index bacf8986..b8a119f5 100644 --- a/src/melee1.cc +++ b/src/melee1.cc @@ -12,6 +12,7 @@ #include "mimic.hpp" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "store.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/melee2.cc b/src/melee2.cc index 5a3f2301..860c7f94 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -20,6 +20,7 @@ #include "quark.h" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "traps.hpp" #include "xtra2.hpp" diff --git a/src/modules.cc b/src/modules.cc index ed4df558..2c6d886c 100644 --- a/src/modules.cc +++ b/src/modules.cc @@ -10,6 +10,7 @@ #include "birth.hpp" #include "corrupt.hpp" #include "hooks.h" +#include "spells2.hpp" #include <cassert> #include <chrono> diff --git a/src/monster2.cc b/src/monster2.cc index 1998a2c1..12cb81af 100644 --- a/src/monster2.cc +++ b/src/monster2.cc @@ -11,6 +11,7 @@ #include "mimic.hpp" #include "randart.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/object2.cc b/src/object2.cc index 97bbc31f..14e56b2d 100644 --- a/src/object2.cc +++ b/src/object2.cc @@ -14,6 +14,7 @@ #include "mimic.hpp" #include "randart.hpp" #include "skills.hpp" +#include "spells2.hpp" #include "spells3.hpp" #include "spells5.hpp" #include "traps.hpp" diff --git a/src/powers.cc b/src/powers.cc index b0459feb..cef654c6 100644 --- a/src/powers.cc +++ b/src/powers.cc @@ -16,6 +16,7 @@ #include "mimic.hpp" #include "quark.h" #include "spells1.hpp" +#include "spells2.hpp" #include "traps.hpp" #include "xtra2.hpp" diff --git a/src/q_thief.cc b/src/q_thief.cc index 425c8e93..eb686a48 100644 --- a/src/q_thief.cc +++ b/src/q_thief.cc @@ -2,6 +2,7 @@ #include "cave.hpp" #include "hooks.h" +#include "spells2.hpp" #define cquest (quest[QUEST_THIEVES]) diff --git a/src/randart.cc b/src/randart.cc index 4ac8df8d..95bd6b1c 100644 --- a/src/randart.cc +++ b/src/randart.cc @@ -9,6 +9,7 @@ #include "randart.hpp" #include "mimic.hpp" #include "quark.h" +#include "spells2.hpp" #include <memory> #include <vector> diff --git a/src/spells1.cc b/src/spells1.cc index 83cdd0a0..e51b8ee8 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -15,6 +15,7 @@ #include "gods.hpp" #include "skills.hpp" #include "spell_type.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "squeltch.hpp" #include "traps.hpp" diff --git a/src/spells2.cc b/src/spells2.cc index 8ed3a0b7..ad851251 100644 --- a/src/spells2.cc +++ b/src/spells2.cc @@ -6,6 +6,7 @@ * included in all such copies. */ +#include "spells2.hpp" #include "angband.h" #include "cave.hpp" #include "cmd1.hpp" diff --git a/src/spells2.hpp b/src/spells2.hpp new file mode 100644 index 00000000..515cf3c7 --- /dev/null +++ b/src/spells2.hpp @@ -0,0 +1,112 @@ +#pragma once + +#include "angband.h" + +extern void curse_artifact(object_type * o_ptr); +extern void grow_things(s16b type, int rad); +extern void grow_grass(int rad); +extern void grow_trees(int rad); +extern bool_ hp_player(int num); +extern bool_ heal_insanity(int val); +extern void warding_glyph(void); +extern void explosive_rune(void); +extern bool_ do_dec_stat(int stat, int mode); +extern bool_ do_res_stat(int stat, bool_ full); +extern bool_ do_inc_stat(int stat); +extern void identify_hooks(int i, object_type *o_ptr, identify_mode type); +extern bool_ identify_pack(void); +extern void identify_pack_fully(void); +extern bool_ remove_curse(void); +extern bool_ remove_all_curse(void); +extern bool_ restore_level(void); +extern void self_knowledge(FILE *fff); +extern bool_ lose_all_info(void); +extern bool_ detect_traps(int rad); +extern bool_ detect_doors(int rad); +extern bool_ detect_stairs(int rad); +extern bool_ detect_treasure(int rad); +extern bool_ detect_objects_gold(int rad); +extern bool_ detect_objects_normal(int rad); +extern bool_ detect_monsters_normal(int rad); +extern bool_ detect_monsters_invis(int rad); +extern bool_ detect_monsters_xxx(u32b match_flag, int rad); +extern bool_ detect_all(int rad); +extern void stair_creation(void); +extern bool_ wall_stone(int y, int x); +extern bool_ enchant(object_type *o_ptr, int n, int eflag); +extern bool_ enchant_spell(int num_hit, int num_dam, int num_ac, int num_pval); +extern bool_ ident_spell(void); +extern bool_ ident_all(void); +extern bool_ identify_fully(void); +extern bool_ recharge(int num); +extern void aggravate_monsters(int who); +extern bool_ genocide_aux(bool_ player_cast, char typ); +extern bool_ genocide(bool_ player_cast); +extern bool_ mass_genocide(bool_ player_cast); +extern void do_probe(int m_idx); +extern bool_ probing(void); +extern void change_wild_mode(void); +extern bool_ banish_evil(int dist); +extern bool_ dispel_evil(int dam); +extern bool_ dispel_good(int dam); +extern bool_ dispel_undead(int dam); +extern bool_ dispel_monsters(int dam); +extern void destroy_area(int y1, int x1, int r); +extern void earthquake(int cy, int cx, int r); +extern void lite_room(int y1, int x1); +extern void unlite_room(int y1, int x1); +extern bool_ lite_area(int dam, int rad); +extern bool_ unlite_area(int dam, int rad); +extern bool_ fire_cloud(int typ, int dir, int dam, int rad, int time); +extern bool_ fire_wave(int typ, int dir, int dam, int rad, int time, s32b eff); +extern bool_ fire_wall(int typ, int dir, int dam, int time); +extern bool_ fire_ball(int typ, int dir, int dam, int rad); +extern bool_ fire_bolt(int typ, int dir, int dam); +extern bool_ fire_beam(int typ, int dir, int dam); +extern void call_chaos(void); +extern bool_ fire_bolt_or_beam(int prob, int typ, int dir, int dam); +extern bool_ lite_line(int dir); +extern bool_ drain_life(int dir, int dam); +extern bool_ wall_to_mud(int dir); +extern bool_ disarm_trap(int dir); +extern bool_ wizard_lock(int dir); +extern bool_ slow_monster(int dir); +extern bool_ sleep_monster(int dir); +extern bool_ confuse_monster(int dir, int plev); +extern bool_ fear_monster(int dir, int plev); +extern bool_ poly_monster(int dir); +extern bool_ teleport_monster(int dir); +extern bool_ trap_creation(void); +extern bool_ destroy_doors_touch(void); +extern bool_ destroy_traps_touch(void); +extern bool_ sleep_monsters_touch(void); +extern bool_ alchemy(void); +extern void activate_ty_curse(void); +extern void activate_dg_curse(void); +extern void summon_cyber(void); +extern bool_ confuse_monsters(int dam); +extern bool_ charm_monsters(int dam); +extern bool_ charm_animals(int dam); +extern bool_ stun_monsters(int dam); +extern bool_ banish_monsters(int dist); +extern bool_ turn_monsters(int dam); +extern bool_ charm_monster(int dir, int plev); +extern bool_ control_one_undead(int dir, int plev); +extern bool_ charm_animal(int dir, int plev); +extern bool_ mindblast_monsters(int dam); +extern void alter_reality(void); +extern void report_magics(void); +extern void teleport_swap(int dir); +extern void swap_position(int lty, int ltx); +extern bool_ item_tester_hook_recharge(object_type *o_ptr); +extern bool_ project_hack(int typ, int dam); +extern void project_meteor(int radius, int typ, int dam, u32b flg); +extern bool_ item_tester_hook_artifactable(object_type *o_ptr); +extern bool_ passwall(int dir, bool_ safe); +extern bool_ project_hook(int typ, int dir, int dam, int flg); +extern bool_ reset_recall(bool_ no_trepas_max_depth); +extern void geomancy_random_wall(int y, int x); +extern void geomancy_random_floor(int y, int x, bool_ kill_wall); +extern void geomancy_dig(int oy, int ox, int dir, int length); +extern void channel_the_elements(int y, int x, int level); +extern void random_resistance (object_type * o_ptr, bool_ is_scroll, int specific); diff --git a/src/spells3.cc b/src/spells3.cc index 5f24e934..a36dcf1d 100644 --- a/src/spells3.cc +++ b/src/spells3.cc @@ -7,6 +7,7 @@ #include "spell_type.hpp" #include "spell_idx_list.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "spells5.hpp" #include "mimic.hpp" #include "xtra2.hpp" diff --git a/src/traps.cc b/src/traps.cc index b6cb0b85..a45dfd59 100644 --- a/src/traps.cc +++ b/src/traps.cc @@ -13,6 +13,7 @@ #include "cmd2.hpp" #include "gods.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/wizard2.cc b/src/wizard2.cc index c1ad19e6..2be1dba6 100644 --- a/src/wizard2.cc +++ b/src/wizard2.cc @@ -16,6 +16,7 @@ #include "randart.hpp" #include "status.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "traps.hpp" #include "xtra1.hpp" #include "xtra2.hpp" diff --git a/src/xtra2.cc b/src/xtra2.cc index de8245eb..2f374fde 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -19,6 +19,7 @@ #include "randart.hpp" #include "skills.hpp" #include "spells1.hpp" +#include "spells2.hpp" #include "wizard2.hpp" #include "xtra1.hpp" |