thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NUVIE: Rename clashing ScrollEventType enum

Browse source
This commit is contained in:
Paul Gilbert 2020-09-08 18:55:42 -07:00
parent ce2d81065a
commit 5a35089aa5
2 changed files with 5 additions and 5 deletions
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) { GUI_status MsgScrollNewUI::KeyDown(const Common::KeyState &key) {
ScrollEventType event = SCROLL_ESCAPE; MsgScrollEventType event = SCROLL_ESCAPE;
/* /*
switch(key.keycode) 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) { GUI_status MsgScrollNewUI::MouseDown(int x, int y, Shared::MouseButton button) {
ScrollEventType event = SCROLL_ESCAPE; MsgScrollEventType event = SCROLL_ESCAPE;
return scroll_movement_event(event); return scroll_movement_event(event);
} }
GUI_status MsgScrollNewUI::scroll_movement_event(ScrollEventType event) { GUI_status MsgScrollNewUI::scroll_movement_event(MsgScrollEventType event) {
switch (event) { switch (event) {
case SCROLL_UP : case SCROLL_UP :
if (position > 0) { 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_UP,
SCROLL_DOWN, SCROLL_DOWN,
SCROLL_ESCAPE SCROLL_ESCAPE
} ScrollEventType; } MsgScrollEventType;
class MsgScrollNewUI: public MsgScroll { class MsgScrollNewUI: public MsgScroll {
@ -99,7 +99,7 @@ protected:
MsgLine *add_new_line() override; MsgLine *add_new_line() override;
private: private:
GUI_status scroll_movement_event(ScrollEventType event); GUI_status scroll_movement_event(MsgScrollEventType event);
uint16 count_empty_lines(Std::string s); uint16 count_empty_lines(Std::string s);
}; };