libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGS: renamed Button's MouseButton enum to avoid name confusion

Browse Source 
Was conflicting with the internal engine's eAGSMouseButton constants.

From upstream a5cfccee2d3681b55dafb8cfb9e0f38f84124855
This commit is contained in:
Thierry Crozat 2022-10-09 21:41:45 +01:00
parent 474ccf041a
commit 06620b6e9f
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ags/engine/ac/gui.cpp
View File

@ -316,8 +316,8 @@ void process_interface_click(int ifce, int btn, int mbut) {
int rtype = kGUIAction_None, rdata = 0;
if (btype == kGUIButton) {
GUIButton *gbuto = (GUIButton *)_GP(guis)[ifce].GetControl(btn);
rtype = gbuto->ClickAction[kMouseLeft];
rdata = gbuto->ClickData[kMouseLeft];
rtype = gbuto->ClickAction[kGUIClickLeft];
rdata = gbuto->ClickData[kGUIClickLeft];
} else if ((btype == kGUISlider) || (btype == kGUITextBox) || (btype == kGUIListBox))
rtype = kGUIAction_RunScript;
else quit("unknown GUI object triggered process_interface");

8
engines/ags/engine/ac/mouse.cpp
View File

@ -245,8 +245,8 @@ void enable_cursor_mode(int modd) {
for (ww = 0; ww < _GP(guis)[uu].GetControlCount(); ww++) {
if (_GP(guis)[uu].GetControlType(ww) != kGUIButton) continue;
GUIButton *gbpt = (GUIButton *)_GP(guis)[uu].GetControl(ww);
if (gbpt->ClickAction[kMouseLeft] != kGUIAction_SetMode) continue;
if (gbpt->ClickData[kMouseLeft] != modd) continue;
if (gbpt->ClickAction[kGUIClickLeft] != kGUIAction_SetMode) continue;
if (gbpt->ClickData[kGUIClickLeft] != modd) continue;
gbpt->SetEnabled(true);
}
}
@ -261,8 +261,8 @@ void disable_cursor_mode(int modd) {
for (ww = 0; ww < _GP(guis)[uu].GetControlCount(); ww++) {
if (_GP(guis)[uu].GetControlType(ww) != kGUIButton) continue;
GUIButton *gbpt = (GUIButton *)_GP(guis)[uu].GetControl(ww);
if (gbpt->ClickAction[kMouseLeft] != kGUIAction_SetMode) continue;
if (gbpt->ClickData[kMouseLeft] != modd) continue;
if (gbpt->ClickAction[kGUIClickLeft] != kGUIAction_SetMode) continue;
if (gbpt->ClickData[kGUIClickLeft] != modd) continue;
gbpt->SetEnabled(false);
}
}

24
engines/ags/shared/gui/gui_button.cpp
View File

@ -67,10 +67,10 @@ GUIButton::GUIButton() {
Font = 0;
TextColor = 0;
TextAlignment = kAlignTopCenter;
ClickAction[kMouseLeft] = kGUIAction_RunScript;
ClickAction[kMouseRight] = kGUIAction_RunScript;
ClickData[kMouseLeft] = 0;
ClickData[kMouseRight] = 0;
ClickAction[kGUIClickLeft] = kGUIAction_RunScript;
ClickAction[kGUIClickRight] = kGUIAction_RunScript;
ClickData[kGUIClickLeft] = 0;
ClickData[kGUIClickRight] = 0;
IsPushed = false;
IsMouseOver = false;
@ -248,10 +248,10 @@ void GUIButton::WriteToFile(Stream *out) const {
out->WriteInt32(PushedImage);
out->WriteInt32(Font);
out->WriteInt32(TextColor);
out->WriteInt32(ClickAction[kMouseLeft]);
out->WriteInt32(ClickAction[kMouseRight]);
out->WriteInt32(ClickData[kMouseLeft]);
out->WriteInt32(ClickData[kMouseRight]);
out->WriteInt32(ClickAction[kGUIClickLeft]);
out->WriteInt32(ClickAction[kGUIClickRight]);
out->WriteInt32(ClickData[kGUIClickLeft]);
out->WriteInt32(ClickData[kGUIClickRight]);
StrUtil::WriteString(_text, out);
out->WriteInt32(TextAlignment);
@ -270,10 +270,10 @@ void GUIButton::ReadFromFile(Stream *in, GuiVersion gui_version) {
}
Font = in->ReadInt32();
TextColor = in->ReadInt32();
ClickAction[kMouseLeft] = (GUIClickAction)in->ReadInt32();
ClickAction[kMouseRight] = (GUIClickAction)in->ReadInt32();
ClickData[kMouseLeft] = in->ReadInt32();
ClickData[kMouseRight] = in->ReadInt32();
ClickAction[kGUIClickLeft] = (GUIClickAction)in->ReadInt32();
ClickAction[kGUIClickRight] = (GUIClickAction)in->ReadInt32();
ClickData[kGUIClickLeft] = in->ReadInt32();
ClickData[kGUIClickRight] = in->ReadInt32();
if (gui_version < kGuiVersion_350)
SetText(String::FromStreamCount(in, GUIBUTTON_LEGACY_TEXTLENGTH));
else

13
engines/ags/shared/gui/gui_button.h
View File

@ -34,10 +34,10 @@ namespace AGS3 {
namespace AGS {
namespace Shared {
enum MouseButton {
kMouseNone = -1,
kMouseLeft = 0,
kMouseRight = 1,
enum GUIClickMouseButton {
kGUIClickLeft = 0,
kGUIClickRight = 1,
kNumGUIClicks
};
enum GUIClickAction {
@ -96,9 +96,8 @@ public:
FrameAlignment TextAlignment;
// Click actions for left and right mouse buttons
// NOTE: only left click is currently in use
static const int ClickCount = kMouseRight + 1;
GUIClickAction ClickAction[ClickCount];
int32_t ClickData[ClickCount];
GUIClickAction ClickAction[kNumGUIClicks];
int32_t ClickData[kNumGUIClicks];
bool IsPushed;
bool IsMouseOver;