[Scummvm-git-logs] scummvm master -> 254a63bcf981709ccf13250d5635b98591d858f9

criezy noreply at scummvm.org
Tue Oct 18 21:33:39 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
254a63bcf9 TOUCHE: Fix use of utf-8 characters for engine and game names


Commit: 254a63bcf981709ccf13250d5635b98591d858f9
    https://github.com/scummvm/scummvm/commit/254a63bcf981709ccf13250d5635b98591d858f9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-10-18T22:30:18+01:00

Commit Message:
TOUCHE: Fix use of utf-8 characters for engine and game names

The engine name in the configure.engine file was reverted to use
only ASCII characters. We cannot know what encoding will be assumed
by the terminal in which we run configure, so using non-ASCII
characters can result in unexpected results.

The engine and game name string literals in the source code were
changed to escape the non-ASCII character since there is no
guarantee that the compiler will assume utf-8 encoding for the
source code  files.

Changed paths:
    engines/touche/configure.engine
    engines/touche/detection.cpp


diff --git a/engines/touche/configure.engine b/engines/touche/configure.engine
index 80b2eb8583e..f35940ef471 100644
--- a/engines/touche/configure.engine
+++ b/engines/touche/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine touche "Touché: The Adventures of the Fifth Musketeer" yes "" "" "highres"
+add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes "" "" "highres"
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 6430892e5ba..1bf7fc410b1 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -25,7 +25,7 @@
 #include "touche/touche.h"
 
 static const PlainGameDescriptor toucheGames[] = {
-	{ "touche", "Touché: The Adventures of the Fifth Musketeer" },
+	{ "touche", "Touch\303\251: The Adventures of the Fifth Musketeer" },
 	{ 0, 0 }
 };
 
@@ -146,11 +146,11 @@ public:
 	}
 
 	const char *getEngineName() const override {
-		return "Touché: The Adventures of the Fifth Musketeer";
+		return "Touch\303\251: The Adventures of the Fifth Musketeer";
 	}
 
 	const char *getOriginalCopyright() const override {
-		return "Touché: The Adventures of the Fifth Musketeer (C) Clipper Software";
+		return "Touch\303\251: The Adventures of the Fifth Musketeer (C) Clipper Software";
 	}
 
 	const DebugChannelDef *getDebugChannels() const override {




More information about the Scummvm-git-logs mailing list