libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NUVIE: Rename clashing ScrollEventType enum

Browse Source
This commit is contained in:
Paul Gilbert 2020-09-08 18:55:42 -07:00
parent 4c806b63a1
commit b0f778130e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
View File

@ -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) {

4
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
View File

@ -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);
};