[Scummvm-git-logs] scummvm master -> 8fe954435766a4581a26e3f6db468edf7ba7aaad
OMGPizzaGuy
noreply at scummvm.org
Wed Dec 7 23:45:05 UTC 2022
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:
8fe9544357 ULTIMA8: allow minimap gump to hide on double click
Commit: 8fe954435766a4581a26e3f6db468edf7ba7aaad
https://github.com/scummvm/scummvm/commit/8fe954435766a4581a26e3f6db468edf7ba7aaad
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-07T17:44:34-06:00
Commit Message:
ULTIMA8: allow minimap gump to hide on double click
Changed paths:
engines/ultima/ultima8/gumps/minimap_gump.cpp
engines/ultima/ultima8/gumps/minimap_gump.h
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.cpp b/engines/ultima/ultima8/gumps/minimap_gump.cpp
index 47bba5dfecd..d56a8686d2e 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.cpp
+++ b/engines/ultima/ultima8/gumps/minimap_gump.cpp
@@ -26,6 +26,7 @@
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/render_surface.h"
#include "ultima/ultima8/world/get_object.h"
+#include "ultima/ultima8/kernel/mouse.h"
namespace Ultima {
namespace Ultima8 {
@@ -168,6 +169,24 @@ void MiniMapGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
surf->Fill32(0xFFFFFF00, 1 + ax + 0, 1 + ay + 1, 1, 2);
}
+Gump *MiniMapGump::onMouseDown(int button, int32 mx, int32 my) {
+ Gump *handled = Gump::onMouseDown(button, mx, my);
+ if (handled)
+ return handled;
+
+ // only interested in left clicks
+ if (button == Shared::BUTTON_LEFT)
+ return this;
+
+ return nullptr;
+}
+
+void MiniMapGump::onMouseDouble(int button, int32 mx, int32 my) {
+ if (button == Shared::BUTTON_LEFT) {
+ HideGump();
+ }
+}
+
void MiniMapGump::saveData(Common::WriteStream *ws) {
Gump::saveData(ws);
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.h b/engines/ultima/ultima8/gumps/minimap_gump.h
index 1e70956cd29..1d27830c7f4 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.h
+++ b/engines/ultima/ultima8/gumps/minimap_gump.h
@@ -50,6 +50,9 @@ public:
void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
uint16 TraceObjId(int32 mx, int32 my) override;
+ Gump *onMouseDown(int button, int32 mx, int32 my) override;
+ void onMouseDouble(int button, int32 mx, int32 my) override;
+
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
};
More information about the Scummvm-git-logs
mailing list