From cc857c940cfe1bfe8d78674dbce53e5b71acaf41 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Move ability_type::acquired to p_ptr struct This is justified by the fact that the 'acquired' flag is actually a player-centered bit of information and must be loaded/saved. Everything else in ability_type is defined by the *.txt files. --- src/skills.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/skills.hpp') diff --git a/src/skills.hpp b/src/skills.hpp index 6c1880a6..4cd63358 100644 --- a/src/skills.hpp +++ b/src/skills.hpp @@ -22,6 +22,5 @@ extern void init_skill(s32b value, s32b mod, int i); extern s16b find_ability(cptr name); extern void dump_abilities(FILE *fff); extern void do_cmd_ability(void); -extern bool_ has_ability(int ab); extern void apply_level_abilities(int level); extern void recalc_skills(bool_ init); -- cgit v1.2.1 From 765e1a3dc7abce3a849b8d1f124ada7a6984154a Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move s_{info,descriptors} to Game/GameEdtiData --- src/skills.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/skills.hpp') diff --git a/src/skills.hpp b/src/skills.hpp index 4cd63358..694b29e9 100644 --- a/src/skills.hpp +++ b/src/skills.hpp @@ -15,10 +15,10 @@ extern s16b get_melee_skills(void); extern s16b get_melee_skill(void); extern bool_ forbid_gloves(void); extern bool_ forbid_non_blessed(void); -extern void compute_skills(s32b *v, s32b *m, int i); +extern void compute_skills(s32b *v, s32b *m, std::size_t i); extern void select_default_melee(void); extern void do_get_new_skill(void); -extern void init_skill(s32b value, s32b mod, int i); +extern void init_skill(s32b value, s32b mod, std::size_t i); extern s16b find_ability(cptr name); extern void dump_abilities(FILE *fff); extern void do_cmd_ability(void); -- cgit v1.2.1 From ec9527e2f0c4394f8c2acede78c81e90421b4b09 Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Thu, 6 Oct 2016 03:02:30 +0300 Subject: Added missing #includes --- src/skills.hpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/skills.hpp') diff --git a/src/skills.hpp b/src/skills.hpp index 694b29e9..4872d448 100644 --- a/src/skills.hpp +++ b/src/skills.hpp @@ -2,6 +2,8 @@ #include "h-basic.h" +#include + /* Skill functions */ extern void dump_skills(FILE *fff); extern s16b find_skill(cptr name); -- cgit v1.2.1 From a40e1d524849e22edf2fb65b5c2fedbe47a59b81 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant "extern" on function declarations --- src/skills.hpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/skills.hpp') diff --git a/src/skills.hpp b/src/skills.hpp index 4872d448..edb96796 100644 --- a/src/skills.hpp +++ b/src/skills.hpp @@ -5,24 +5,24 @@ #include /* Skill functions */ -extern void dump_skills(FILE *fff); -extern s16b find_skill(cptr name); -extern s16b find_skill_i(cptr name); -extern s16b get_skill(int skill); -extern s16b get_skill_scale(int skill, u32b scale); -extern void do_cmd_skill(void); -extern void do_cmd_activate_skill(void); -extern cptr get_melee_name(); -extern s16b get_melee_skills(void); -extern s16b get_melee_skill(void); -extern bool_ forbid_gloves(void); -extern bool_ forbid_non_blessed(void); -extern void compute_skills(s32b *v, s32b *m, std::size_t i); -extern void select_default_melee(void); -extern void do_get_new_skill(void); -extern void init_skill(s32b value, s32b mod, std::size_t i); -extern s16b find_ability(cptr name); -extern void dump_abilities(FILE *fff); -extern void do_cmd_ability(void); -extern void apply_level_abilities(int level); -extern void recalc_skills(bool_ init); +void dump_skills(FILE *fff); +s16b find_skill(cptr name); +s16b find_skill_i(cptr name); +s16b get_skill(int skill); +s16b get_skill_scale(int skill, u32b scale); +void do_cmd_skill(void); +void do_cmd_activate_skill(void); +cptr get_melee_name(); +s16b get_melee_skills(void); +s16b get_melee_skill(void); +bool_ forbid_gloves(void); +bool_ forbid_non_blessed(void); +void compute_skills(s32b *v, s32b *m, std::size_t i); +void select_default_melee(void); +void do_get_new_skill(void); +void init_skill(s32b value, s32b mod, std::size_t i); +s16b find_ability(cptr name); +void dump_abilities(FILE *fff); +void do_cmd_ability(void); +void apply_level_abilities(int level); +void recalc_skills(bool_ init); -- cgit v1.2.1 From 6a35e3de332df186eab39c3b67506882409a3ca2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant (void) parameters and return value casts --- src/skills.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/skills.hpp') diff --git a/src/skills.hpp b/src/skills.hpp index edb96796..8b1437d9 100644 --- a/src/skills.hpp +++ b/src/skills.hpp @@ -10,19 +10,19 @@ s16b find_skill(cptr name); s16b find_skill_i(cptr name); s16b get_skill(int skill); s16b get_skill_scale(int skill, u32b scale); -void do_cmd_skill(void); -void do_cmd_activate_skill(void); +void do_cmd_skill(); +void do_cmd_activate_skill(); cptr get_melee_name(); -s16b get_melee_skills(void); -s16b get_melee_skill(void); -bool_ forbid_gloves(void); -bool_ forbid_non_blessed(void); +s16b get_melee_skills(); +s16b get_melee_skill(); +bool_ forbid_gloves(); +bool_ forbid_non_blessed(); void compute_skills(s32b *v, s32b *m, std::size_t i); -void select_default_melee(void); -void do_get_new_skill(void); +void select_default_melee(); +void do_get_new_skill(); void init_skill(s32b value, s32b mod, std::size_t i); s16b find_ability(cptr name); void dump_abilities(FILE *fff); -void do_cmd_ability(void); +void do_cmd_ability(); void apply_level_abilities(int level); void recalc_skills(bool_ init); -- cgit v1.2.1