[Scummvm-git-logs] scummvm master -> 4ade3bf3891b00de9d5ded3e03e2609623681426
sev-
noreply at scummvm.org
Mon Nov 18 17:04:26 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
62fabfb8e9 QDENGINE: Added detection for 3mice1-pl
332c8b351a QDENGINE: Print movie name when stream is failed to load
4ade3bf389 QDENGINE: Added support for 3mice1-pl minigames
Commit: 62fabfb8e9d0cb62dc8aa0b554ec65cd6c8afe0f
https://github.com/scummvm/scummvm/commit/62fabfb8e9d0cb62dc8aa0b554ec65cd6c8afe0f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-18T18:03:26+01:00
Commit Message:
QDENGINE: Added detection for 3mice1-pl
Changed paths:
engines/qdengine/detection_tables.h
diff --git a/engines/qdengine/detection_tables.h b/engines/qdengine/detection_tables.h
index ebf55a6fc23..7fc654d3af0 100644
--- a/engines/qdengine/detection_tables.h
+++ b/engines/qdengine/detection_tables.h
@@ -134,10 +134,9 @@ const ADGameDescription GAME_DESCRIPTIONS[] = {
// PÅ™ÃbÄ›hy myÅ¡Ã rodinky I
GAMEl("3mice1", "a6060f3d17ea2e50a03216332e517817", 10022470,
"qd_game.exe", "b8b3545b022f8e0975a8a948c03ad76e", 917504, Common::CS_CZE),
-
// Były Sobie Myszki Trzy: Na Spotkanie Cioci Myszy
- //GAMEl("3mice1", "???", 10022470,
- // "qd_game.exe", "???", 917504, Common::PL_POL),
+ GAMEl("3mice1", "6fe8feb6cf76f4642f6d6cb612b1d446", 10012908,
+ "qd_game.exe", "b8b3545b022f8e0975a8a948c03ad76e", 917504, Common::PL_POL),
// ÐŸÐ¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ñ€Ð°Ð²Ð¾Ð³Ð¾ Ñолдата Швейка
// 2007/09/07. Lazy Games
Commit: 332c8b351a8d96ff60a333e710035764ac0e85c8
https://github.com/scummvm/scummvm/commit/332c8b351a8d96ff60a333e710035764ac0e85c8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-18T18:03:26+01:00
Commit Message:
QDENGINE: Print movie name when stream is failed to load
Changed paths:
engines/qdengine/qdcore/util/WinVideo.cpp
diff --git a/engines/qdengine/qdcore/util/WinVideo.cpp b/engines/qdengine/qdcore/util/WinVideo.cpp
index 64b378cf5c6..183acbefca3 100644
--- a/engines/qdengine/qdcore/util/WinVideo.cpp
+++ b/engines/qdengine/qdcore/util/WinVideo.cpp
@@ -88,7 +88,7 @@ bool winVideo::open_file(const Common::Path fname) {
}
if (!_decoder->loadStream(_videostream)) {
- warning("WinVideo::open: Failed to Load Stream");
+ warning("WinVideo::open: Failed to Load Stream for file '%s'", filename.c_str());
_videostream = nullptr;
return false;
}
Commit: 4ade3bf3891b00de9d5ded3e03e2609623681426
https://github.com/scummvm/scummvm/commit/4ade3bf3891b00de9d5ded3e03e2609623681426
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-18T18:03:26+01:00
Commit Message:
QDENGINE: Added support for 3mice1-pl minigames
Changed paths:
engines/qdengine/minigames/book_all.h
diff --git a/engines/qdengine/minigames/book_all.h b/engines/qdengine/minigames/book_all.h
index ac5319452b8..1b692b08700 100644
--- a/engines/qdengine/minigames/book_all.h
+++ b/engines/qdengine/minigames/book_all.h
@@ -77,6 +77,30 @@ const float bookGusenicaCZ[95 * 2] = {
0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
};
+const float bookGusenicaPL[95 * 2] = {
+ 0.000f, 0.013f, 0.405f, 1.197f, 1.586f, 2.114f, 2.633f, 2.862f, 3.238f, 4.114f,
+ 4.635f, 4.859f, 5.486f, 5.850f, 6.228f, 7.325f, 7.761f, 8.261f, 8.729f, 9.157f,
+ 9.513f, 10.407f, 11.073f, 11.522f, 12.354f, 13.158f, 14.035f, 15.855f, 16.093f, 16.745f,
+ 17.328f, 17.860f, 18.567f, 18.687f, 19.078f, 19.724f, 20.749f, 21.082f, 21.420f, 21.955f,
+ 22.239f, 22.696f, 23.539f, 24.086f, 24.535f, 24.675f, 25.476f, 25.824f, 26.386f, 26.877f,
+ 27.460f, 28.287f, 29.472f, 30.219f, 31.194f, 31.612f, 32.107f, 32.994f, 34.493f, 35.242f,
+ 36.080f, 36.523f, 36.943f, 37.226f, 37.774f, 38.002f, 38.870f, 39.646f, 40.221f, 40.680f,
+ 41.391f, 41.956f, 42.252f, 43.124f, 43.433f, 43.860f, 44.614f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+
+ 0.000f, 0.073f, 0.630f, 0.858f, 0.858f, 1.441f, 1.885f, 2.411f, 3.071f, 4.120f,
+ 4.448f, 4.825f, 5.804f, 6.527f, 7.351f, 8.893f, 9.375f, 9.727f, 10.260f, 10.644f,
+ 10.832f, 11.356f, 11.578f, 12.227f, 12.460f, 13.082f, 13.249f, 0.000f, 13.865f, 14.415f,
+ 15.587f, 16.120f, 17.213f, 17.414f, 18.224f, 18.874f, 20.081f, 20.468f, 21.119f, 22.381f,
+ 23.443f, 24.101f, 24.426f, 25.481f, 26.111f, 26.742f, 26.899f, 27.238f, 28.290f, 28.587f,
+ 28.885f, 29.248f, 29.871f, 30.494f, 31.756f, 32.621f, 32.975f, 33.610f, 33.877f, 34.870f,
+ 35.669f, 36.198f, 36.959f, 37.513f, 37.706f, 38.353f, 39.042f, 39.692f, 40.505f, 41.076f,
+ 41.747f, 42.254f, 42.601f, 43.200f, 43.833f, 44.092f, 44.550f, 44.961f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+};
+
const float bookLes[95 * 2] = {
0.000f, 0.046f, 0.577f, 0.809f, 1.623f, 1.985f, 2.635f, 3.536f, 3.642f, 4.560f,
5.071f, 6.558f, 7.007f, 7.876f, 8.998f, 9.548f, 10.387f, 10.471f, 11.054f, 12.062f,
@@ -125,6 +149,30 @@ const float bookLesCZ[95 * 2] = {
0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
};
+const float bookLesPL[95 * 2] = {
+ 0.000f, 0.072f, 0.664f, 1.336f, 2.142f, 2.437f, 3.296f, 3.308f, 3.425f, 3.603f,
+ 3.990f, 4.822f, 5.575f, 5.957f, 7.337f, 7.859f, 8.353f, 8.677f, 9.730f, 9.879f,
+ 10.159f, 10.560f, 11.114f, 11.981f, 12.989f, 13.362f, 13.924f, 14.366f, 14.584f, 15.354f,
+ 16.034f, 16.773f, 16.982f, 17.840f, 19.140f, 20.033f, 20.844f, 21.035f, 21.974f, 22.290f,
+ 22.517f, 22.869f, 23.351f, 24.770f, 25.351f, 25.829f, 26.259f, 26.670f, 27.151f, 27.509f,
+ 28.082f, 28.280f, 29.379f, 30.469f, 31.227f, 31.797f, 32.229f, 33.304f, 33.736f, 34.095f,
+ 34.716f, 35.155f, 35.955f, 37.063f, 37.767f, 38.074f, 38.762f, 39.627f, 41.192f, 41.731f,
+ 42.163f, 42.528f, 43.289f, 43.859f, 45.113f, 45.357f, 46.221f, 46.840f, 47.433f, 47.810f,
+ 48.331f, 48.982f, 49.074f, 49.576f, 49.969f, 50.432f, 51.004f, 51.275f, 52.037f, 52.216f,
+ 52.429f, 0.000f, 0.000f, 0.000f, 0.000f,
+
+ 0.000f, 0.026f, 0.416f, 0.842f, 1.848f, 2.491f, 2.969f, 3.270f, 3.964f, 4.610f,
+ 4.882f, 5.857f, 6.393f, 6.757f, 6.997f, 7.295f, 7.907f, 8.083f, 8.366f, 9.285f,
+ 9.828f, 10.064f, 10.701f, 10.980f, 11.474f, 11.681f, 12.150f, 12.431f, 13.486f, 13.994f,
+ 14.588f, 14.777f, 14.962f, 15.419f, 16.823f, 17.387f, 17.694f, 17.954f, 18.918f, 19.110f,
+ 19.778f, 20.946f, 21.810f, 22.115f, 22.371f, 22.601f, 23.044f, 23.331f, 23.687f, 24.021f,
+ 24.764f, 25.043f, 25.508f, 25.922f, 26.541f, 27.062f, 27.799f, 28.416f, 29.538f, 29.938f,
+ 30.446f, 31.323f, 32.151f, 32.955f, 33.578f, 34.438f, 34.676f, 35.063f, 35.384f, 35.889f,
+ 36.407f, 37.322f, 38.309f, 39.471f, 39.662f, 40.135f, 40.756f, 40.882f, 41.483f, 41.599f,
+ 41.869f, 42.765f, 43.065f, 43.750f, 44.136f, 44.469f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+};
+
const float bookBuhta[95 * 2] = {
0.000f, 0.284f, 0.750f, 1.287f, 1.965f, 2.410f, 2.975f, 3.819f, 4.682f, 6.184f,
6.735f, 7.182f, 7.918f, 8.786f, 10.161f, 11.182f, 11.970f, 12.297f, 13.910f, 14.518f,
@@ -173,6 +221,30 @@ const float bookBuhtaCZ[95 * 2] = {
0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
};
+const float bookBuhtaPL[95 * 2] = {
+ 0.000f, 0.023f, 0.480f, 0.982f, 1.912f, 2.264f, 2.747f, 3.054f, 3.621f, 4.120f,
+ 5.207f, 6.111f, 6.508f, 7.338f, 8.678f, 9.335f, 9.817f, 10.016f, 10.812f, 11.567f,
+ 12.078f, 13.060f, 13.604f, 14.150f, 15.211f, 15.822f, 16.176f, 16.640f, 17.817f, 18.353f,
+ 18.790f, 19.880f, 20.847f, 22.189f, 22.954f, 23.744f, 23.916f, 24.627f, 25.240f, 25.341f,
+ 25.727f, 26.229f, 26.943f, 27.991f, 28.702f, 29.004f, 30.128f, 30.514f, 31.176f, 32.223f,
+ 32.850f, 33.542f, 34.375f, 34.746f, 35.416f, 35.920f, 37.227f, 37.767f, 38.658f, 39.417f,
+ 39.932f, 40.717f, 41.051f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+
+ 0.000f, 0.016f, 0.552f, 1.090f, 1.752f, 2.685f, 3.623f, 4.351f, 4.942f, 5.223f,
+ 6.036f, 6.420f, 6.660f, 7.004f, 7.495f, 7.982f, 8.183f, 8.775f, 9.372f, 10.378f,
+ 10.680f, 12.081f, 12.771f, 13.465f, 14.306f, 15.346f, 15.829f, 16.440f, 17.191f, 18.362f,
+ 18.998f, 19.630f, 19.830f, 21.057f, 21.863f, 22.681f, 23.797f, 25.020f, 25.621f, 26.137f,
+ 26.804f, 28.078f, 29.077f, 29.586f, 30.024f, 30.360f, 30.990f, 31.509f, 31.893f, 33.320f,
+ 33.815f, 34.541f, 35.274f, 35.542f, 36.178f, 36.826f, 37.776f, 38.459f, 39.971f, 40.603f,
+ 41.432f, 42.203f, 42.634f, 43.145f, 43.944f, 44.321f, 45.638f, 46.481f, 47.315f, 47.904f,
+ 48.102f, 48.877f, 49.468f, 49.909f, 50.274f, 50.950f, 51.477f, 51.778f, 52.710f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+ 0.000f, 0.000f, 0.000f, 0.000f, 0.000f,
+};
+
class qdBookAllMiniGame : public qdMiniGameInterface {
public:
qdBookAllMiniGame(Common::String dll, Common::Language language) : _dll(dll), _language(language) {}
@@ -201,6 +273,13 @@ public:
_totalPageArts[1] = 82;
_totalPageArts[2] = 77;
+ } else if (_language == Common::PL_POL) {
+ _artTimeStamps = bookGusenicaPL;
+ _pageDurations[1] = 45.209f;
+ _pageDurations[2] = 45.580002f;
+
+ _totalPageArts[1] = 76;
+ _totalPageArts[2] = 77;
} else {
_artTimeStamps = bookGusenica;
_pageDurations[1] = 54.300f;
@@ -217,6 +296,13 @@ public:
_totalPageArts[1] = 93;
_totalPageArts[2] = 81;
+ } else if (_language == Common::PL_POL) {
+ _artTimeStamps = bookLesPL;
+ _pageDurations[1] = 53.042f;
+ _pageDurations[2] = 45.653f;
+
+ _totalPageArts[1] = 90;
+ _totalPageArts[2] = 85;
} else {
_artTimeStamps = bookLes;
_pageDurations[1] = 59.809f;
@@ -233,6 +319,13 @@ public:
_totalPageArts[1] = 70;
_totalPageArts[2] = 85;
+ } else if (_language == Common::PL_POL) {
+ _artTimeStamps = bookBuhtaPL;
+ _pageDurations[1] = 42.032001f;
+ _pageDurations[2] = 54.594002f;
+
+ _totalPageArts[1] = 62;
+ _totalPageArts[2] = 78;
} else {
_artTimeStamps = bookBuhta;
_pageDurations[1] = 43.913f;
@@ -244,23 +337,38 @@ public:
}
#if 0
- const int pageSize = 86;
+ const int pageSize = 91;
float artTimeStamps[pageSize * 3];
memset(artTimeStamps, 0, sizeof(artTimeStamps));
+ debugN("\t");
+
for (int i = 0; i < pageSize; i++) {
- debugN("%2.3f, ", artTimeStamps[pageSize + i]);
+ debugN("%6.3ff, ", artTimeStamps[pageSize + i]);
if ((i + 1) % 10 == 0)
- debug("");
+ debugN("\n\t");
}
- debug("");
+
+ for (int i = pageSize; i < 95; i++) {
+ debugN("%6.3ff, ", 0.0f);
+
+ if ((i + 1) % 10 == 0)
+ debugN("\n\t");
+ }
+ debugN("\n\n\t");
for (int i = 0; i < pageSize; i++) {
- debugN("%2.3f, ", artTimeStamps[pageSize * 2 + i]);
+ debugN("%6.3ff, ", artTimeStamps[pageSize * 2 + i]);
+
+ if ((i + 1) % 10 == 0)
+ debugN("\n\t");
+ }
+ for (int i = pageSize; i < 95; i++) {
+ debugN("%6.3ff, ", 0.0f);
if ((i + 1) % 10 == 0)
- debug("");
+ debugN("\n\t");
}
debug("");
#endif
More information about the Scummvm-git-logs
mailing list