aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2007-07-01 12:47:07 +0000
committerMax Horn2007-07-01 12:47:07 +0000
commite2ad271bd854369b437524cde60bfcb462225b82 (patch)
treed939d2be1b221b1ef57e58b24d1d4cc45062f5b6 /engines
parentd2189e7111fc4aab508395ed136d094e8893717b (diff)
downloadscummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.tar.gz
scummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.tar.bz2
scummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.zip
Removing non-ASCII chars from source code
svn-id: r27818
Diffstat (limited to 'engines')
-rw-r--r--engines/agi/words.cpp2
-rw-r--r--engines/cruise/saveload.cpp4
-rw-r--r--engines/gob/music.cpp6
-rw-r--r--engines/gob/video.cpp2
-rw-r--r--engines/kyra/sound_digital.cpp2
-rw-r--r--engines/sword1/control.cpp9
-rw-r--r--engines/sword1/staticres.cpp2
7 files changed, 10 insertions, 17 deletions
diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index 5fc3c3bca9..ed33b9463a 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -88,7 +88,7 @@ void AgiEngine::unloadWords() {
* Uses an algorithm hopefully like the one Sierra used. Returns the ID
* of the word and the length in flen. Returns -1 if not found.
*
- * Thomas Åkesson, November 2001
+ * Thomas Akesson, November 2001
*/
int AgiEngine::findWord(char *word, int *flen) {
int mchr = 0; /* matched chars */
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index b5ec064d4b..189bde1ea1 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -177,12 +177,12 @@ int loadSavegameData(int saveGameIdx) {
fileHandle = fopen(buffer, "rb");
if (!fileHandle) {
- printInfoBlackBox("Sauvegarde non trouvée...");
+ printInfoBlackBox("Savegame not found...");
waitForPlayerInput();
return (-1);
}
- printInfoBlackBox("Chargement en cours...");
+ printInfoBlackBox("Loading in progress...");
fread(saveIdentBuffer, 6, 1, fileHandle);
diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp
index 6e678c103e..0f38827363 100644
--- a/engines/gob/music.cpp
+++ b/engines/gob/music.cpp
@@ -268,20 +268,20 @@ void Adlib::setKey(byte voice, byte note, bool on, bool spec) {
// 0x3A donne 0x2AF;
// 3A
// << 7 = 1D00
- // + E000 = FD00 négatif
+ // + E000 = FD00 negatif
// * 19 = xB500
// / 2000 = -2 => Ligne 17h, colonne -1
// 2E
// << 7 = 1700
- // + E000 = F700 négatif
+ // + E000 = F700 negatif
// * 19 = x1F00
// / 2000 =
short a;
short lin;
short col;
- a = (note << 7) + 0xE000; // Volontairement tronqué
+ a = (note << 7) + 0xE000; // Volontairement tronque
a = (short)((long)a * 25 / 0x2000);
if (a < 0) {
col = - ((24 - a) / 25);
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 0bc87f42d5..6f88a5a993 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -235,7 +235,7 @@ void Video::drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1,
/*
* The original's version of the Bresenham Algorithm was a bit "unclean"
- * and produced strange edges at 45°, 135°, 225° and 315°, so using the
+ * and produced strange edges at 45, 135, 225 and 315 degrees, so using the
* version found in the Wikipedia article about the
* "Bresenham's line algorithm" instead
*/
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index e2f92c9925..72d19ffd32 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -29,7 +29,7 @@
namespace Kyra {
-// Thanks to Torbjörn Andersson (eriktorbjorn) for his aud player on which
+// Thanks to Torbjorn Andersson (eriktorbjorn) for his aud player on which
// this code is based on
// TODO: cleanup of whole AUDStream
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 1ebfaedb2e..c5b968aabe 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -650,14 +650,7 @@ bool Control::getConfirm(const uint8 *title) {
}
bool Control::keyAccepted(uint16 ascii) {
- // this routine needs changes for Czech keys... No idea how to do that, though.
- // FIXME: It is not a good idea to put non-ASCII chars into a C source file,
- // since there is no way to specify which encoding you are using.
- // It is better to encode them as hex/octal. Although in this particular
- // case, it seems questionable to do this at all, since we currently
- // do not at all specify which encoding keyboard events use, so this
- // check here is probably not portable anyway...
- static const char allowedSpecials[] = "éèáàúùäöüÄÖÜß,.:-()?! \"\'";
+ static const char allowedSpecials[] = ",.:-()?! \"\'";
if (((ascii >= 'A') && (ascii <= 'Z')) ||
((ascii >= 'a') && (ascii <= 'z')) ||
((ascii >= '0') && (ascii <= '9')) ||
diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp
index 366e2c7608..08e6a108c4 100644
--- a/engines/sword1/staticres.cpp
+++ b/engines/sword1/staticres.cpp
@@ -5158,7 +5158,7 @@ const FxDef Sound::_fxList[312] = {
},
},
//------------------------
- // 198 Ambient sound for Montfauçon Square
+ // 198 Ambient sound for Montfaucon Square
{
FX_MONTAMB, // sampleId
FX_LOOP, // type