diff options
author | Max Horn | 2007-07-01 12:47:07 +0000 |
---|---|---|
committer | Max Horn | 2007-07-01 12:47:07 +0000 |
commit | e2ad271bd854369b437524cde60bfcb462225b82 (patch) | |
tree | d939d2be1b221b1ef57e58b24d1d4cc45062f5b6 | |
parent | d2189e7111fc4aab508395ed136d094e8893717b (diff) | |
download | scummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.tar.gz scummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.tar.bz2 scummvm-rg350-e2ad271bd854369b437524cde60bfcb462225b82.zip |
Removing non-ASCII chars from source code
svn-id: r27818
-rw-r--r-- | backends/platform/PalmOS/Src/launcher/launch.cpp | 2 | ||||
-rw-r--r-- | backends/platform/dc/display.cpp | 2 | ||||
-rw-r--r-- | backends/platform/dc/input.cpp | 6 | ||||
-rw-r--r-- | engines/agi/words.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/saveload.cpp | 4 | ||||
-rw-r--r-- | engines/gob/music.cpp | 6 | ||||
-rw-r--r-- | engines/gob/video.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_digital.cpp | 2 | ||||
-rw-r--r-- | engines/sword1/control.cpp | 9 | ||||
-rw-r--r-- | engines/sword1/staticres.cpp | 2 | ||||
-rw-r--r-- | sound/softsynth/ym2612.cpp | 4 | ||||
-rw-r--r-- | tools/skycpt/AsciiCptCompile.cpp | 2 | ||||
-rw-r--r-- | tools/skycpt/stdafx.cpp | 7 |
13 files changed, 18 insertions, 32 deletions
diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp index 7bc07c4fdf..9613abf1cc 100644 --- a/backends/platform/PalmOS/Src/launcher/launch.cpp +++ b/backends/platform/PalmOS/Src/launcher/launch.cpp @@ -424,7 +424,7 @@ Boolean StartScummVM(Int16 engine) { toLauncher= (gPrefs->exitLauncher); // gVars values - // (gVars->HRrefNum defined in checkHRmode on Clié) + // (gVars->HRrefNum defined in checkHRmode on Clie) #ifndef _DEBUG_ENGINE gVars->VFS.volRefNum = (gPrefs->card.autoDetect ? vfsInvalidVolRef : gPrefs->card.volRefNum); #else diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index da9f6e83ff..610fe0b108 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -585,7 +585,7 @@ void OSystem_Dreamcast::copyRectToOverlay(const int16 *buf, int pitch, static const OSystem::GraphicsMode gfxmodes[] = { - { "default", "640×480 16bpp", 0 }, + { "default", "640x480 16bpp", 0 }, { NULL, NULL, 0 } }; diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index bb4a2b9ec0..aa0d9efa21 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -98,8 +98,8 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y, newkey = key+('1'-0x59); else if(key >= 0x2d && key <= 0x38 && key != 0x31) newkey = ((shift & 0x22)? - "=¯`{ }+*½<>?" : - "-^@[ ];:§,./")[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 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y, case 0x64: case 0x87: newkey = ((shift & 0x22)? '_' : '\\'); break; case 0x89: - newkey = ((shift & 0x22)? '|' : '¥'); break; + newkey = ((shift & 0x22)? '|' : '?'); break; } } } 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 diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp index 5d36c9ec28..e3aa9d2528 100644 --- a/sound/softsynth/ym2612.cpp +++ b/sound/softsynth/ym2612.cpp @@ -129,7 +129,7 @@ void Operator2612::frequency(int freq) { value *= 127 - _specifiedTotalLevel; value /= 127; } - _attackTime = (int32) value; // 1 Éà == (1 << 12) + _attackTime = (int32) value; // 1 ?? == (1 << 12) if (_attackTime > 0) _attackTime = (1 << (12+10)) / (_owner->_rate * _attackTime); @@ -295,7 +295,7 @@ Voice2612::~Voice2612() { void Voice2612::velocity(int velo) { _velocity = velo; #if 0 - int v = (velo * _control7) >> 7; // ¤³¤ì¤À¤ÈÀºÅÙÎɤ¯¤Ê¤¤¤Ç¤¹¤Í + int v = (velo * _control7) >> 7; #else int v = velo + (_control7 - 127) * 4; #endif diff --git a/tools/skycpt/AsciiCptCompile.cpp b/tools/skycpt/AsciiCptCompile.cpp index 9df29f8b44..df5f1dfd30 100644 --- a/tools/skycpt/AsciiCptCompile.cpp +++ b/tools/skycpt/AsciiCptCompile.cpp @@ -1,4 +1,4 @@ -// AsciiCptCompile.cpp : Definiert den Einstiegspunkt für die Konsolenanwendung. +// AsciiCptCompile.cpp // #include "stdafx.h" diff --git a/tools/skycpt/stdafx.cpp b/tools/skycpt/stdafx.cpp index 22a7f25f57..fd4f341c7b 100644 --- a/tools/skycpt/stdafx.cpp +++ b/tools/skycpt/stdafx.cpp @@ -1,8 +1 @@ -// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet -// AsciiCptCompile.pch ist der vorcompilierte Header -// stdafx.obj enthält die vorcompilierte Typinformation - #include "stdafx.h" - -// TODO: Verweisen Sie auf zusätzliche Header, die in STDAFX.H -// und nicht in dieser Datei erforderlich sind. |