[Scummvm-git-logs] scummvm branch-2-2 -> 5a35089aa52f09de00ee47fb1de7a102372ce6c9
dreammaster
paulfgilbert at gmail.com
Wed Sep 9 01:56:29 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:
5a35089aa5 NUVIE: Rename clashing ScrollEventType enum
Commit: 5a35089aa52f09de00ee47fb1de7a102372ce6c9
https://github.com/scummvm/scummvm/commit/5a35089aa52f09de00ee47fb1de7a102372ce6c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-08T18:56:17-07:00
Commit Message:
NUVIE: Rename clashing ScrollEventType enum
Changed paths:
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
index 6ca22ba2ad..a7fdb76de0 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
@@ -240,7 +240,7 @@ void MsgScrollNewUI::Display(bool full_redraw) {
}
GUI_status MsgScrollNewUI::KeyDown(const Common::KeyState &key) {
- ScrollEventType event = SCROLL_ESCAPE;
+ MsgScrollEventType event = SCROLL_ESCAPE;
/*
switch(key.keycode)
{
@@ -256,12 +256,12 @@ GUI_status MsgScrollNewUI::KeyDown(const Common::KeyState &key) {
}
GUI_status MsgScrollNewUI::MouseDown(int x, int y, Shared::MouseButton button) {
- ScrollEventType event = SCROLL_ESCAPE;
+ MsgScrollEventType event = SCROLL_ESCAPE;
return scroll_movement_event(event);
}
-GUI_status MsgScrollNewUI::scroll_movement_event(ScrollEventType event) {
+GUI_status MsgScrollNewUI::scroll_movement_event(MsgScrollEventType event) {
switch (event) {
case SCROLL_UP :
if (position > 0) {
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 8df0b88ef8..f949f70261 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -43,7 +43,7 @@ typedef enum {
SCROLL_UP,
SCROLL_DOWN,
SCROLL_ESCAPE
-} ScrollEventType;
+} MsgScrollEventType;
class MsgScrollNewUI: public MsgScroll {
@@ -99,7 +99,7 @@ protected:
MsgLine *add_new_line() override;
private:
- GUI_status scroll_movement_event(ScrollEventType event);
+ GUI_status scroll_movement_event(MsgScrollEventType event);
uint16 count_empty_lines(Std::string s);
};
More information about the Scummvm-git-logs
mailing list