[Scummvm-git-logs] scummvm branch-2-7 -> cff12f580f7d2a57604f2e1c7664affdc0d4b997

[dwatteau]

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:
cf970694cd TWINE: fixed encoding for custom translations
cff12f580f CI: Update vcpkg msys runtime version


Commit: cf970694cd198220e07a990a6116f7bfd77f6b0a
    https://github.com/scummvm/scummvm/commit/cf970694cd198220e07a990a6116f7bfd77f6b0a
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-04-12T10:47:17+02:00

Commit Message:
TWINE: fixed encoding for custom translations

see issue #14192

Changed paths:
    engines/twine/parser/text.cpp


diff --git a/engines/twine/parser/text.cpp b/engines/twine/parser/text.cpp
index bd72cc7ece8..7db288402ca 100644
--- a/engines/twine/parser/text.cpp
+++ b/engines/twine/parser/text.cpp
@@ -21,6 +21,7 @@
 
 #include "twine/parser/text.h"
 #include "common/debug.h"
+#include "common/str-enc.h"
 #include "common/util.h"
 #include "common/translation.h"
 #include "twine/resources/hqr.h"
@@ -30,10 +31,10 @@ namespace TwinE {
 
 void TextData::initCustomTexts(TextBankId textBankId) {
 	if (textBankId == TextBankId::Options_and_menus) {
-		add(textBankId, TextEntry{_c("High resolution on", "Options menu"), -1, TextId::kCustomHighResOptionOn});
-		add(textBankId, TextEntry{_c("High resolution off", "Options menu"), -1, TextId::kCustomHighResOptionOff});
-		add(textBankId, TextEntry{_c("Wall collision on", "Options menu"), -1, TextId::kCustomWallCollisionOn});
-		add(textBankId, TextEntry{_c("Wall collision off", "Options menu"), -1, TextId::kCustomWallCollisionOff});
+		add(textBankId, TextEntry{_c("High resolution on", "Options menu").encode(Common::CodePage::kDos850), -1, TextId::kCustomHighResOptionOn});
+		add(textBankId, TextEntry{_c("High resolution off", "Options menu").encode(Common::CodePage::kDos850), -1, TextId::kCustomHighResOptionOff});
+		add(textBankId, TextEntry{_c("Wall collision on", "Options menu").encode(Common::CodePage::kDos850), -1, TextId::kCustomWallCollisionOn});
+		add(textBankId, TextEntry{_c("Wall collision off", "Options menu").encode(Common::CodePage::kDos850), -1, TextId::kCustomWallCollisionOff});
 	}
 }
 


Commit: cff12f580f7d2a57604f2e1c7664affdc0d4b997
    https://github.com/scummvm/scummvm/commit/cff12f580f7d2a57604f2e1c7664affdc0d4b997
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-04-12T10:49:05+02:00

Commit Message:
CI: Update vcpkg msys runtime version

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b80cf0f818..8f0bd531e76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           # use a fork of vcpkg with the previous working setup from March 2022
           # with the the January 2023 fix for msys-libtool's url cherry-picked.
           vcpkgGitURL: 'https://github.com/sluicebox/vcpkg.git'
-          vcpkgGitCommitId: f28c1edaffcb027da40b120112c89033d4303dcc
+          vcpkgGitCommitId: 47c0c6e2cb7e70edf5799bb48560d7ddbeb6250d
           vcpkgTriplet: '${{ matrix.triplet }}'
           vcpkgArguments: '${{ matrix.vcpkgPackages }}'
 #      - name: Upload libs