[Scummvm-git-logs] scummvm master -> 24d4cdf32090b508f557f9c129fe3401f936f329
sev-
noreply at scummvm.org
Mon Sep 16 19:35:32 UTC 2024
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9a93ffd796 QDENGINE: Mapped Mac option key for convenience
c3315eab28 QDENGINE: Make distinct name for XML dumps in human-readable form
401bc93c7e QDENGINE: Better debug output for missing links
ed61fb897e QDENGINE: More cp-1251 character mapping
c71697975a COMMON: Make the collision warnings unique
24d4cdf320 QDENGINE: Wrap another path into proper object on loading
Commit: 9a93ffd79689a015e676c283284220c017adb1ce
https://github.com/scummvm/scummvm/commit/9a93ffd79689a015e676c283284220c017adb1ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:14+02:00
Commit Message:
QDENGINE: Mapped Mac option key for convenience
Changed paths:
engines/qdengine/system/input/keyboard_input.cpp
diff --git a/engines/qdengine/system/input/keyboard_input.cpp b/engines/qdengine/system/input/keyboard_input.cpp
index 7a0dd86ebca..d74aa0c31fe 100644
--- a/engines/qdengine/system/input/keyboard_input.cpp
+++ b/engines/qdengine/system/input/keyboard_input.cpp
@@ -164,7 +164,7 @@ static const int keyMapTable[] = {
Common::KEYCODE_LALT, VK_LMENU,
Common::KEYCODE_RMETA, VK_RWIN,
Common::KEYCODE_LMETA, VK_LWIN,
- Common::KEYCODE_LSUPER, -1,
+ Common::KEYCODE_LSUPER, VK_LWIN,
Common::KEYCODE_RSUPER, -1,
Common::KEYCODE_MODE, -1,
Common::KEYCODE_COMPOSE, -1,
Commit: c3315eab28ffbbff3fe5be797f48f229d594c8ef
https://github.com/scummvm/scummvm/commit/c3315eab28ffbbff3fe5be797f48f229d594c8ef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:14+02:00
Commit Message:
QDENGINE: Make distinct name for XML dumps in human-readable form
Changed paths:
engines/qdengine/qdengine.cpp
diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index dd477184ec7..8af00f53d9e 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -164,8 +164,19 @@ Common::Error QDEngineEngine::run() {
_gameD->load_script(script_name.c_str());
if (ConfMan.getBool("dump_scripts")) {
- _gameD->save_script("qd_game.xml");
- debug("Dumped qd_game.xml%s", debugChannelSet(-1, kDebugLog) ? " in human-readable form" : "");
+ Common::String fname = "qd_game";
+
+ if (debugChannelSet(-1, kDebugLog)) {
+ fname += "_" + g_engine->getGameId();
+
+ if (g_engine->getLanguage() != Common::RU_RUS)
+ fname += "-" + Common::String(Common::getLanguageCode(g_engine->getLanguage()));
+ }
+
+ fname += ".xml";
+
+ _gameD->save_script(fname.c_str());
+ debug("Dumped %s%s", fname.c_str(), debugChannelSet(-1, kDebugLog) ? " in human-readable form" : "");
}
_gameD->set_scene_loading_progress_callback(qd_show_load_progress);
Commit: 401bc93c7e667c0c3b78f07c1b6ede7c005e018a
https://github.com/scummvm/scummvm/commit/401bc93c7e667c0c3b78f07c1b6ede7c005e018a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:15+02:00
Commit Message:
QDENGINE: Better debug output for missing links
rybalka has few of those, requires investigation
Changed paths:
engines/qdengine/qdcore/qd_named_object_indexer.cpp
diff --git a/engines/qdengine/qdcore/qd_named_object_indexer.cpp b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
index 901b8d80c29..658c9072578 100644
--- a/engines/qdengine/qdcore/qd_named_object_indexer.cpp
+++ b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
@@ -44,7 +44,7 @@ bool qdNamedObjectIndexer::qdNamedObjectReferenceLink::resolve() {
if (qdGameDispatcher *dp = qdGameDispatcher::get_dispatcher()) {
_object = dp->get_named_object(&_reference);
if (!_object) {
- debugC(3, kDebugLog, "qdNamedObjectReferenceLink::resolve() failed '%s'", transCyrillic(_reference.toString()));
+ debugC(1, kDebugLog, "qdNamedObjectReferenceLink::resolve() failed '%s'", _reference.toString().c_str());
} else
return true;
}
Commit: ed61fb897e21fcb4129cb350283e9c2dede7a881
https://github.com/scummvm/scummvm/commit/ed61fb897e21fcb4129cb350283e9c2dede7a881
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:15+02:00
Commit Message:
QDENGINE: More cp-1251 character mapping
Changed paths:
engines/qdengine/qdengine.cpp
diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index 8af00f53d9e..20ea930e532 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -543,6 +543,7 @@ byte *transCyrillic(const Common::String &str) {
#ifndef WIN32
static int trans[] = {
+ 0xa0, 0xc2a0,
0xa8, 0xd081, 0xab, 0xc2ab, 0xb8, 0xd191, 0xbb, 0xc2bb, 0xc0, 0xd090,
0xc1, 0xd091, 0xc2, 0xd092, 0xc3, 0xd093, 0xc4, 0xd094,
0xc5, 0xd095, 0xc6, 0xd096, 0xc7, 0xd097, 0xc8, 0xd098,
@@ -602,11 +603,14 @@ byte *transCyrillic(const Common::String &str) {
tmp[i++] = 0xE2;
tmp[i++] = 0x80;
tmp[i++] = 0x94;
+ } else if (*p == 0xB9) { // "â„–" -- NUMERO DASH
+ tmp[i++] = 0xE2;
+ tmp[i++] = 0x84;
+ tmp[i++] = 0x96;
} else {
if (!trans[j]) {
warning("transCyrillic: no mapping for %d (0x%x)", *p, *p);
- tmp[i++] = '?';
- tmp[i++] = '?';
+ tmp[i++] = '^';
}
}
}
Commit: c71697975a5b672554f391864cff298b821758c8
https://github.com/scummvm/scummvm/commit/c71697975a5b672554f391864cff298b821758c8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:15+02:00
Commit Message:
COMMON: Make the collision warnings unique
This fixes 3 equal warnings in different code branches, so the
rootcause could be identified more easily
Changed paths:
common/path.cpp
diff --git a/common/path.cpp b/common/path.cpp
index 16561795c09..4d06cc6dccf 100644
--- a/common/path.cpp
+++ b/common/path.cpp
@@ -157,7 +157,7 @@ inline String Path::unescape(char dstSeparator, const char *begin, const char *e
dst += ESCAPE;
#ifndef RELEASE_BUILD
if (!_shownSeparatorCollisionWarning && dstSeparator == ESCAPE) {
- warning("Collision while unescaping in path part \"%s\" with separator %c", begin, dstSeparator);
+ warning("Collision 1 while unescaping in path part \"%s\" with separator %c", begin, dstSeparator);
_shownSeparatorCollisionWarning = true;
}
#endif
@@ -166,7 +166,7 @@ inline String Path::unescape(char dstSeparator, const char *begin, const char *e
dst += SEPARATOR;
#ifndef RELEASE_BUILD
if (!_shownSeparatorCollisionWarning && dstSeparator == SEPARATOR) {
- warning("Collision while unescaping in path part \"%s\" with separator %c", begin, dstSeparator);
+ warning("Collision 2 while unescaping in path part \"%s\" with separator %c", begin, dstSeparator);
_shownSeparatorCollisionWarning = true;
}
#endif
@@ -298,7 +298,7 @@ String Path::toString(char separator) const {
// Path was not escaped, replace all SEPARATOR by the real separator
#ifndef RELEASE_BUILD
if (!_shownSeparatorCollisionWarning && strchr(_str.c_str(), separator)) {
- warning("Collision while unescaping path \"%s\" with separator %c", _str.c_str(), separator);
+ warning("Collision 3 while unescaping path \"%s\" with separator %c", _str.c_str(), separator);
_shownSeparatorCollisionWarning = true;
}
#endif
Commit: 24d4cdf32090b508f557f9c129fe3401f936f329
https://github.com/scummvm/scummvm/commit/24d4cdf32090b508f557f9c129fe3401f936f329
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-16T21:35:15+02:00
Commit Message:
QDENGINE: Wrap another path into proper object on loading
Changed paths:
engines/qdengine/qdcore/qd_interface_text_window.cpp
diff --git a/engines/qdengine/qdcore/qd_interface_text_window.cpp b/engines/qdengine/qdcore/qd_interface_text_window.cpp
index fcdd8705212..5c9f9d2f011 100644
--- a/engines/qdengine/qdcore/qd_interface_text_window.cpp
+++ b/engines/qdengine/qdcore/qd_interface_text_window.cpp
@@ -322,7 +322,7 @@ bool qdInterfaceTextWindow::load_script_body(const xml::tag *p) {
for (xml::tag::subtag_iterator it = p->subtags_begin(); it != p->subtags_end(); ++it) {
switch (it->ID()) {
case QDSCR_TEXT_WINDOW_BORDER_BACK:
- set_border_background_file(it->data());
+ set_border_background_file(Common::Path(it->data(), '\\'));
break;
case QDSCR_TEXT_WINDOW_SLIDER:
set_slider_name(it->data());
More information about the Scummvm-git-logs
mailing list