[Scummvm-git-logs] scummvm master -> 9cc8e7fdb7e9e055f08284cad94b84e90449bf22
Scorpeg
noreply at scummvm.org
Mon Nov 2 16:05:03 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
9cc8e7fdb7 GRAPHICS: Add possibility to override default hotspot marker
Commit: 9cc8e7fdb7e9e055f08284cad94b84e90449bf22
https://github.com/scummvm/scummvm/commit/9cc8e7fdb7e9e055f08284cad94b84e90449bf22
Author: Scorp (scorp at mrs.mn)
Date: 2026-11-02T19:04:53+03:00
Commit Message:
GRAPHICS: Add possibility to override default hotspot marker
Changed paths:
engines/engine.cpp
graphics/hotspot_renderer.cpp
graphics/hotspot_renderer.h
diff --git a/engines/engine.cpp b/engines/engine.cpp
index aa045c0dbae..9299681e434 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -795,7 +795,7 @@ void Engine::drawHotspots() {
}
_hotspotShowText = !ConfMan.hasKey("show_hotspot_text") || ConfMan.getBool("show_hotspot_text");
const int marker = ConfMan.hasKey("hotspot_marker") ? ConfMan.getInt("hotspot_marker") : Graphics::kMarkerDefault;
- _hotspotMarker = marker == Graphics::kMarkerDefault ? Graphics::kMarkerCrosshair :
+ _hotspotMarker = marker == Graphics::kMarkerDefault ? Graphics::kMarkerDefault :
CLIP(marker, (int)Graphics::kMarkerCrosshair, (int)Graphics::kMarkerPoint);
}
if (_hotspotRenderer->empty()) {
diff --git a/graphics/hotspot_renderer.cpp b/graphics/hotspot_renderer.cpp
index 9fce6063bbd..592ea108a09 100644
--- a/graphics/hotspot_renderer.cpp
+++ b/graphics/hotspot_renderer.cpp
@@ -282,6 +282,7 @@ void HotspotRenderer::drawMarker(Surface *surface, const HotspotInfo &hotspot, i
addDrawRect(bounds);
switch (markerShape) {
+ case kMarkerDefault:
case kMarkerCrosshair:
drawCrosshairMarker(surface, x, y, format);
break;
diff --git a/graphics/hotspot_renderer.h b/graphics/hotspot_renderer.h
index c39755c3f4e..9552f86e28d 100644
--- a/graphics/hotspot_renderer.h
+++ b/graphics/hotspot_renderer.h
@@ -63,12 +63,12 @@ struct HotspotInfo {
* Marker shape types.
*/
enum MarkerShape {
+ kMarkerDefault = -1,
kMarkerCrosshair,
kMarkerSquare,
kMarkerPoint
};
-const int kMarkerDefault = -1;
struct HotspotStyle {
int markerSize = 10;
More information about the Scummvm-git-logs
mailing list