[Scummvm-git-logs] scummvm master -> 3a6988972d44913cc9c0f37b6506dccfef3c5675
sev-
sev at scummvm.org
Sun Feb 2 21:07:48 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3a6988972d NUVIE: Added override keywords
Commit: 3a6988972d44913cc9c0f37b6506dccfef3c5675
https://github.com/scummvm/scummvm/commit/3a6988972d44913cc9c0f37b6506dccfef3c5675
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T22:07:25+01:00
Commit Message:
NUVIE: Added override keywords
Changed paths:
engines/ultima/nuvie/actors/md_actor.h
engines/ultima/nuvie/actors/se_actor.h
engines/ultima/nuvie/core/anim_manager.h
engines/ultima/nuvie/core/timed_event.h
engines/ultima/nuvie/files/nuvie_io_file.h
engines/ultima/nuvie/gui/widgets/command_bar.h
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
engines/ultima/nuvie/usecode/u6_usecode.h
engines/ultima/nuvie/views/scroll_widget_gump.h
diff --git a/engines/ultima/nuvie/actors/md_actor.h b/engines/ultima/nuvie/actors/md_actor.h
index 4e303b1..5abd326 100644
--- a/engines/ultima/nuvie/actors/md_actor.h
+++ b/engines/ultima/nuvie/actors/md_actor.h
@@ -37,19 +37,19 @@ public:
~MDActor();
virtual bool init(uint8 unused = 0) override;
- bool will_not_talk();
- uint8 get_maxhp() {
+ bool will_not_talk() override;
+ uint8 get_maxhp() override {
return (((level * 24 + strength * 2) < 255) ? (level * 24 + strength * 2) : 255);
}
- uint8 get_hp_text_color();
- uint8 get_str_text_color();
- uint8 get_dex_text_color();
- bool is_immobile();
-
- bool check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0);
- virtual uint16 get_downward_facing_tile_num();
- void set_direction(uint8 d);
- bool is_passable();
+ uint8 get_hp_text_color() override;
+ uint8 get_str_text_color() override;
+ uint8 get_dex_text_color() override;
+ bool is_immobile() override;
+
+ bool check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0) override;
+ virtual uint16 get_downward_facing_tile_num() override;
+ void set_direction(uint8 d) override;
+ bool is_passable() override;
};
diff --git a/engines/ultima/nuvie/actors/se_actor.h b/engines/ultima/nuvie/actors/se_actor.h
index 76621c6..3dab344 100644
--- a/engines/ultima/nuvie/actors/se_actor.h
+++ b/engines/ultima/nuvie/actors/se_actor.h
@@ -38,8 +38,8 @@ public:
~SEActor();
virtual bool init(uint8 unused = 0) override;
- bool will_not_talk();
- uint8 get_maxhp() {
+ bool will_not_talk() override;
+ uint8 get_maxhp() override {
return (((level * 4 + strength * 2) < 255) ? (level * 4 + strength * 2) : 255);
}
};
diff --git a/engines/ultima/nuvie/core/anim_manager.h b/engines/ultima/nuvie/core/anim_manager.h
index eb5db34..5940cbd 100644
--- a/engines/ultima/nuvie/core/anim_manager.h
+++ b/engines/ultima/nuvie/core/anim_manager.h
@@ -347,9 +347,9 @@ class ExplosiveAnim : public TimedAnim {
public:
ExplosiveAnim(MapCoord *start, uint32 size);
~ExplosiveAnim();
- void start();
+ void start() override;
virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
- bool update();
+ bool update() override;
bool already_hit(MapEntity ent);
void hit_object(Obj *obj);
void hit_actor(Actor *actor);
@@ -441,14 +441,14 @@ protected:
class HitAnim : public TimedAnim {
Actor *hit_actor;
- bool update();
+ bool update() override;
public:
HitAnim(MapCoord *loc);
HitAnim(Actor *actor);
virtual uint16 callback(uint16 msg, CallBack *caller, void *msg_data) override;
- void start() {
+ void start() override {
start_timer(300);
}
};
diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index c91689a..421f45b 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -153,7 +153,7 @@ public:
TimedPartyMove(uint32 step_delay = 500);
~TimedPartyMove();
void init(MapCoord *d, MapCoord *t, Obj *use_obj);
- void timed(uint32 evtime);
+ void timed(uint32 evtime) override;
virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
diff --git a/engines/ultima/nuvie/files/nuvie_io_file.h b/engines/ultima/nuvie/files/nuvie_io_file.h
index cd46072..4e89151 100644
--- a/engines/ultima/nuvie/files/nuvie_io_file.h
+++ b/engines/ultima/nuvie/files/nuvie_io_file.h
@@ -91,15 +91,15 @@ public:
virtual void close() override;
virtual void seek(uint32 new_pos) override;
- bool write1(uint8 src);
- bool write2(uint16 src);
- bool write4(uint32 src);
+ bool write1(uint8 src) override;
+ bool write2(uint16 src) override;
+ bool write4(uint32 src) override;
void writeDesc(const Common::String &desc) {
_description = desc;
}
virtual uint32 writeBuf(const unsigned char *src, uint32 src_size) override;
- uint32 write(NuvieIO *src);
+ uint32 write(NuvieIO *src) override;
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar.h b/engines/ultima/nuvie/gui/widgets/command_bar.h
index dc5f779..6bf3f3b 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar.h
+++ b/engines/ultima/nuvie/gui/widgets/command_bar.h
@@ -72,8 +72,8 @@ public:
~CommandBar();
virtual bool init_buttons();
- virtual void Display(bool full_redraw);
- virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
+ virtual void Display(bool full_redraw) override;
+ virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
void update() {
update_display = true;
}
@@ -96,8 +96,8 @@ public:
virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
bool load(NuvieIO *objlist);
bool save(NuvieIO *objlist);
- bool drag_accept_drop(int x, int y, int message, void *data); // needed for !orig_style
- void drag_perform_drop(int x, int y, int message, void *data); // needed for !orig_style
+ bool drag_accept_drop(int x, int y, int message, void *data) override; // needed for !orig_style
+ void drag_perform_drop(int x, int y, int message, void *data) override; // needed for !orig_style
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
index 681bb66..f9d52a1 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -68,35 +68,35 @@ public:
return GUI_PASS;
}
virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
- bool can_display_prompt() {
+ bool can_display_prompt() override {
return false;
}
- bool can_fit_token_on_msgline(MsgLine *msg_line, MsgText *token);
+ bool can_fit_token_on_msgline(MsgLine *msg_line, MsgText *token) override;
- void Display(bool full_redraw);
+ void Display(bool full_redraw) override;
- void display_prompt() {}
+ void display_prompt() override {}
- void display_string(Std::string s, Font *f, bool include_on_map_window);
+ void display_string(Std::string s, Font *f, bool include_on_map_window) override;
- void set_font(uint8 font_type);
- bool is_garg_font();
+ void set_font(uint8 font_type) override;
+ bool is_garg_font() override;
- GUI_status KeyDown(const Common::KeyState &key);
- GUI_status MouseDown(int x, int y, Shared::MouseButton button);
+ GUI_status KeyDown(const Common::KeyState &key) override;
+ GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
- void move_scroll_down() {
+ void move_scroll_down() override {
scroll_movement_event(SCROLL_DOWN);
}
- void move_scroll_up() {
+ void move_scroll_up() override {
scroll_movement_event(SCROLL_UP);
}
protected:
- MsgLine *add_new_line();
+ MsgLine *add_new_line() override;
private:
GUI_status scroll_movement_event(ScrollEventType event);
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.h b/engines/ultima/nuvie/usecode/u6_usecode.h
index 05c7d37..e43351b 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.h
+++ b/engines/ultima/nuvie/usecode/u6_usecode.h
@@ -76,38 +76,38 @@ public:
U6UseCode(Game *g, Configuration *cfg);
~U6UseCode();
- bool use_obj(Obj *obj, Actor *actor);
- bool look_obj(Obj *obj, Actor *actor);
- bool pass_obj(Obj *obj, Actor *actor, uint16 x, uint16 y);
- bool search_obj(Obj *obj, Actor *actor);
- bool move_obj(Obj *obj, sint16 rel_x, sint16 rel_y);
- bool load_obj(Obj *obj);
- bool message_obj(Obj *obj, CallbackMessage msg, void *msg_data);
- bool ready_obj(Obj *obj, Actor *actor);
- bool get_obj(Obj *obj, Actor *actor);
- bool drop_obj(Obj *obj, Actor *actor, uint16 x, uint16 y, uint16 qty = 0);
-
- bool has_usecode(Obj *obj, UseCodeEvent ev = USE_EVENT_USE);
- bool has_usecode(Actor *actor, UseCodeEvent ev = USE_EVENT_USE);
- bool cannot_unready(Obj *obj);
+ bool use_obj(Obj *obj, Actor *actor) override;
+ bool look_obj(Obj *obj, Actor *actor) override;
+ bool pass_obj(Obj *obj, Actor *actor, uint16 x, uint16 y) override;
+ bool search_obj(Obj *obj, Actor *actor) override;
+ bool move_obj(Obj *obj, sint16 rel_x, sint16 rel_y) override;
+ bool load_obj(Obj *obj) override;
+ bool message_obj(Obj *obj, CallbackMessage msg, void *msg_data) override;
+ bool ready_obj(Obj *obj, Actor *actor) override;
+ bool get_obj(Obj *obj, Actor *actor) override;
+ bool drop_obj(Obj *obj, Actor *actor, uint16 x, uint16 y, uint16 qty = 0) override;
+
+ bool has_usecode(Obj *obj, UseCodeEvent ev = USE_EVENT_USE) override;
+ bool has_usecode(Actor *actor, UseCodeEvent ev = USE_EVENT_USE) override;
+ bool cannot_unready(Obj *obj) override;
bool is_door(Obj *obj) {
return (obj->obj_n >= 297 && obj->obj_n <= 300);
}
- bool is_unlocked_door(Obj *obj) {
+ bool is_unlocked_door(Obj *obj) override {
return (is_door(obj) && obj->frame_n != 9 && obj->frame_n != 11);
}
- bool is_locked_door(Obj *obj) {
+ bool is_locked_door(Obj *obj) override {
return (is_door(obj) && (obj->frame_n == 9 || obj->frame_n == 11));
}
bool is_magically_locked_door(Obj *obj) {
return (is_door(obj) && (obj->frame_n == 13 || obj->frame_n == 15));
}
- bool is_closed_door(Obj *obj) {
+ bool is_closed_door(Obj *obj) override {
return (is_door(obj) && obj->frame_n > 3);
}
- bool is_chest(Obj *obj) {
+ bool is_chest(Obj *obj) override {
return (obj->obj_n == OBJ_U6_CHEST);
}
bool is_closed_chest(Obj *obj) {
@@ -137,10 +137,10 @@ public:
void unlock(Obj *obj);
void lock(Obj *obj);
- bool is_food(Obj *obj);
- bool is_container(Obj *obj);
- bool is_container(uint16 obj_n, uint8 frame_n);
- bool is_readable(Obj *obj);
+ bool is_food(Obj *obj) override;
+ bool is_container(Obj *obj) override;
+ bool is_container(uint16 obj_n, uint8 frame_n) override;
+ bool is_readable(Obj *obj) override;
virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
@@ -221,7 +221,7 @@ protected:
void sundial_set_shadow(Obj *sundial, uint8 hour);
void extinguish_torch(Obj *obj);
void light_torch(Obj *obj);
- bool process_effects(Obj *container_obj, Actor *actor);
+ bool process_effects(Obj *container_obj, Actor *actor) override;
sint16 parseLatLongString(U6UseCodeLatLonEnum mode, Std::string *input);
inline bool use_find_water(uint16 *x, uint16 *y, uint8 *z);
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index b06f85f..c010bba 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -72,36 +72,36 @@ public:
ScrollWidgetGump(Configuration *cfg, Screen *s);
~ScrollWidgetGump();
- bool parse_token(MsgText *token);
+ bool parse_token(MsgText *token) override;
- bool can_display_prompt() {
+ bool can_display_prompt() override {
return false;
}
- void Display(bool full_redraw);
+ void Display(bool full_redraw) override;
- void display_prompt() {}
+ void display_prompt() override {}
void display_string(Std::string s);
virtual void display_string(Std::string s, Font *f, bool include_on_map_window) override {
return MsgScroll::display_string(s, f, include_on_map_window);
}
- void set_font(uint8 font_type);
- bool is_garg_font();
+ void set_font(uint8 font_type) override;
+ bool is_garg_font() override;
- bool can_fit_token_on_msgline(MsgLine *msg_line, MsgText *token);
+ bool can_fit_token_on_msgline(MsgLine *msg_line, MsgText *token) override;
- GUI_status KeyDown(const Common::KeyState &key);
- GUI_status MouseDown(int x, int y, Shared::MouseButton button);
- GUI_status MouseUp(int x, int y, Shared::MouseButton button) {
+ GUI_status KeyDown(const Common::KeyState &key) override;
+ GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+ GUI_status MouseUp(int x, int y, Shared::MouseButton button) override {
return GUI_YUM; // otherwise we do Msgscroll::MouseUp
}
- GUI_status MouseWheel(sint32 x, sint32 y);
+ GUI_status MouseWheel(sint32 x, sint32 y) override;
- void move_scroll_down() {
+ void move_scroll_down() override {
scroll_movement_event(SCROLL_DOWN);
}
- void move_scroll_up() {
+ void move_scroll_up() override {
scroll_movement_event(SCROLL_UP);
}
More information about the Scummvm-git-logs
mailing list