[Scummvm-cvs-logs] SF.net SVN: scummvm:[52791] scummvm/trunk
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sat Sep 18 12:55:17 CEST 2010
Revision: 52791
http://scummvm.svn.sourceforge.net/scummvm/?rev=52791&view=rev
Author: eriktorbjorn
Date: 2010-09-18 10:55:16 +0000 (Sat, 18 Sep 2010)
Log Message:
-----------
JANITORIAL: Removed most punctuation at end of warning() and error()
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.
Modified Paths:
--------------
scummvm/trunk/backends/midi/windows.cpp
scummvm/trunk/backends/platform/android/android.cpp
scummvm/trunk/backends/platform/gp2x/gp2x.cpp
scummvm/trunk/backends/platform/gph/gph-main.cpp
scummvm/trunk/backends/platform/openpandora/op-main.cpp
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/engines/agi/lzw.cpp
scummvm/trunk/engines/agi/predictive.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/cine/part.cpp
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/gob/palanim.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/mohawk/myst_scripts.cpp
scummvm/trunk/engines/mohawk/riven_saveload.cpp
scummvm/trunk/engines/parallaction/gui_ns.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/sound_br.cpp
scummvm/trunk/engines/saga/font.cpp
scummvm/trunk/engines/saga/font.h
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/engine/kfile.cpp
scummvm/trunk/engines/sci/engine/kvideo.cpp
scummvm/trunk/engines/sci/graphics/ports.cpp
scummvm/trunk/engines/sci/resource_audio.cpp
scummvm/trunk/engines/scumm/he/wiz_he.cpp
scummvm/trunk/engines/scumm/object.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/graphics/VectorRenderer.cpp
scummvm/trunk/graphics/jpeg.cpp
scummvm/trunk/graphics/video/codecs/qdm2.cpp
scummvm/trunk/gui/saveload.cpp
scummvm/trunk/sound/fmopl.cpp
scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/midi/windows.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -106,7 +106,7 @@
return;
if (WaitForSingleObject (_streamEvent, 2000) == WAIT_TIMEOUT) {
- warning ("Could not send SysEx - MMSYSTEM is still trying to send data.");
+ warning ("Could not send SysEx - MMSYSTEM is still trying to send data");
return;
}
Modified: scummvm/trunk/backends/platform/android/android.cpp
===================================================================
--- scummvm/trunk/backends/platform/android/android.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/android/android.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -400,7 +400,7 @@
jsize len = env->GetArrayLength(jbuf);
jbyte* buf = env->GetByteArrayElements(jbuf, NULL);
if (buf == NULL) {
- warning("Unable to get Java audio byte array. Skipping.");
+ warning("Unable to get Java audio byte array. Skipping");
return;
}
Audio::MixerImpl* mixer =
@@ -1135,7 +1135,7 @@
pthread_mutex_t *mutex = new pthread_mutex_t;
if (pthread_mutex_init(mutex, &attr) != 0) {
- warning("pthread_mutex_init() failed!");
+ warning("pthread_mutex_init() failed");
delete mutex;
return NULL;
}
@@ -1144,18 +1144,18 @@
void OSystem_Android::lockMutex(MutexRef mutex) {
if (pthread_mutex_lock((pthread_mutex_t*)mutex) != 0)
- warning("pthread_mutex_lock() failed!");
+ warning("pthread_mutex_lock() failed");
}
void OSystem_Android::unlockMutex(MutexRef mutex) {
if (pthread_mutex_unlock((pthread_mutex_t*)mutex) != 0)
- warning("pthread_mutex_unlock() failed!");
+ warning("pthread_mutex_unlock() failed");
}
void OSystem_Android::deleteMutex(MutexRef mutex) {
pthread_mutex_t* m = (pthread_mutex_t*)mutex;
if (pthread_mutex_destroy(m) != 0)
- warning("pthread_mutex_destroy() failed!");
+ warning("pthread_mutex_destroy() failed");
else
delete m;
}
Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -115,7 +115,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Could not obtain current working directory.");
+ error("Could not obtain current working directory");
} else {
printf("Current working directory: %s\n", workDirName);
}
@@ -328,7 +328,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Error: Could not obtain current working directory.");
+ error("Error: Could not obtain current working directory");
}
Common::FSNode workdirNode(workDirName);
Modified: scummvm/trunk/backends/platform/gph/gph-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/gph/gph-main.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/gph/gph-main.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -78,7 +78,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Could not obtain current working directory.");
+ error("Could not obtain current working directory");
} else {
printf("Current working directory: %s\n", workDirName);
}
@@ -170,7 +170,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Error: Could not obtain current working directory.");
+ error("Error: Could not obtain current working directory");
}
Common::FSNode workdirNode(workDirName);
Modified: scummvm/trunk/backends/platform/openpandora/op-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/openpandora/op-main.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/openpandora/op-main.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -79,7 +79,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Could not obtain current working directory.");
+ error("Could not obtain current working directory");
} else {
printf("Current working directory: %s\n", workDirName);
}
@@ -165,7 +165,7 @@
char workDirName[PATH_MAX+1];
if (getcwd(workDirName, PATH_MAX) == NULL) {
- error("Error: Could not obtain current working directory.");
+ error("Error: Could not obtain current working directory");
}
Common::FSNode workdirNode(workDirName);
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -527,7 +527,7 @@
}
if (!bestMode) {
- warning("Unable to enforce the desired aspect ratio!");
+ warning("Unable to enforce the desired aspect ratio");
return;
}
//printf("%d %d\n", bestMode->w, bestMode->h);
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -429,7 +429,7 @@
GUI::Actions::init();
GUI_Actions::Instance()->initInstanceMain(this);
if (!GUI_Actions::Instance()->loadMapping()) { // error during loading means not present/wrong version
- warning("Setting default action mappings.");
+ warning("Setting default action mappings");
GUI_Actions::Instance()->saveMapping(); // write defaults
}
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/base/commandLine.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -950,9 +950,9 @@
if (dir && *dir && strlen(dir) < MAXPATHLEN) {
Common::FSNode saveDir(dir);
if (!saveDir.exists()) {
- warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored.");
+ warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored");
} else if (!saveDir.isWritable()) {
- warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored.");
+ warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored");
} else {
settings["savepath"] = dir;
}
Modified: scummvm/trunk/engines/agi/lzw.cpp
===================================================================
--- scummvm/trunk/engines/agi/lzw.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/agi/lzw.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -107,7 +107,7 @@
*buffer++ = appendCharacter[code];
code = prefixCode[code];
if (i++ >= 4000) {
- error("lzw: error in code expansion.");
+ error("lzw: error in code expansion");
}
}
*buffer = code;
Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/agi/predictive.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -518,7 +518,7 @@
_predictiveDictLine = (char **)calloc(1, sizeof(char *) * lines);
if (_predictiveDictLine == NULL) {
- warning("Cannot allocate memory for line index buffer.");
+ warning("Cannot allocate memory for line index buffer");
return;
}
_predictiveDictLine[0] = _predictiveDictText;
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/agi/saveload.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -333,7 +333,7 @@
debug(0, "Saved game MD5: \"%s\"", md5);
if (!getGameMD5()) {
- warning("Since your game was only detected via the fallback detector, there is no possibility to assure the save is compatible with your game version.");
+ warning("Since your game was only detected via the fallback detector, there is no possibility to assure the save is compatible with your game version");
debug(0, "The game used for saving is \"%s\".", md5);
} else if (strcmp(md5, getGameMD5())) {
Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/cine/part.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -164,7 +164,7 @@
// All file name blocks' sizes were divisible by either 11 or 13, but not with both.
fileNameLength = (fileNameLenMod11 ? 11 : 13);
} else {
- warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme.");
+ warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme");
// Here we use the former file name length detection method
// if we couldn't deduce the file name length from the data.
fileNameLength = (compressed ? 11 : 13);
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/engine.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -110,7 +110,7 @@
// heaps of (sound) memory get allocated but never freed. Of course,
// there still would be problems with many games...
if (!_mixer->isReady())
- warning("Sound initialization failed. This may cause severe problems in some games.");
+ warning("Sound initialization failed. This may cause severe problems in some games");
// Setup a dummy cursor and palette, so that all engines can use
// CursorMan.replace without having any headaches about memory leaks.
Modified: scummvm/trunk/engines/gob/palanim.cpp
===================================================================
--- scummvm/trunk/engines/gob/palanim.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/gob/palanim.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -88,7 +88,7 @@
if (oper == 0) {
if (_vm->_global->_setAllPalette) {
if (_vm->_global->_inVM != 0)
- error("PalAnim::fadeStep(): _vm->_global->_inVM != 0 not supported.");
+ error("PalAnim::fadeStep(): _vm->_global->_inVM != 0 not supported");
for (int i = 0; i < 256; i++) {
newRed = fadeColor(_vm->_global->_redPalette[i], _toFadeRed[i]);
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -179,7 +179,7 @@
#ifdef ENABLE_LOL
_flags.gameID = GI_LOL;
#else
- error("Lands of Lore demo is not supported in this build.");
+ error("Lands of Lore demo is not supported in this build");
#endif // !ENABLE_LOL
}
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -137,7 +137,7 @@
kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header);
if (errorCode != kRSHENoError) {
if (errorCode == kRSHEInvalidType)
- warning("No ScummVM Kyra engine savefile header.");
+ warning("No ScummVM Kyra engine savefile header");
else if (errorCode == kRSHEInvalidVersion)
warning("Savegame is not the right version (%u, '%s')", header.version, header.oldHeader ? "true" : "false");
else if (errorCode == kRSHEIoError)
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/kyra/screen.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -1084,7 +1084,7 @@
bool Screen::loadFont(FontId fontId, const char *filename) {
if (fontId == FID_SJIS_FNT) {
- warning("Trying to replace system SJIS font.");
+ warning("Trying to replace system SJIS font");
return true;
}
Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -2455,7 +2455,7 @@
if (var8 != 0xFFFF)
_vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8));
else
- warning("Opcode 120: No invoking Resource Var 8 found!");
+ warning("Opcode 120: No invoking Resource Var 8 found");
} else
unknown(op, var, argc, argv);
break;
Modified: scummvm/trunk/engines/mohawk/riven_saveload.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven_saveload.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/mohawk/riven_saveload.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -110,7 +110,7 @@
delete vers;
if ((saveGameVersion == kCDSaveGameVersion && (_vm->getFeatures() & GF_DVD))
|| (saveGameVersion == kDVDSaveGameVersion && !(_vm->getFeatures() & GF_DVD))) {
- warning("Incompatible saved game versions. No support for this yet.");
+ warning("Incompatible saved game versions. No support for this yet");
delete mhk;
return false;
}
Modified: scummvm/trunk/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_ns.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/parallaction/gui_ns.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -586,7 +586,7 @@
if (_points[2] >= _points[0] && _points[2] >= _points[1]) {
character = CHAR_DOUGH;
} else {
- error("If you read this, either your CPU or transivity is broken (we believe the former).");
+ error("If you read this, either your CPU or transivity is broken (we believe the former)");
}
_vm->cleanupGame();
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -201,7 +201,7 @@
}
if (_di == 120)
- error("No more location slots available. Please report this immediately to ScummVM team.");
+ error("No more location slots available. Please report this immediately to ScummVM team");
if (_currentLocationIndex == -1) {
strcpy(_locationNames[_numLocations], name);
Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -130,7 +130,7 @@
break;
default:
- warning("Unexpected midi event 0x%02X in midi data.", info.event);
+ warning("Unexpected midi event 0x%02X in midi data", info.event);
}
//if ((type == 0xB) && (info.basic.param1 == 64)) info.basic.param2 = 127;
@@ -173,7 +173,7 @@
byte *pos = data;
if (memcmp("MSCt", pos, 4)) {
- warning("Expected header not found in music file.");
+ warning("Expected header not found in music file");
return false;
}
pos += 4;
Modified: scummvm/trunk/engines/saga/font.cpp
===================================================================
--- scummvm/trunk/engines/saga/font.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/saga/font.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -123,7 +123,7 @@
}
if (readS.pos() != FONT_DESCSIZE) {
- error("Invalid font resource size.");
+ error("Invalid font resource size");
}
font->normal.font = (byte*)malloc(fontResourceLength - FONT_DESCSIZE);
Modified: scummvm/trunk/engines/saga/font.h
===================================================================
--- scummvm/trunk/engines/saga/font.h 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/saga/font.h 2010-09-18 10:55:16 UTC (rev 52791)
@@ -186,7 +186,7 @@
void validate(FontId fontId) {
if (!valid(fontId)) {
- error("Font::validate: Invalid font id.");
+ error("Font::validate: Invalid font id");
}
}
bool valid(FontId fontId) {
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/console.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -1102,7 +1102,7 @@
} else {
out->finalize();
if (out->err()) {
- warning("Writing the savegame failed.");
+ warning("Writing the savegame failed");
}
delete out;
}
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/detection.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -765,7 +765,7 @@
} else {
out->finalize();
if (out->err()) {
- warning("Writing the savegame failed.");
+ warning("Writing the savegame failed");
return Common::kWritingFailed;
}
delete out;
Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -496,7 +496,7 @@
// Find saved-game
if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
- error("kCheckSaveGame: called with invalid savegameId!");
+ error("kCheckSaveGame: called with invalid savegameId");
uint savegameId = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
int savegameNr = findSavegame(saves, savegameId);
if (savegameNr == -1)
@@ -645,11 +645,11 @@
warning("Error opening savegame \"%s\" for writing", filename.c_str());
} else {
if (!gamestate_save(s, out, game_description.c_str(), version.c_str())) {
- warning("Saving the game failed.");
+ warning("Saving the game failed");
} else {
out->finalize();
if (out->err()) {
- warning("Writing the savegame failed.");
+ warning("Writing the savegame failed");
} else {
s->r_acc = TRUE_REG; // success
}
Modified: scummvm/trunk/engines/sci/engine/kvideo.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kvideo.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/engine/kvideo.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -117,7 +117,7 @@
initGraphics(screenWidth, screenHeight, screenWidth > 320, NULL);
if (g_system->getScreenFormat().bytesPerPixel == 1) {
- error("This video requires >8bpp color to be displayed, but could not switch to RGB color mode.");
+ error("This video requires >8bpp color to be displayed, but could not switch to RGB color mode");
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/graphics/ports.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/ports.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/graphics/ports.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -301,7 +301,7 @@
Common::Rect r;
if (!pwnd) {
- error("Can't open window!");
+ error("Can't open window");
return 0;
}
Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sci/resource_audio.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -61,7 +61,7 @@
// Now read the whole offset mapping table for later usage
int32 recordCount = fileStream->readUint32LE();
if (!recordCount)
- error("compressed audio volume doesn't contain any entries!");
+ error("compressed audio volume doesn't contain any entries");
int32 *offsetMapping = new int32[(recordCount + 1) * 2];
_audioCompressionOffsetMapping = offsetMapping;
for (int recordNo = 0; recordNo < recordCount; recordNo++) {
Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -2088,7 +2088,7 @@
if (_vm->_fullRedraw && dstResNum == 0) {
if (sourceImage != 0 || (params->processFlags & (kWPFScaled | kWPFRotate)))
- error("Can't do this command in the enter script.");
+ error("Can't do this command in the enter script");
assert(_imagesNum < ARRAYSIZE(_images));
WizImage *pwi = &_images[_imagesNum];
Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/scumm/object.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -714,7 +714,7 @@
memcpy(&_storedFlObjects[_numStoredFlObjects], &_objs[slot], sizeof(_objs[slot]));
_numStoredFlObjects++;
if (_numStoredFlObjects > 100)
- error("Too many flobjects saved on room transition.");
+ error("Too many flobjects saved on room transition");
}
void ScummEngine_v70he::restoreFlObjects() {
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -1763,7 +1763,7 @@
} else if (_game.platform == Common::kPlatformFMTowns && (_game.version == 3 || _game.id == GID_MONKEY)) {
_musicEngine = _townsPlayer = new Player_Towns(this, _mixer);
if (!_townsPlayer->init())
- error("Failed to initialize FM-Towns audio driver.");
+ error("Failed to initialize FM-Towns audio driver");
} else if (_game.version >= 3 && _game.heversion <= 62) {
MidiDriver *nativeMidiDriver = 0;
MidiDriver *adlibMidiDriver = 0;
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sky/sky.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -337,7 +337,7 @@
}
if (!_skyDisk->fileExists(60600 + SkyEngine::_systemVars.language * 8)) {
- warning("The language you selected does not exist in your BASS version.");
+ warning("The language you selected does not exist in your BASS version");
if (_skyDisk->fileExists(60600))
SkyEngine::_systemVars.language = SKY_ENGLISH; // default to GB english if it exists..
else if (_skyDisk->fileExists(60600 + SKY_USA * 8))
Modified: scummvm/trunk/engines/sword1/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword1/logic.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sword1/logic.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -1017,7 +1017,7 @@
int Logic::fnSubScript(Object *cpt, int32 id, int32 script, int32 d, int32 e, int32 f, int32 z, int32 x) {
cpt->o_tree.o_script_level++;
if (cpt->o_tree.o_script_level == TOTAL_script_levels)
- error("Compact %d: script level exceeded in fnSubScript.", id);
+ error("Compact %d: script level exceeded in fnSubScript", id);
cpt->o_tree.o_script_pc[cpt->o_tree.o_script_level] = script;
cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] = script;
return SCRIPT_STOP;
@@ -1605,7 +1605,7 @@
}
int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
- error("fnInnerSpace() not working.");
+ error("fnInnerSpace() not working");
return SCRIPT_STOP; // for compilers that don't support NORETURN
}
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/engines/sword1/sound.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -535,7 +535,7 @@
_waveVolPos = 0;
for (uint32 blkCnt = 1; blkCnt < length / 918; blkCnt++) {
if (blkCnt >= WAVE_VOL_TAB_LENGTH) {
- warning("Wave vol tab too small.");
+ warning("Wave vol tab too small");
return;
}
int32 average = 0;
Modified: scummvm/trunk/graphics/VectorRenderer.cpp
===================================================================
--- scummvm/trunk/graphics/VectorRenderer.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/graphics/VectorRenderer.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -103,7 +103,7 @@
break;
default:
- error("Vertical alignment in horizontal data.");
+ error("Vertical alignment in horizontal data");
}
} else {
in_x = area.left;
@@ -132,7 +132,7 @@
break;
default:
- error("Horizontal alignment in vertical data.");
+ error("Horizontal alignment in vertical data");
}
} else {
in_y = area.top;
Modified: scummvm/trunk/graphics/jpeg.cpp
===================================================================
--- scummvm/trunk/graphics/jpeg.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/graphics/jpeg.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -198,7 +198,7 @@
byte majorVersion = _str->readByte();
byte minorVersion = _str->readByte();
if(majorVersion != 1 || minorVersion != 1)
- warning("JPEG::readJFIF() Non-v1.1 JPEGs may not be handled correctly!");
+ warning("JPEG::readJFIF() Non-v1.1 JPEGs may not be handled correctly");
/* byte densityUnits = */ _str->readByte();
/* uint16 xDensity = */ _str->readUint16BE();
/* uint16 yDensity = */ _str->readUint16BE();
Modified: scummvm/trunk/graphics/video/codecs/qdm2.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/qdm2.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/graphics/video/codecs/qdm2.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -1775,7 +1775,7 @@
tmp = extraData->readUint32BE();
debug(1, "QDM2Stream::QDM2Stream() extraType: %d", tmp);
if (tmp == MKID_BE('QDMC'))
- warning("QDM2Stream::QDM2Stream() QDMC stream type not supported.");
+ warning("QDM2Stream::QDM2Stream() QDMC stream type not supported");
else if (tmp != MKID_BE('QDM2'))
error("QDM2Stream::QDM2Stream() Unsupported stream type");
Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/gui/saveload.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -179,7 +179,7 @@
uint16 w, h;
if (!g_gui.xmlEval()->getWidgetData("SaveLoadChooser.Thumbnail", x, y, w, h))
- error("Error when loading position data for Save/Load Thumbnails.");
+ error("Error when loading position data for Save/Load Thumbnails");
int thumbW = kThumbnailWidth;
int thumbH = kThumbnailHeight2;
Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/sound/fmopl.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -42,7 +42,7 @@
OPL::OPL() {
if (_hasInstance)
- error("There are multiple OPL output instances running.");
+ error("There are multiple OPL output instances running");
_hasInstance = true;
}
@@ -91,7 +91,7 @@
} else {
// Else we will output a warning and just
// return that no valid driver is found.
- warning("Your selected OPL driver \"%s\" does not support type %d emulation, which is requested by your game.", _drivers[drv].description, type);
+ warning("Your selected OPL driver \"%s\" does not support type %d emulation, which is requested by your game", _drivers[drv].description, type);
return -1;
}
}
@@ -138,7 +138,7 @@
if (type == kOpl2)
return new MAME::OPL();
else
- warning("MAME OPL emulator only supports OPL2 emulation.");
+ warning("MAME OPL emulator only supports OPL2 emulation");
return 0;
#ifndef DISABLE_DOSBOX_OPL
Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp 2010-09-18 09:52:05 UTC (rev 52790)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp 2010-09-18 10:55:16 UTC (rev 52791)
@@ -560,10 +560,10 @@
void TownsEuphonyDriver::sendEvent(uint8 mode, uint8 command) {
if (mode == 0) {
- warning("TownsEuphonyDriver: Mode 0 not implemented.");
+ warning("TownsEuphonyDriver: Mode 0 not implemented");
} else if (mode == 0x10) {
- warning("TownsEuphonyDriver: Mode 0x10 not implemented.");
+ warning("TownsEuphonyDriver: Mode 0x10 not implemented");
} else if (mode == 0xff) {
if (command >= 0xf0) {
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