summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-22 13:05:39 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-22 13:05:39 +0100
commitbe1a50f85972c88e75ef8a1ee375f55ec94ba18d (patch)
treef0c12ab91185ee238b9c75c441927de6686474aa
parent2d1fcfab1d6acfcbe3f0006b2fd1fffa2d139e3d (diff)
Fix Clang warnings
-rw-r--r--src/include/tome/squelch/rule.hpp4
-rw-r--r--src/spells3.cc3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/include/tome/squelch/rule.hpp b/src/include/tome/squelch/rule.hpp
index d5cc5953..4d4c7c53 100644
--- a/src/include/tome/squelch/rule.hpp
+++ b/src/include/tome/squelch/rule.hpp
@@ -152,8 +152,8 @@ public:
json_t *to_json() const override;
protected:
- virtual void do_write_tree(TreePrinter *p) const;
- virtual bool do_apply_rule(object_type *o_ptr, int) const;
+ virtual void do_write_tree(TreePrinter *p) const override;
+ virtual bool do_apply_rule(object_type *o_ptr, int) const override;
private:
// Inscription to use for inscription rules.
diff --git a/src/spells3.cc b/src/spells3.cc
index 16a016bd..2e709391 100644
--- a/src/spells3.cc
+++ b/src/spells3.cc
@@ -2318,12 +2318,11 @@ casting_result meta_spellbinder()
{
if (p_ptr->spellbinder_num != 0)
{
- typedef struct trigger trigger;
struct trigger {
int idx;
cptr desc;
};
- trigger triggers[] = {
+ struct trigger triggers[] = {
{ SPELLBINDER_HP75, "75% HP", },
{ SPELLBINDER_HP50, "50% HP", },
{ SPELLBINDER_HP25, "25% HP", },