[Scummvm-git-logs] scummvm master -> 746a31fad93ddb8070826f7c3d295e784ccd4891
sev-
noreply at scummvm.org
Thu Oct 10 16:52:11 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:
7a4fc357f1 QDENINGE: Added initial code for 3mice2_sbor_karty.dll minigame
746a31fad9 QDENGINE: Complete 3mice2_sbor_karty.dll minigame. 3mice2-demo1 is completable
Commit: 7a4fc357f177ff3c89575915be62e34184760125
https://github.com/scummvm/scummvm/commit/7a4fc357f177ff3c89575915be62e34184760125
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-10T18:51:57+02:00
Commit Message:
QDENINGE: Added initial code for 3mice2_sbor_karty.dll minigame
Changed paths:
A engines/qdengine/minigames/3mice2_sbor_karty.h
engines/qdengine/qdcore/qd_minigame.cpp
diff --git a/engines/qdengine/minigames/3mice2_sbor_karty.h b/engines/qdengine/minigames/3mice2_sbor_karty.h
new file mode 100644
index 00000000000..6b2da863199
--- /dev/null
+++ b/engines/qdengine/minigames/3mice2_sbor_karty.h
@@ -0,0 +1,112 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef QDENGINE_MINIGAMES_3MICE2_SBOR_KARTY_H
+#define QDENGINE_MINIGAMES_3MICE2_SBOR_KARTY_H
+
+#include "common/debug.h"
+
+#include "qdengine/qd_fwd.h"
+#include "qdengine/qdcore/qd_minigame_interface.h"
+
+namespace QDEngine {
+
+class qd3mince2SborKartyMiniGame : public qdMiniGameInterface {
+public:
+ qd3mince2SborKartyMiniGame() {}
+ ~qd3mince2SborKartyMiniGame() {}
+
+ bool init(const qdEngineInterface *engine_interface) {
+ debugC(1, kDebugMinigames, "3mince2SborKarty::init()");
+
+ _engine = engine_interface;
+ _scene = engine_interface->current_scene_interface();
+ if (!_scene)
+ return false;
+
+ for (int i = 1; i <= 10; i++)
+ _objects[i] = _scene->object_interface(Common::String::format("object@%i#", i).c_str());
+
+ for (int i = 1; i <= 10; i++)
+ _objects[11 + i] = _scene->object_interface(Common::String::format("inv_object@%i#", i).c_str());
+
+ _objDone = _scene->object_interface("$done");
+ _objDrop = _scene->object_interface("$\xf1\xe1\xf0\xee\xf1\xe8\xf2\xfc\x20\xf1\x20\xec\xfb\xf8\xe8"); // "$ÑброÑить Ñ Ð¼Ñ‹ÑˆÐ¸"
+ _timePassed = 0.0;
+
+ return true;
+ }
+
+ bool quant(float dt) {
+ debugC(3, kDebugMinigames, "3mince2SborKarty::quant(%f)", dt);
+
+
+ return true;
+ }
+
+ bool finit() {
+ debugC(1, kDebugMinigames, "3mince2SborKarty::finit()");
+
+ if (_scene) {
+ _engine->release_scene_interface(_scene);
+ _scene = 0;
+ }
+
+ return true;
+ }
+
+ bool new_game(const qdEngineInterface *engine_interface) {
+ return true;
+ }
+
+ int save_game(const qdEngineInterface *engine_interface, const qdMinigameSceneInterface *scene_interface, char *buffer, int buffer_size) {
+ return 0;
+ }
+
+ int load_game(const qdEngineInterface *engine_interface, const qdMinigameSceneInterface *scene_interface, const char *buffer, int buffer_size) {
+ return 0;
+ }
+
+ enum { INTERFACE_VERSION = 112 };
+ int version() const {
+ return INTERFACE_VERSION;
+ }
+
+private:
+ bool checkSolution() {
+
+ return true;
+ }
+
+private:
+ const qdEngineInterface *_engine = nullptr;
+ qdMinigameSceneInterface *_scene = nullptr;
+
+ qdMinigameObjectInterface *_objects[22];
+ qdMinigameObjectInterface *_objDone = nullptr;
+ qdMinigameObjectInterface *_objDrop = nullptr;
+
+ float _timePassed;
+};
+
+} // namespace QDEngine
+
+#endif // QDENGINE_MINIGAMES_3MICE2_SBOR_KARTY_H
diff --git a/engines/qdengine/qdcore/qd_minigame.cpp b/engines/qdengine/qdcore/qd_minigame.cpp
index 8d348679efc..dd31ede13bb 100644
--- a/engines/qdengine/qdcore/qd_minigame.cpp
+++ b/engines/qdengine/qdcore/qd_minigame.cpp
@@ -51,6 +51,9 @@
#include "qdengine/minigames/shveik_shkatulka.h"
#include "qdengine/minigames/shveik_portret.h"
+// 3mice2
+#include "qdengine/minigames/3mice2_sbor_karty.h"
+
namespace QDEngine {
Commit: 746a31fad93ddb8070826f7c3d295e784ccd4891
https://github.com/scummvm/scummvm/commit/746a31fad93ddb8070826f7c3d295e784ccd4891
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-10T18:51:57+02:00
Commit Message:
QDENGINE: Complete 3mice2_sbor_karty.dll minigame. 3mice2-demo1 is completable
Changed paths:
engines/qdengine/minigames/3mice2_sbor_karty.h
engines/qdengine/qdcore/qd_minigame.cpp
diff --git a/engines/qdengine/minigames/3mice2_sbor_karty.h b/engines/qdengine/minigames/3mice2_sbor_karty.h
index 6b2da863199..ca5484bf65b 100644
--- a/engines/qdengine/minigames/3mice2_sbor_karty.h
+++ b/engines/qdengine/minigames/3mice2_sbor_karty.h
@@ -58,6 +58,97 @@ public:
bool quant(float dt) {
debugC(3, kDebugMinigames, "3mince2SborKarty::quant(%f)", dt);
+ char tmp[20];
+
+ _timePassed += dt;
+
+ qdMinigameObjectInterface *obj = _scene->mouse_click_object_interface();
+
+ if (obj) {
+ const char *name = obj->name();
+
+ if (strstr(name, "object@") && obj->is_state_active("base") && !_scene->mouse_object_interface()) {
+ const char *from = strstr(name, "@");
+ const char *to = strstr(name, "#");
+
+ Common::strlcpy(tmp, from + 1, to - from);
+
+ obj->set_state("hide");
+
+ int num = atol(tmp);
+ debugC(4, kDebugMinigames, "to_inv: num is: %d tmp: '%s' for name: '%s'", num, tmp, name);
+ _objects[num + 11]->set_state("to_inv");
+ }
+
+ _scene->release_object_interface(obj);
+ }
+
+ if (_engine->is_mouse_event_active(qdmg::qdEngineInterfaceImpl::MOUSE_EV_RIGHT_DOWN) || !_objDrop->is_state_active("\xed\xe5\xf2")) { // "нет"
+ obj = _scene->mouse_object_interface();
+
+ if (obj) {
+ const char *name = obj->name();
+ const char *from = strstr(name, "@");
+ const char *to = strstr(name, "#");
+
+ Common::strlcpy(tmp, from + 1, to - from);
+
+ obj->set_state("del");
+
+ int num = atol(tmp);
+ debugC(4, kDebugMinigames, "base: num is: %d tmp: '%s' for name: '%s'", num, tmp, name);
+
+ _objects[num]->set_state("base");
+
+ _objDrop->set_state("\xed\xe5\xf2"); // "нет"
+ _scene->release_object_interface(obj);
+ }
+ }
+
+ if (_engine->is_mouse_event_active(qdmg::qdEngineInterfaceImpl::MOUSE_EV_LEFT_DOWN)) {
+ obj = _scene->mouse_object_interface();
+
+ if (obj) {
+ qdMinigameObjectInterface *obj2 = _scene->mouse_hover_object_interface();
+
+ if (obj2) {
+ const char *name = obj->name();
+ const char *from = strstr(name, "@");
+
+ if (from) {
+ const char *to = strstr(name, "#");
+
+ Common::strlcpy(tmp, from + 1, to - from);
+
+ int num = atol(tmp);
+ debugC(4, kDebugMinigames, "part1: num is: %d tmp: '%s' for name: '%s'", num, tmp, name);
+
+ name = obj2->name();
+ from = strstr(name, "@");
+ to = strstr(name, "#");
+
+ Common::strlcpy(tmp, from + 1, to - from);
+
+ int num2 = atol(tmp);
+ debugC(4, kDebugMinigames, "part2: num2 is: %d tmp: '%s' for name: '%s'", num2, tmp, name);
+
+ if (num == num2) {
+ obj->set_state("del");
+ _objects[num]->set_state("karta");
+ }
+
+ _scene->release_object_interface(obj);
+ }
+ }
+ }
+ }
+
+ if (_timePassed > 1.0) {
+ if (checkSolution())
+ _objDone->set_state("\xe4\xe0"); // "да"
+
+ _timePassed = 0.0;
+ }
return true;
}
@@ -92,6 +183,9 @@ public:
private:
bool checkSolution() {
+ for (int i = 1; i <= 10; i++)
+ if (!_objects[i]->is_state_active("kovrik"))
+ return false;
return true;
}
diff --git a/engines/qdengine/qdcore/qd_minigame.cpp b/engines/qdengine/qdcore/qd_minigame.cpp
index dd31ede13bb..0304909ea04 100644
--- a/engines/qdengine/qdcore/qd_minigame.cpp
+++ b/engines/qdengine/qdcore/qd_minigame.cpp
@@ -336,7 +336,9 @@ bool qdMiniGame::load_interface() {
// 3Mice2_raskr2.dll
// 3Mice2_raskr3.dll
// 3Mice2_raskr4.dll
- // 3Mice2_sbor_karty.dll
+ } else if (_dll_name == "DLL\\3Mice2_sbor_karty.dll") {
+ _interface = new qd3mince2SborKartyMiniGame();
+ return true;
// 3Mice2_states.dll
// 3Mice2_sudoku.dll
// 3Mice2_testo.dll
More information about the Scummvm-git-logs
mailing list