[Scummvm-cvs-logs] SF.net SVN: scummvm: [27818] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Jul 1 14:47:08 CEST 2007
Revision: 27818
http://scummvm.svn.sourceforge.net/scummvm/?rev=27818&view=rev
Author: fingolfin
Date: 2007-07-01 05:47:07 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Removing non-ASCII chars from source code
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/launcher/launch.cpp
scummvm/trunk/backends/platform/dc/display.cpp
scummvm/trunk/backends/platform/dc/input.cpp
scummvm/trunk/engines/agi/words.cpp
scummvm/trunk/engines/cruise/saveload.cpp
scummvm/trunk/engines/gob/music.cpp
scummvm/trunk/engines/gob/video.cpp
scummvm/trunk/engines/kyra/sound_digital.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/staticres.cpp
scummvm/trunk/sound/softsynth/ym2612.cpp
scummvm/trunk/tools/skycpt/AsciiCptCompile.cpp
scummvm/trunk/tools/skycpt/stdafx.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/launch.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/launch.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/launch.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -424,7 +424,7 @@
toLauncher= (gPrefs->exitLauncher);
// gVars values
- // (gVars->HRrefNum defined in checkHRmode on Cli\xE9)
+ // (gVars->HRrefNum defined in checkHRmode on Clie)
#ifndef _DEBUG_ENGINE
gVars->VFS.volRefNum = (gPrefs->card.autoDetect ? vfsInvalidVolRef : gPrefs->card.volRefNum);
#else
Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/backends/platform/dc/display.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -585,7 +585,7 @@
static const OSystem::GraphicsMode gfxmodes[] = {
- { "default", "640\xD7480 16bpp", 0 },
+ { "default", "640x480 16bpp", 0 },
{ NULL, NULL, 0 }
};
Modified: scummvm/trunk/backends/platform/dc/input.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/input.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/backends/platform/dc/input.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -98,8 +98,8 @@
newkey = key+('1'-0x59);
else if(key >= 0x2d && key <= 0x38 && key != 0x31)
newkey = ((shift & 0x22)?
- "=\xAF`{ }+*\xBD<>?" :
- "-^@[ ];:\xA7,./")[key - 0x2d];
+ "=?`{ }+*?<>?" :
+ "-^@[ ];:?,./")[key - 0x2d];
else if(key >= 0x3a && key <= 0x43)
newkey = key+(Common::KEYCODE_F1-0x3a);
else if(key >= 0x54 && key <= 0x57)
@@ -134,7 +134,7 @@
case 0x64: case 0x87:
newkey = ((shift & 0x22)? '_' : '\\'); break;
case 0x89:
- newkey = ((shift & 0x22)? '|' : '\xA5'); break;
+ newkey = ((shift & 0x22)? '|' : '?'); break;
}
}
}
Modified: scummvm/trunk/engines/agi/words.cpp
===================================================================
--- scummvm/trunk/engines/agi/words.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/agi/words.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -88,7 +88,7 @@
* 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 \xC5kesson, November 2001
+ * Thomas Akesson, November 2001
*/
int AgiEngine::findWord(char *word, int *flen) {
int mchr = 0; /* matched chars */
Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/cruise/saveload.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -177,12 +177,12 @@
fileHandle = fopen(buffer, "rb");
if (!fileHandle) {
- printInfoBlackBox("Sauvegarde non trouv\xE9e...");
+ printInfoBlackBox("Savegame not found...");
waitForPlayerInput();
return (-1);
}
- printInfoBlackBox("Chargement en cours...");
+ printInfoBlackBox("Loading in progress...");
fread(saveIdentBuffer, 6, 1, fileHandle);
Modified: scummvm/trunk/engines/gob/music.cpp
===================================================================
--- scummvm/trunk/engines/gob/music.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/gob/music.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -268,20 +268,20 @@
// 0x3A donne 0x2AF;
// 3A
// << 7 = 1D00
- // + E000 = FD00 n\xE9gatif
+ // + E000 = FD00 negatif
// * 19 = xB500
// / 2000 = -2 => Ligne 17h, colonne -1
// 2E
// << 7 = 1700
- // + E000 = F700 n\xE9gatif
+ // + E000 = F700 negatif
// * 19 = x1F00
// / 2000 =
short a;
short lin;
short col;
- a = (note << 7) + 0xE000; // Volontairement tronqu\xE9
+ a = (note << 7) + 0xE000; // Volontairement tronque
a = (short)((long)a * 25 / 0x2000);
if (a < 0) {
col = - ((24 - a) / 25);
Modified: scummvm/trunk/engines/gob/video.cpp
===================================================================
--- scummvm/trunk/engines/gob/video.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/gob/video.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -235,7 +235,7 @@
/*
* The original's version of the Bresenham Algorithm was a bit "unclean"
- * and produced strange edges at 45\xB0, 135\xB0, 225\xB0 and 315\xB0, 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
*/
Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -29,7 +29,7 @@
namespace Kyra {
-// Thanks to Torbj\xF6rn 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
Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/sword1/control.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -650,14 +650,7 @@
}
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[] = "\xE9\xE8\xE1\xE0\xFA\xF9\xE4\xF6\xFC\xC4\xD6\xDC\xDF,.:-()?! \"\'";
+ static const char allowedSpecials[] = ",.:-()?! \"\'";
if (((ascii >= 'A') && (ascii <= 'Z')) ||
((ascii >= 'a') && (ascii <= 'z')) ||
((ascii >= '0') && (ascii <= '9')) ||
Modified: scummvm/trunk/engines/sword1/staticres.cpp
===================================================================
--- scummvm/trunk/engines/sword1/staticres.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/engines/sword1/staticres.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -5158,7 +5158,7 @@
},
},
//------------------------
- // 198 Ambient sound for Montfau\xE7on Square
+ // 198 Ambient sound for Montfaucon Square
{
FX_MONTAMB, // sampleId
FX_LOOP, // type
Modified: scummvm/trunk/sound/softsynth/ym2612.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/sound/softsynth/ym2612.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -129,7 +129,7 @@
value *= 127 - _specifiedTotalLevel;
value /= 127;
}
- _attackTime = (int32) value; // 1 \xC9\xC3 == (1 << 12)
+ _attackTime = (int32) value; // 1 ?? == (1 << 12)
if (_attackTime > 0)
_attackTime = (1 << (12+10)) / (_owner->_rate * _attackTime);
@@ -295,7 +295,7 @@
void Voice2612::velocity(int velo) {
_velocity = velo;
#if 0
- int v = (velo * _control7) >> 7; // \xA4\xB3\xA4\xEC\xA4\xC0\xA4\xC8\xC0\xBA\xC5\xD9\xCEɤ\xAF\xA4ʤ\xA4\xA4Ǥ\xB9\xA4\xCD
+ int v = (velo * _control7) >> 7;
#else
int v = velo + (_control7 - 127) * 4;
#endif
Modified: scummvm/trunk/tools/skycpt/AsciiCptCompile.cpp
===================================================================
--- scummvm/trunk/tools/skycpt/AsciiCptCompile.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/tools/skycpt/AsciiCptCompile.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -1,4 +1,4 @@
-// AsciiCptCompile.cpp : Definiert den Einstiegspunkt f\xFCr die Konsolenanwendung.
+// AsciiCptCompile.cpp
//
#include "stdafx.h"
Modified: scummvm/trunk/tools/skycpt/stdafx.cpp
===================================================================
--- scummvm/trunk/tools/skycpt/stdafx.cpp 2007-07-01 10:07:59 UTC (rev 27817)
+++ scummvm/trunk/tools/skycpt/stdafx.cpp 2007-07-01 12:47:07 UTC (rev 27818)
@@ -1,8 +1 @@
-// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-// AsciiCptCompile.pch ist der vorcompilierte Header
-// stdafx.obj enth\xE4lt die vorcompilierte Typinformation
-
#include "stdafx.h"
-
-// TODO: Verweisen Sie auf zus\xE4tzliche Header, die in STDAFX.H
-// und nicht in dieser Datei erforderlich sind.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list