[Scummvm-git-logs] scummvm master -> 98431d1482559b08ce3c7dfa3715dfaea06d318e

[sev-]

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:
98431d1482 QDENGINE: Fix duplicate symbols in adv minigames


Commit: 98431d1482559b08ce3c7dfa3715dfaea06d318e
    https://github.com/scummvm/scummvm/commit/98431d1482559b08ce3c7dfa3715dfaea06d318e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-27T15:05:47+01:00

Commit Message:
QDENGINE: Fix duplicate symbols in adv minigames

Changed paths:
    engines/qdengine/minigames/adv/m_puzzle.cpp
    engines/qdengine/minigames/adv/m_scores.cpp
    engines/qdengine/minigames/adv/m_swap.cpp
    engines/qdengine/minigames/adv/m_triangles.cpp
    engines/qdengine/minigames/adv/m_triangles.h
    engines/qdengine/qdcore/qd_minigame.cpp


diff --git a/engines/qdengine/minigames/adv/m_puzzle.cpp b/engines/qdengine/minigames/adv/m_puzzle.cpp
index f2b3843a39a..9ba33619a37 100644
--- a/engines/qdengine/minigames/adv/m_puzzle.cpp
+++ b/engines/qdengine/minigames/adv/m_puzzle.cpp
@@ -33,7 +33,7 @@ namespace QDEngine {
 
 typedef Rect<float, mgVect2f> Rectf;
 
-MinigameInterface *createGame() {
+MinigameInterface *createMinigamePuzzle() {
 	return new Puzzle;
 }
 
diff --git a/engines/qdengine/minigames/adv/m_scores.cpp b/engines/qdengine/minigames/adv/m_scores.cpp
index ced5b99bfed..588292f9f01 100644
--- a/engines/qdengine/minigames/adv/m_scores.cpp
+++ b/engines/qdengine/minigames/adv/m_scores.cpp
@@ -27,7 +27,7 @@
 
 namespace QDEngine {
 
-MinigameInterface *createGame() {
+MinigameInterface *createMinigameScores() {
 	return new Scores;
 }
 
diff --git a/engines/qdengine/minigames/adv/m_swap.cpp b/engines/qdengine/minigames/adv/m_swap.cpp
index b55fbb289f8..c4b10b50d33 100644
--- a/engines/qdengine/minigames/adv/m_swap.cpp
+++ b/engines/qdengine/minigames/adv/m_swap.cpp
@@ -31,7 +31,7 @@ namespace QDEngine {
 
 typedef Rect<float, mgVect2f> Rectf;
 
-MinigameInterface *createGame() {
+MinigameInterface *createMinigameSwap() {
 	return new Swap(g_runtime);
 }
 
diff --git a/engines/qdengine/minigames/adv/m_triangles.cpp b/engines/qdengine/minigames/adv/m_triangles.cpp
index 7fd99deca1b..260a5dad0ec 100644
--- a/engines/qdengine/minigames/adv/m_triangles.cpp
+++ b/engines/qdengine/minigames/adv/m_triangles.cpp
@@ -30,7 +30,7 @@
 
 namespace QDEngine {
 
-MinigameInterface *createMinigameTriangleGame() {
+MinigameInterface *createMinigameTriangle() {
 	return new MinigameTriangle(g_runtime);
 }
 
diff --git a/engines/qdengine/minigames/adv/m_triangles.h b/engines/qdengine/minigames/adv/m_triangles.h
index 3a1396da318..149ca0ab10e 100644
--- a/engines/qdengine/minigames/adv/m_triangles.h
+++ b/engines/qdengine/minigames/adv/m_triangles.h
@@ -28,7 +28,7 @@
 
 namespace QDEngine {
 
-MinigameInterface *createMinigameTriangleGame();
+MinigameInterface *createMinigameTriangle();
 
 class MinigameTriangle : public MinigameInterface {
 	enum GameType {
diff --git a/engines/qdengine/qdcore/qd_minigame.cpp b/engines/qdengine/qdcore/qd_minigame.cpp
index 5342519c01a..05f27fa38e1 100644
--- a/engines/qdengine/qdcore/qd_minigame.cpp
+++ b/engines/qdengine/qdcore/qd_minigame.cpp
@@ -376,7 +376,7 @@ bool qdMiniGame::load_interface() {
 
 		// dogncat
 		} else if (_dll_name == "DLL\\triangles.dll") {
-			_interface = create_adv_minigame(_dll_name.c_str(), createMinigameTriangleGame);
+			_interface = create_adv_minigame(_dll_name.c_str(), createMinigameTriangle);
 			return true;
 		// scores.dll
 		// triangles.dll