diff options
author | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 11:57:49 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
commit | 45ec003a1de7857ac7dddb0732a9d005612b886f (patch) | |
tree | 9bb9005cd2fb296898af45fb1cef3b81f6e45470 | |
parent | 2e65b441b27f1897fa5a5e468cae2dade7139f5f (diff) |
Remove spurious FIXMEs
-rw-r--r-- | src/spell_idx_list.hpp | 3 | ||||
-rw-r--r-- | src/spell_type.cc | 11 | ||||
-rw-r--r-- | src/spells4.cc | 4 | ||||
-rw-r--r-- | src/spells6.cc | 3 |
4 files changed, 7 insertions, 14 deletions
diff --git a/src/spell_idx_list.hpp b/src/spell_idx_list.hpp index ad913e83..5f817452 100644 --- a/src/spell_idx_list.hpp +++ b/src/spell_idx_list.hpp @@ -2,10 +2,7 @@ #include "spell_idx_list_fwd.h" #include <vector> -// FIXME: h-basic for the s32b? struct spell_idx_list { - // FIXME: stupidity because we can't "override" a fwd-declared-struct directly std::vector<s32b> v; }; - diff --git a/src/spell_type.cc b/src/spell_type.cc index 50aadc30..5d830d8a 100644 --- a/src/spell_type.cc +++ b/src/spell_type.cc @@ -17,7 +17,6 @@ */ struct spell_type { - // FIXME: most of this stuff shouldn't be public cptr name; /* Name */ byte skill_level; /* Required level (to learn) */ std::vector<std::string> m_description; /* List of strings */ @@ -36,7 +35,7 @@ struct spell_type bool_ castable_while_confused; dice_type device_charges; /* Number of charges for devices */ - std::vector<device_allocation *> m_device_allocation; /* Allocation table for devices */ /* FIXME: shouldn't really be pointer-to, but... */ + std::vector<device_allocation *> m_device_allocation; /* Allocation table for devices */ s16b random_type; /* Type of random items in which skill may appear */ @@ -54,8 +53,6 @@ struct spell_type public: - // FIXME: forbi copy-ctor + move + etc? - spell_type(cptr _name): name(_name), skill_level(0), @@ -65,7 +62,7 @@ public: lasting_func(nullptr), depend_func(nullptr), minimum_pval(0), - casting_type(USE_SPELL_POINTS /* FIXME: ??? */), + casting_type(USE_SPELL_POINTS), casting_stat(0), castable_while_blind(FALSE), castable_while_confused(FALSE), @@ -320,7 +317,7 @@ void spell_type_description_foreach(spell_type *spell, void (*callback)(void *da assert(callback != NULL); for (auto line: spell->m_description) { - callback(data, line.c_str()); // FIXME: inefficient and dangerous! + callback(data, line.c_str()); } } @@ -337,7 +334,7 @@ void spell_type_activation_description(spell_type *spell, char *buf) assert(spell->m_description.size() > 0); - sprintf(buf, "%s every %s turns", spell->m_description.at(0).c_str() /* FIXME: ugh */, turns); + sprintf(buf, "%s every %s turns", spell->m_description.at(0).c_str(), turns); } int spell_type_activation_roll_timeout(spell_type *spell) diff --git a/src/spells4.cc b/src/spells4.cc index 22215f04..569583c5 100644 --- a/src/spells4.cc +++ b/src/spells4.cc @@ -109,7 +109,7 @@ school_book_type *school_books_at(int i) static void school_book_init(school_book_type *school_book) { - school_book->spell_idx_list = new spell_idx_list(); // FIXME: This whole thing should really be in the ctor?!? + school_book->spell_idx_list = new spell_idx_list(); } void school_book_add_spell(school_book_type *school_book, s32b spell_idx) @@ -150,7 +150,7 @@ bool_ school_book_contains_spell(int sval, s32b spell_idx) { random_book_setup(sval, spell_idx); school_book_type *school_book = school_books_at(sval); - return (school_book->spell_idx_list->v.end() != // FIXME: Oh, the horror! Is there really no shortcut?!? + return (school_book->spell_idx_list->v.end() != std::find(school_book->spell_idx_list->v.begin(), school_book->spell_idx_list->v.end(), spell_idx)); diff --git a/src/spells6.cc b/src/spells6.cc index b829ea0e..eeb41a0e 100644 --- a/src/spells6.cc +++ b/src/spells6.cc @@ -6,7 +6,6 @@ struct school_provider { - // FIXME: make school_provider_new a ctor instead... byte deity_idx; /* Deity which provides school levels */ s16b skill_idx; /* Skill used for determining the boost */ @@ -17,7 +16,7 @@ struct school_provider }; struct school_provider_list { -public: // FIXME: because of lack of definition... +public: std::vector<school_provider> v; }; |