[Scummvm-git-logs] scummvm master -> 28c681a21783b8d7d179cb3999ce97d6f2c593f5
sev-
noreply at scummvm.org
Sun Oct 20 23:29:06 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fdc1ceee38 JANITORIAL: Fix typo
28c681a217 QDENGINE: Attempt to get rid of templates in getParameter()
Commit: fdc1ceee38945a7a57fb69f9c4308c1e30dc0085
https://github.com/scummvm/scummvm/commit/fdc1ceee38945a7a57fb69f9c4308c1e30dc0085
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-21T01:20:54+02:00
Commit Message:
JANITORIAL: Fix typo
Changed paths:
engines/qdengine/minigames/adv/ExportInterface.cpp
engines/qdengine/minigames/adv/RunTime.h
engines/qdengine/qdcore/qd_minigame.cpp
diff --git a/engines/qdengine/minigames/adv/ExportInterface.cpp b/engines/qdengine/minigames/adv/ExportInterface.cpp
index 7ff9d1315c5..c388679d4ca 100644
--- a/engines/qdengine/minigames/adv/ExportInterface.cpp
+++ b/engines/qdengine/minigames/adv/ExportInterface.cpp
@@ -27,7 +27,7 @@
namespace QDEngine {
-qdMiniGameInterface *creade_adv_minigame(const char *name, MinigameConsCallback callback) {
+qdMiniGameInterface *create_adv_minigame(const char *name, MinigameConsCallback callback) {
debugC(3, kDebugMinigames, "open_game_interface: %s, runtime%s", name, g_runtime ? "!=0" : "==0");
if (!g_runtime)
diff --git a/engines/qdengine/minigames/adv/RunTime.h b/engines/qdengine/minigames/adv/RunTime.h
index 78db94cafc9..25c5aab9aed 100644
--- a/engines/qdengine/minigames/adv/RunTime.h
+++ b/engines/qdengine/minigames/adv/RunTime.h
@@ -83,7 +83,7 @@ struct GameInfo {
typedef MinigameInterface *(*MinigameConsCallback)();
-qdMiniGameInterface *creade_adv_minigame(const char *name, MinigameConsCallback callback);
+qdMiniGameInterface *create_adv_minigame(const char *name, MinigameConsCallback callback);
bool close_adv_minigame(qdMiniGameInterface *game);
diff --git a/engines/qdengine/qdcore/qd_minigame.cpp b/engines/qdengine/qdcore/qd_minigame.cpp
index 112016a6ce6..5342519c01a 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 = creade_adv_minigame(_dll_name.c_str(), createMinigameTriangleGame);
+ _interface = create_adv_minigame(_dll_name.c_str(), createMinigameTriangleGame);
return true;
// scores.dll
// triangles.dll
Commit: 28c681a21783b8d7d179cb3999ce97d6f2c593f5
https://github.com/scummvm/scummvm/commit/28c681a21783b8d7d179cb3999ce97d6f2c593f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-21T01:28:39+02:00
Commit Message:
QDENGINE: Attempt to get rid of templates in getParameter()
Some of the compilers get confused by them.
Changed paths:
engines/qdengine/minigames/adv/common.cpp
engines/qdengine/minigames/adv/common.h
diff --git a/engines/qdengine/minigames/adv/common.cpp b/engines/qdengine/minigames/adv/common.cpp
index 8635ce9afdf..524500b9c71 100644
--- a/engines/qdengine/minigames/adv/common.cpp
+++ b/engines/qdengine/minigames/adv/common.cpp
@@ -47,22 +47,19 @@ void QDObject::setState(const char* name) {
_obj->set_state(name);
}
-template<class T>
-T getParameter(const char* name, const T& defValue) {
- return round(getParameter<float>(name, (float)defValue));
+int getParameter(const char* name, const int& defValue) {
+ return round(getParameter(name, (float)defValue));
}
-template<class T>
-bool getParameter(const char* name, T& out, bool obligatory) {
+bool getParameter(const char* name, int& out, bool obligatory) {
float retValue = out;
- if (getParameter<float>(name, retValue, obligatory)) {
+ if (getParameter(name, retValue, obligatory)) {
out = round(retValue);
return true;
}
return false;
}
-template<>
float getParameter(const char* name, const float &defValue) {
if (const char *data = g_runtime->parameter(name, false)) {
float retValue = defValue;
@@ -74,7 +71,6 @@ float getParameter(const char* name, const float &defValue) {
}
-template<>
bool getParameter(const char* name, float &out, bool obligatory) {
if (const char * data = g_runtime->parameter(name, obligatory)) {
float retValue = out;
@@ -88,7 +84,6 @@ bool getParameter(const char* name, float &out, bool obligatory) {
}
-template<>
mgVect2f getParameter(const char* name, const mgVect2f& defValue) {
if (const char * data = g_runtime->parameter(name, false)) {
mgVect2f retValue = defValue;
@@ -100,7 +95,6 @@ mgVect2f getParameter(const char* name, const mgVect2f& defValue) {
}
-template<>
bool getParameter(const char* name, mgVect2f& out, bool obligatory) {
if (const char * data = g_runtime->parameter(name, obligatory)) {
mgVect2f retValue = out;
@@ -114,43 +108,19 @@ bool getParameter(const char* name, mgVect2f& out, bool obligatory) {
}
-template<>
mgVect2i getParameter(const char* name, const mgVect2i& defValue) {
mgVect2f retValue = getParameter(name, mgVect2f(defValue.x, defValue.y));
return mgVect2i(round(retValue.x), round(retValue.y));
}
-template<>
bool getParameter(const char* name, mgVect2i& out, bool obligatory) {
mgVect2f retValue = mgVect2f(out.x, out.y);
- if (getParameter<mgVect2f>(name, retValue, obligatory)) {
+ if (getParameter(name, retValue, obligatory)) {
out = mgVect2i(round(retValue.x), round(retValue.y));
return true;
}
return false;
}
-void dummyInstanceGetParameter() {
- bool db = false;
- getParameter("", db);
- getParameter("", db, false);
-
- int di = 0;
- getParameter("", di);
- getParameter("", di, false);
-
- float df = 0.f;
- getParameter("", df);
- getParameter("", df, false);
-
- mgVect2i d2i;
- getParameter("", d2i);
- getParameter("", d2i, false);
-
- mgVect2i d2f;
- getParameter("", d2f);
- getParameter("", d2f, false);
-}
-
} // namespace QDEngine
diff --git a/engines/qdengine/minigames/adv/common.h b/engines/qdengine/minigames/adv/common.h
index 6a8c8f11d3c..c1f4892d39b 100644
--- a/engines/qdengine/minigames/adv/common.h
+++ b/engines/qdengine/minigames/adv/common.h
@@ -77,11 +77,15 @@ typedef Std::vector<mgVect3f> Coords;
class MinigameManager;
extern MinigameManager *g_runtime;
-template<class T>
-T getParameter(const char* name, const T& defValue);
+int getParameter(const char* name, const int& defValue);
+bool getParameter(const char* name, int& out, bool obligatory);
+float getParameter(const char* name, const float &defValue);
+bool getParameter(const char* name, float &out, bool obligatory);
+mgVect2f getParameter(const char* name, const mgVect2f& defValue);
+bool getParameter(const char* name, mgVect2f& out, bool obligatory);
+mgVect2i getParameter(const char* name, const mgVect2i& defValue);
+bool getParameter(const char* name, mgVect2i& out, bool obligatory);
-template<class T>
-bool getParameter(const char* name, T& out, bool obligatory);
enum SystemEvent {
EVENT_TIME_1_SECOND_TICK,
More information about the Scummvm-git-logs
mailing list