diff options
author | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
commit | d6b913d3ca2e84b75f3675fd6e9f5246c100cf27 (patch) | |
tree | 5fc28b7efc737bf2c79dc7d799e0a6013957fe11 /src/spells1.hpp | |
parent | c42f029316c0c004a795ca170bdb50644a800534 (diff) | |
parent | 73a0259be1d44fdb2ab34266ae0ff63f0d8f0b60 (diff) |
Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1
Diffstat (limited to 'src/spells1.hpp')
-rw-r--r-- | src/spells1.hpp | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/src/spells1.hpp b/src/spells1.hpp index 5512063f..ec8f2cc9 100644 --- a/src/spells1.hpp +++ b/src/spells1.hpp @@ -1,32 +1,35 @@ #pragma once +#include <string> + #include "h-basic.h" +#include "random_spell_fwd.hpp" -extern byte spell_color(int type); -extern s16b poly_r_idx(int r_idx); -extern void get_pos_player(int dis, int *ny, int *nx); +byte spell_color(int type); +s16b poly_r_idx(int r_idx); +void get_pos_player(int dis, int *ny, int *nx); extern bool_ teleport_player_bypass; -extern void teleport_player_directed(int rad, int dir); -extern void teleport_away(int m_idx, int dis); -extern void teleport_player(int dis); -extern void teleport_player_to(int ny, int nx); -extern void teleport_monster_to(int m_idx, int ny, int nx); -extern void teleport_player_level(void); -extern void recall_player(int d, int f); -extern void take_hit(int damage, cptr kb_str); -extern void take_sanity_hit(int damage, cptr hit_from); -extern void acid_dam(int dam, cptr kb_str); -extern void elec_dam(int dam, cptr kb_str); -extern void fire_dam(int dam, cptr kb_str); -extern void cold_dam(int dam, cptr kb_str); -extern bool_ dec_stat(int stat, int amount, int mode); -extern bool_ res_stat(int stat, bool_ full); -extern bool_ apply_disenchant(int mode); -extern bool_ project_m(int who, int r, int y, int x, int dam, int typ); -extern bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg); -extern bool_ potion_smash_effect(int who, int y, int x, int o_sval); -extern void do_poly_self(void); -extern void corrupt_player(void); -extern void generate_spell(int plev); -extern bool_ unsafe; -extern s16b do_poly_monster(int y, int x); +void teleport_player_directed(int rad, int dir); +void teleport_away(int m_idx, int dis); +void teleport_player(int dis); +void teleport_player_to(int ny, int nx); +void teleport_monster_to(int m_idx, int ny, int nx); +void teleport_player_level(); +void recall_player(int d, int f); +void take_hit(int damage, cptr kb_str); +void take_sanity_hit(int damage, cptr hit_from); +void acid_dam(int dam, cptr kb_str); +void elec_dam(int dam, cptr kb_str); +void fire_dam(int dam, cptr kb_str); +void cold_dam(int dam, cptr kb_str); +bool_ dec_stat(int stat, int amount, int mode); +bool_ res_stat(int stat, bool_ full); +bool_ apply_disenchant(int mode); +bool_ project_m(int who, int r, int y, int x, int dam, int typ); +bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg); +bool_ potion_smash_effect(int who, int y, int x, int o_sval); +void do_poly_self(); +void corrupt_player(); +std::string name_spell(random_spell const *); +void generate_spell(int plev); +s16b do_poly_monster(int y, int x); |