openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Add override annotations on iLiving hierarchy

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-22 17:32:31 -05:00
parent 9931ef8ffe
commit 346be973a6
3 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/universe/creature.hpp
View File

@@ -34,31 +34,31 @@ public:
cCreature(); cCreature();
cCreature(int num); cCreature(int num);
void heal(int how_much); void heal(int how_much) override;
void poison(int how_much); void poison(int how_much) override;
void cure(int how_much); void cure(int how_much) override;
void acid(int how_much); void acid(int how_much) override;
void curse(int how_much); void curse(int how_much) override;
void slow(int how_much); void slow(int how_much) override;
void web(int how_much); void web(int how_much) override;
void disease(int how_much); void disease(int how_much) override;
void dumbfound(int how_much); void dumbfound(int how_much) override;
void scare(int how_much); void scare(int how_much) override;
void sleep(eStatus type, int how_much, int adj); void sleep(eStatus type, int how_much, int adj) override;
void avatar(); void avatar() override;
void drain_sp(int how_much, bool allow_resist); void drain_sp(int how_much, bool allow_resist) override;
void restore_sp(int how_much); void restore_sp(int how_much) override;
int get_health() const; int get_health() const override;
int get_magic() const; int get_magic() const override;
int get_level() const; int get_level() const override;
bool is_alive() const; bool is_alive() const override;
bool is_friendly() const; bool is_friendly() const override;
bool is_friendly(const iLiving& other) const; bool is_friendly(const iLiving& other) const override;
bool is_shielded() const; bool is_shielded() const override;
int get_shared_dmg(int base_dmg) const; int get_shared_dmg(int base_dmg) const override;
location get_loc() const; location get_loc() const override;
int magic_adjust(int base); int magic_adjust(int base);

50
src/universe/party.hpp
View File

@@ -153,33 +153,33 @@ public:
void import_legacy(legacy::pc_record_type(& old)[6]); void import_legacy(legacy::pc_record_type(& old)[6]);
bool is_in_scenario() const; bool is_in_scenario() const;
bool is_alive() const; bool is_alive() const override;
bool is_friendly() const; bool is_friendly() const override;
bool is_friendly(const iLiving& other) const; bool is_friendly(const iLiving& other) const override;
bool is_shielded() const; bool is_shielded() const override;
int get_shared_dmg(int base_dmg) const; int get_shared_dmg(int base_dmg) const override;
location get_loc() const; location get_loc() const override;
void apply_status(eStatus which, int how_much); void apply_status(eStatus which, int how_much) override;
void heal(int how_much); void heal(int how_much) override;
void poison(int how_much); void poison(int how_much) override;
void cure(int how_much); void cure(int how_much) override;
void acid(int how_much); void acid(int how_much) override;
void curse(int how_much); void curse(int how_much) override;
void slow(int how_much); void slow(int how_much) override;
void web(int how_much); void web(int how_much) override;
void disease(int how_much); void disease(int how_much) override;
void dumbfound(int how_much); void dumbfound(int how_much) override;
void scare(int how_much); void scare(int how_much) override;
void sleep(eStatus type, int how_much, int adj); void sleep(eStatus type, int how_much, int adj) override;
void clear_bad_status(); void clear_bad_status() override;
void avatar(); void avatar() override;
void drain_sp(int how_much, bool allow_resist); void drain_sp(int how_much, bool allow_resist) override;
void restore_sp(int how_much); void restore_sp(int how_much) override;
int get_health() const; int get_health() const override;
int get_magic() const; int get_magic() const override;
int get_level() const; int get_level() const override;
int calc_day() const; int calc_day() const;
std::unique_ptr<cPlayer> remove_pc(size_t spot); std::unique_ptr<cPlayer> remove_pc(size_t spot);

48
src/universe/pc.hpp
View File

@@ -110,33 +110,33 @@ public:
short parry = 0; short parry = 0;
iLiving* last_attacked = nullptr; // Note: Currently this is assigned but never read iLiving* last_attacked = nullptr; // Note: Currently this is assigned but never read
bool is_alive() const; bool is_alive() const override;
bool is_friendly(const iLiving& other) const; bool is_friendly(const iLiving& other) const override;
bool is_friendly() const; bool is_friendly() const override;
bool is_shielded() const; bool is_shielded() const override;
int get_shared_dmg(int base_dmg) const; int get_shared_dmg(int base_dmg) const override;
int get_health() const; int get_health() const override;
int get_magic() const; int get_magic() const override;
int get_level() const; int get_level() const override;
location get_loc() const; location get_loc() const override;
void finish_create(); void finish_create();
void void_sanctuary(); void void_sanctuary() override;
void heal(int how_much); void heal(int how_much) override;
void poison(int how_much); void poison(int how_much) override;
void cure(int how_much); void cure(int how_much) override;
void acid(int how_much); void acid(int how_much) override;
void curse(int how_much); void curse(int how_much) override;
void slow(int how_much); void slow(int how_much) override;
void web(int how_much); void web(int how_much) override;
void disease(int how_much); void disease(int how_much) override;
void dumbfound(int how_much); void dumbfound(int how_much) override;
void scare(int how_much); void scare(int how_much) override;
void sleep(eStatus type, int how_much, int adj); void sleep(eStatus type, int how_much, int adj) override;
void avatar(); void avatar() override;
void drain_sp(int how_much, bool allow_resist); void drain_sp(int how_much, bool allow_resist) override;
void restore_sp(int how_much); void restore_sp(int how_much) override;
void combine_things(); void combine_things();
void sort_items(); void sort_items();