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. svn-id: r52791
This commit is contained in:
parent
6fed6a75d5
commit
c91a07229a
42 changed files with 58 additions and 58 deletions
|
@ -106,7 +106,7 @@ void MidiDriver_WIN::sysEx(const byte *msg, uint16 length) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (WaitForSingleObject (_streamEvent, 2000) == WAIT_TIMEOUT) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -400,7 +400,7 @@ static void ScummVM_audioMixCallback(JNIEnv* env, jobject self,
|
||||||
jsize len = env->GetArrayLength(jbuf);
|
jsize len = env->GetArrayLength(jbuf);
|
||||||
jbyte* buf = env->GetByteArrayElements(jbuf, NULL);
|
jbyte* buf = env->GetByteArrayElements(jbuf, NULL);
|
||||||
if (buf == NULL) {
|
if (buf == NULL) {
|
||||||
warning("Unable to get Java audio byte array. Skipping.");
|
warning("Unable to get Java audio byte array. Skipping");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Audio::MixerImpl* mixer =
|
Audio::MixerImpl* mixer =
|
||||||
|
@ -1135,7 +1135,7 @@ OSystem::MutexRef OSystem_Android::createMutex() {
|
||||||
|
|
||||||
pthread_mutex_t *mutex = new pthread_mutex_t;
|
pthread_mutex_t *mutex = new pthread_mutex_t;
|
||||||
if (pthread_mutex_init(mutex, &attr) != 0) {
|
if (pthread_mutex_init(mutex, &attr) != 0) {
|
||||||
warning("pthread_mutex_init() failed!");
|
warning("pthread_mutex_init() failed");
|
||||||
delete mutex;
|
delete mutex;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -1144,18 +1144,18 @@ OSystem::MutexRef OSystem_Android::createMutex() {
|
||||||
|
|
||||||
void OSystem_Android::lockMutex(MutexRef mutex) {
|
void OSystem_Android::lockMutex(MutexRef mutex) {
|
||||||
if (pthread_mutex_lock((pthread_mutex_t*)mutex) != 0)
|
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) {
|
void OSystem_Android::unlockMutex(MutexRef mutex) {
|
||||||
if (pthread_mutex_unlock((pthread_mutex_t*)mutex) != 0)
|
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) {
|
void OSystem_Android::deleteMutex(MutexRef mutex) {
|
||||||
pthread_mutex_t* m = (pthread_mutex_t*)mutex;
|
pthread_mutex_t* m = (pthread_mutex_t*)mutex;
|
||||||
if (pthread_mutex_destroy(m) != 0)
|
if (pthread_mutex_destroy(m) != 0)
|
||||||
warning("pthread_mutex_destroy() failed!");
|
warning("pthread_mutex_destroy() failed");
|
||||||
else
|
else
|
||||||
delete m;
|
delete m;
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,7 @@ void OSystem_GP2X::initBackend() {
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
||||||
error("Could not obtain current working directory.");
|
error("Could not obtain current working directory");
|
||||||
} else {
|
} else {
|
||||||
printf("Current working directory: %s\n", workDirName);
|
printf("Current working directory: %s\n", workDirName);
|
||||||
}
|
}
|
||||||
|
@ -328,7 +328,7 @@ void OSystem_GP2X::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
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);
|
Common::FSNode workdirNode(workDirName);
|
||||||
|
|
|
@ -78,7 +78,7 @@ void OSystem_GPH::initBackend() {
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
||||||
error("Could not obtain current working directory.");
|
error("Could not obtain current working directory");
|
||||||
} else {
|
} else {
|
||||||
printf("Current working directory: %s\n", workDirName);
|
printf("Current working directory: %s\n", workDirName);
|
||||||
}
|
}
|
||||||
|
@ -170,7 +170,7 @@ void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
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);
|
Common::FSNode workdirNode(workDirName);
|
||||||
|
|
|
@ -79,7 +79,7 @@ void OSystem_OP::initBackend() {
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
||||||
error("Could not obtain current working directory.");
|
error("Could not obtain current working directory");
|
||||||
} else {
|
} else {
|
||||||
printf("Current working directory: %s\n", workDirName);
|
printf("Current working directory: %s\n", workDirName);
|
||||||
}
|
}
|
||||||
|
@ -165,7 +165,7 @@ void OSystem_OP::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
|
||||||
char workDirName[PATH_MAX+1];
|
char workDirName[PATH_MAX+1];
|
||||||
|
|
||||||
if (getcwd(workDirName, PATH_MAX) == NULL) {
|
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);
|
Common::FSNode workdirNode(workDirName);
|
||||||
|
|
|
@ -527,7 +527,7 @@ static void fixupResolutionForAspectRatio(AspectRatio desiredAspectRatio, int &w
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!bestMode) {
|
if (!bestMode) {
|
||||||
warning("Unable to enforce the desired aspect ratio!");
|
warning("Unable to enforce the desired aspect ratio");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//printf("%d %d\n", bestMode->w, bestMode->h);
|
//printf("%d %d\n", bestMode->w, bestMode->h);
|
||||||
|
|
|
@ -429,7 +429,7 @@ void OSystem_WINCE3::initBackend() {
|
||||||
GUI::Actions::init();
|
GUI::Actions::init();
|
||||||
GUI_Actions::Instance()->initInstanceMain(this);
|
GUI_Actions::Instance()->initInstanceMain(this);
|
||||||
if (!GUI_Actions::Instance()->loadMapping()) { // error during loading means not present/wrong version
|
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
|
GUI_Actions::Instance()->saveMapping(); // write defaults
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -950,9 +950,9 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin
|
||||||
if (dir && *dir && strlen(dir) < MAXPATHLEN) {
|
if (dir && *dir && strlen(dir) < MAXPATHLEN) {
|
||||||
Common::FSNode saveDir(dir);
|
Common::FSNode saveDir(dir);
|
||||||
if (!saveDir.exists()) {
|
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()) {
|
} 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 {
|
} else {
|
||||||
settings["savepath"] = dir;
|
settings["savepath"] = dir;
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ uint8 *LZWDecoder::decodeString(uint8 *buffer, uint32 code) {
|
||||||
*buffer++ = appendCharacter[code];
|
*buffer++ = appendCharacter[code];
|
||||||
code = prefixCode[code];
|
code = prefixCode[code];
|
||||||
if (i++ >= 4000) {
|
if (i++ >= 4000) {
|
||||||
error("lzw: error in code expansion.");
|
error("lzw: error in code expansion");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*buffer = code;
|
*buffer = code;
|
||||||
|
|
|
@ -518,7 +518,7 @@ void AgiEngine::loadDict() {
|
||||||
|
|
||||||
_predictiveDictLine = (char **)calloc(1, sizeof(char *) * lines);
|
_predictiveDictLine = (char **)calloc(1, sizeof(char *) * lines);
|
||||||
if (_predictiveDictLine == NULL) {
|
if (_predictiveDictLine == NULL) {
|
||||||
warning("Cannot allocate memory for line index buffer.");
|
warning("Cannot allocate memory for line index buffer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_predictiveDictLine[0] = _predictiveDictText;
|
_predictiveDictLine[0] = _predictiveDictText;
|
||||||
|
|
|
@ -333,7 +333,7 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) {
|
||||||
debug(0, "Saved game MD5: \"%s\"", md5);
|
debug(0, "Saved game MD5: \"%s\"", md5);
|
||||||
|
|
||||||
if (!getGameMD5()) {
|
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);
|
debug(0, "The game used for saving is \"%s\".", md5);
|
||||||
} else if (strcmp(md5, getGameMD5())) {
|
} else if (strcmp(md5, getGameMD5())) {
|
||||||
|
|
|
@ -164,7 +164,7 @@ void CineEngine::readVolCnf() {
|
||||||
// All file name blocks' sizes were divisible by either 11 or 13, but not with both.
|
// All file name blocks' sizes were divisible by either 11 or 13, but not with both.
|
||||||
fileNameLength = (fileNameLenMod11 ? 11 : 13);
|
fileNameLength = (fileNameLenMod11 ? 11 : 13);
|
||||||
} else {
|
} 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
|
// Here we use the former file name length detection method
|
||||||
// if we couldn't deduce the file name length from the data.
|
// if we couldn't deduce the file name length from the data.
|
||||||
fileNameLength = (compressed ? 11 : 13);
|
fileNameLength = (compressed ? 11 : 13);
|
||||||
|
|
|
@ -110,7 +110,7 @@ Engine::Engine(OSystem *syst)
|
||||||
// heaps of (sound) memory get allocated but never freed. Of course,
|
// heaps of (sound) memory get allocated but never freed. Of course,
|
||||||
// there still would be problems with many games...
|
// there still would be problems with many games...
|
||||||
if (!_mixer->isReady())
|
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
|
// Setup a dummy cursor and palette, so that all engines can use
|
||||||
// CursorMan.replace without having any headaches about memory leaks.
|
// CursorMan.replace without having any headaches about memory leaks.
|
||||||
|
|
|
@ -88,7 +88,7 @@ bool PalAnim::fadeStep(int16 oper) {
|
||||||
if (oper == 0) {
|
if (oper == 0) {
|
||||||
if (_vm->_global->_setAllPalette) {
|
if (_vm->_global->_setAllPalette) {
|
||||||
if (_vm->_global->_inVM != 0)
|
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++) {
|
for (int i = 0; i < 256; i++) {
|
||||||
newRed = fadeColor(_vm->_global->_redPalette[i], _toFadeRed[i]);
|
newRed = fadeColor(_vm->_global->_redPalette[i], _toFadeRed[i]);
|
||||||
|
|
|
@ -179,7 +179,7 @@ Common::Error KyraEngine_v1::init() {
|
||||||
#ifdef ENABLE_LOL
|
#ifdef ENABLE_LOL
|
||||||
_flags.gameID = GI_LOL;
|
_flags.gameID = GI_LOL;
|
||||||
#else
|
#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
|
#endif // !ENABLE_LOL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena
|
||||||
kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header);
|
kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header);
|
||||||
if (errorCode != kRSHENoError) {
|
if (errorCode != kRSHENoError) {
|
||||||
if (errorCode == kRSHEInvalidType)
|
if (errorCode == kRSHEInvalidType)
|
||||||
warning("No ScummVM Kyra engine savefile header.");
|
warning("No ScummVM Kyra engine savefile header");
|
||||||
else if (errorCode == kRSHEInvalidVersion)
|
else if (errorCode == kRSHEInvalidVersion)
|
||||||
warning("Savegame is not the right version (%u, '%s')", header.version, header.oldHeader ? "true" : "false");
|
warning("Savegame is not the right version (%u, '%s')", header.version, header.oldHeader ? "true" : "false");
|
||||||
else if (errorCode == kRSHEIoError)
|
else if (errorCode == kRSHEIoError)
|
||||||
|
|
|
@ -1084,7 +1084,7 @@ void Screen::setTextColor(const uint8 *cmap, int a, int b) {
|
||||||
|
|
||||||
bool Screen::loadFont(FontId fontId, const char *filename) {
|
bool Screen::loadFont(FontId fontId, const char *filename) {
|
||||||
if (fontId == FID_SJIS_FNT) {
|
if (fontId == FID_SJIS_FNT) {
|
||||||
warning("Trying to replace system SJIS font.");
|
warning("Trying to replace system SJIS font");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2455,7 +2455,7 @@ void MystScriptParser::opcode_120(uint16 op, uint16 var, uint16 argc, uint16 *ar
|
||||||
if (var8 != 0xFFFF)
|
if (var8 != 0xFFFF)
|
||||||
_vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8));
|
_vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8));
|
||||||
else
|
else
|
||||||
warning("Opcode 120: No invoking Resource Var 8 found!");
|
warning("Opcode 120: No invoking Resource Var 8 found");
|
||||||
} else
|
} else
|
||||||
unknown(op, var, argc, argv);
|
unknown(op, var, argc, argv);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -110,7 +110,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) {
|
||||||
delete vers;
|
delete vers;
|
||||||
if ((saveGameVersion == kCDSaveGameVersion && (_vm->getFeatures() & GF_DVD))
|
if ((saveGameVersion == kCDSaveGameVersion && (_vm->getFeatures() & GF_DVD))
|
||||||
|| (saveGameVersion == kDVDSaveGameVersion && !(_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;
|
delete mhk;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -586,7 +586,7 @@ public:
|
||||||
if (_points[2] >= _points[0] && _points[2] >= _points[1]) {
|
if (_points[2] >= _points[0] && _points[2] >= _points[1]) {
|
||||||
character = CHAR_DOUGH;
|
character = CHAR_DOUGH;
|
||||||
} else {
|
} 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();
|
_vm->cleanupGame();
|
||||||
|
|
|
@ -201,7 +201,7 @@ void Parallaction::allocateLocationSlot(const char *name) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_di == 120)
|
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) {
|
if (_currentLocationIndex == -1) {
|
||||||
strcpy(_locationNames[_numLocations], name);
|
strcpy(_locationNames[_numLocations], name);
|
||||||
|
|
|
@ -130,7 +130,7 @@ void MidiParser_MSC::parseMidiEvent(EventInfo &info) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
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;
|
//if ((type == 0xB) && (info.basic.param1 == 64)) info.basic.param2 = 127;
|
||||||
|
@ -173,7 +173,7 @@ bool MidiParser_MSC::loadMusic(byte *data, uint32 size) {
|
||||||
byte *pos = data;
|
byte *pos = data;
|
||||||
|
|
||||||
if (memcmp("MSCt", pos, 4)) {
|
if (memcmp("MSCt", pos, 4)) {
|
||||||
warning("Expected header not found in music file.");
|
warning("Expected header not found in music file");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
pos += 4;
|
pos += 4;
|
||||||
|
|
|
@ -123,7 +123,7 @@ void Font::loadFont(uint32 fontResourceId) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (readS.pos() != FONT_DESCSIZE) {
|
if (readS.pos() != FONT_DESCSIZE) {
|
||||||
error("Invalid font resource size.");
|
error("Invalid font resource size");
|
||||||
}
|
}
|
||||||
|
|
||||||
font->normal.font = (byte*)malloc(fontResourceLength - FONT_DESCSIZE);
|
font->normal.font = (byte*)malloc(fontResourceLength - FONT_DESCSIZE);
|
||||||
|
|
|
@ -186,7 +186,7 @@ class Font {
|
||||||
|
|
||||||
void validate(FontId fontId) {
|
void validate(FontId fontId) {
|
||||||
if (!valid(fontId)) {
|
if (!valid(fontId)) {
|
||||||
error("Font::validate: Invalid font id.");
|
error("Font::validate: Invalid font id");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bool valid(FontId fontId) {
|
bool valid(FontId fontId) {
|
||||||
|
|
|
@ -1102,7 +1102,7 @@ bool Console::cmdSaveGame(int argc, const char **argv) {
|
||||||
} else {
|
} else {
|
||||||
out->finalize();
|
out->finalize();
|
||||||
if (out->err()) {
|
if (out->err()) {
|
||||||
warning("Writing the savegame failed.");
|
warning("Writing the savegame failed");
|
||||||
}
|
}
|
||||||
delete out;
|
delete out;
|
||||||
}
|
}
|
||||||
|
|
|
@ -765,7 +765,7 @@ Common::Error SciEngine::saveGameState(int slot, const char *desc) {
|
||||||
} else {
|
} else {
|
||||||
out->finalize();
|
out->finalize();
|
||||||
if (out->err()) {
|
if (out->err()) {
|
||||||
warning("Writing the savegame failed.");
|
warning("Writing the savegame failed");
|
||||||
return Common::kWritingFailed;
|
return Common::kWritingFailed;
|
||||||
}
|
}
|
||||||
delete out;
|
delete out;
|
||||||
|
|
|
@ -496,7 +496,7 @@ reg_t kCheckSaveGame(EngineState *s, int argc, reg_t *argv) {
|
||||||
|
|
||||||
// Find saved-game
|
// Find saved-game
|
||||||
if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
|
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;
|
uint savegameId = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
|
||||||
int savegameNr = findSavegame(saves, savegameId);
|
int savegameNr = findSavegame(saves, savegameId);
|
||||||
if (savegameNr == -1)
|
if (savegameNr == -1)
|
||||||
|
@ -645,11 +645,11 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) {
|
||||||
warning("Error opening savegame \"%s\" for writing", filename.c_str());
|
warning("Error opening savegame \"%s\" for writing", filename.c_str());
|
||||||
} else {
|
} else {
|
||||||
if (!gamestate_save(s, out, game_description.c_str(), version.c_str())) {
|
if (!gamestate_save(s, out, game_description.c_str(), version.c_str())) {
|
||||||
warning("Saving the game failed.");
|
warning("Saving the game failed");
|
||||||
} else {
|
} else {
|
||||||
out->finalize();
|
out->finalize();
|
||||||
if (out->err()) {
|
if (out->err()) {
|
||||||
warning("Writing the savegame failed.");
|
warning("Writing the savegame failed");
|
||||||
} else {
|
} else {
|
||||||
s->r_acc = TRUE_REG; // success
|
s->r_acc = TRUE_REG; // success
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,7 +117,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
|
||||||
initGraphics(screenWidth, screenHeight, screenWidth > 320, NULL);
|
initGraphics(screenWidth, screenHeight, screenWidth > 320, NULL);
|
||||||
|
|
||||||
if (g_system->getScreenFormat().bytesPerPixel == 1) {
|
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;
|
return NULL_REG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -301,7 +301,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
|
||||||
Common::Rect r;
|
Common::Rect r;
|
||||||
|
|
||||||
if (!pwnd) {
|
if (!pwnd) {
|
||||||
error("Can't open window!");
|
error("Can't open window");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ AudioVolumeResourceSource::AudioVolumeResourceSource(ResourceManager *resMan, co
|
||||||
// Now read the whole offset mapping table for later usage
|
// Now read the whole offset mapping table for later usage
|
||||||
int32 recordCount = fileStream->readUint32LE();
|
int32 recordCount = fileStream->readUint32LE();
|
||||||
if (!recordCount)
|
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];
|
int32 *offsetMapping = new int32[(recordCount + 1) * 2];
|
||||||
_audioCompressionOffsetMapping = offsetMapping;
|
_audioCompressionOffsetMapping = offsetMapping;
|
||||||
for (int recordNo = 0; recordNo < recordCount; recordNo++) {
|
for (int recordNo = 0; recordNo < recordCount; recordNo++) {
|
||||||
|
|
|
@ -2088,7 +2088,7 @@ void Wiz::displayWizComplexImage(const WizParameters *params) {
|
||||||
|
|
||||||
if (_vm->_fullRedraw && dstResNum == 0) {
|
if (_vm->_fullRedraw && dstResNum == 0) {
|
||||||
if (sourceImage != 0 || (params->processFlags & (kWPFScaled | kWPFRotate)))
|
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));
|
assert(_imagesNum < ARRAYSIZE(_images));
|
||||||
WizImage *pwi = &_images[_imagesNum];
|
WizImage *pwi = &_images[_imagesNum];
|
||||||
|
|
|
@ -714,7 +714,7 @@ void ScummEngine_v70he::storeFlObject(int slot) {
|
||||||
memcpy(&_storedFlObjects[_numStoredFlObjects], &_objs[slot], sizeof(_objs[slot]));
|
memcpy(&_storedFlObjects[_numStoredFlObjects], &_objs[slot], sizeof(_objs[slot]));
|
||||||
_numStoredFlObjects++;
|
_numStoredFlObjects++;
|
||||||
if (_numStoredFlObjects > 100)
|
if (_numStoredFlObjects > 100)
|
||||||
error("Too many flobjects saved on room transition.");
|
error("Too many flobjects saved on room transition");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScummEngine_v70he::restoreFlObjects() {
|
void ScummEngine_v70he::restoreFlObjects() {
|
||||||
|
|
|
@ -1763,7 +1763,7 @@ void ScummEngine::setupMusic(int midi) {
|
||||||
} else if (_game.platform == Common::kPlatformFMTowns && (_game.version == 3 || _game.id == GID_MONKEY)) {
|
} else if (_game.platform == Common::kPlatformFMTowns && (_game.version == 3 || _game.id == GID_MONKEY)) {
|
||||||
_musicEngine = _townsPlayer = new Player_Towns(this, _mixer);
|
_musicEngine = _townsPlayer = new Player_Towns(this, _mixer);
|
||||||
if (!_townsPlayer->init())
|
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) {
|
} else if (_game.version >= 3 && _game.heversion <= 62) {
|
||||||
MidiDriver *nativeMidiDriver = 0;
|
MidiDriver *nativeMidiDriver = 0;
|
||||||
MidiDriver *adlibMidiDriver = 0;
|
MidiDriver *adlibMidiDriver = 0;
|
||||||
|
|
|
@ -337,7 +337,7 @@ Common::Error SkyEngine::init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_skyDisk->fileExists(60600 + SkyEngine::_systemVars.language * 8)) {
|
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))
|
if (_skyDisk->fileExists(60600))
|
||||||
SkyEngine::_systemVars.language = SKY_ENGLISH; // default to GB english if it exists..
|
SkyEngine::_systemVars.language = SKY_ENGLISH; // default to GB english if it exists..
|
||||||
else if (_skyDisk->fileExists(60600 + SKY_USA * 8))
|
else if (_skyDisk->fileExists(60600 + SKY_USA * 8))
|
||||||
|
|
|
@ -1017,7 +1017,7 @@ int Logic::fnNewScript(Object *cpt, int32 id, int32 script, int32 d, int32 e, in
|
||||||
int Logic::fnSubScript(Object *cpt, int32 id, int32 script, int32 d, int32 e, int32 f, int32 z, int32 x) {
|
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++;
|
cpt->o_tree.o_script_level++;
|
||||||
if (cpt->o_tree.o_script_level == TOTAL_script_levels)
|
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_pc[cpt->o_tree.o_script_level] = script;
|
||||||
cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] = script;
|
cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] = script;
|
||||||
return SCRIPT_STOP;
|
return SCRIPT_STOP;
|
||||||
|
@ -1605,7 +1605,7 @@ int Logic::fnStopMusic(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d
|
||||||
}
|
}
|
||||||
|
|
||||||
int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
|
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
|
return SCRIPT_STOP; // for compilers that don't support NORETURN
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -535,7 +535,7 @@ void Sound::calcWaveVolume(int16 *data, uint32 length) {
|
||||||
_waveVolPos = 0;
|
_waveVolPos = 0;
|
||||||
for (uint32 blkCnt = 1; blkCnt < length / 918; blkCnt++) {
|
for (uint32 blkCnt = 1; blkCnt < length / 918; blkCnt++) {
|
||||||
if (blkCnt >= WAVE_VOL_TAB_LENGTH) {
|
if (blkCnt >= WAVE_VOL_TAB_LENGTH) {
|
||||||
warning("Wave vol tab too small.");
|
warning("Wave vol tab too small");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int32 average = 0;
|
int32 average = 0;
|
||||||
|
|
|
@ -103,7 +103,7 @@ void VectorRenderer::stepGetPositions(const DrawStep &step, const Common::Rect &
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
error("Vertical alignment in horizontal data.");
|
error("Vertical alignment in horizontal data");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
in_x = area.left;
|
in_x = area.left;
|
||||||
|
@ -132,7 +132,7 @@ void VectorRenderer::stepGetPositions(const DrawStep &step, const Common::Rect &
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
error("Horizontal alignment in vertical data.");
|
error("Horizontal alignment in vertical data");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
in_y = area.top;
|
in_y = area.top;
|
||||||
|
|
|
@ -198,7 +198,7 @@ bool JPEG::readJFIF() {
|
||||||
byte majorVersion = _str->readByte();
|
byte majorVersion = _str->readByte();
|
||||||
byte minorVersion = _str->readByte();
|
byte minorVersion = _str->readByte();
|
||||||
if(majorVersion != 1 || minorVersion != 1)
|
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();
|
/* byte densityUnits = */ _str->readByte();
|
||||||
/* uint16 xDensity = */ _str->readUint16BE();
|
/* uint16 xDensity = */ _str->readUint16BE();
|
||||||
/* uint16 yDensity = */ _str->readUint16BE();
|
/* uint16 yDensity = */ _str->readUint16BE();
|
||||||
|
|
|
@ -1775,7 +1775,7 @@ QDM2Stream::QDM2Stream(Common::SeekableReadStream *stream, Common::SeekableReadS
|
||||||
tmp = extraData->readUint32BE();
|
tmp = extraData->readUint32BE();
|
||||||
debug(1, "QDM2Stream::QDM2Stream() extraType: %d", tmp);
|
debug(1, "QDM2Stream::QDM2Stream() extraType: %d", tmp);
|
||||||
if (tmp == MKID_BE('QDMC'))
|
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'))
|
else if (tmp != MKID_BE('QDM2'))
|
||||||
error("QDM2Stream::QDM2Stream() Unsupported stream type");
|
error("QDM2Stream::QDM2Stream() Unsupported stream type");
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,7 @@ void SaveLoadChooser::reflowLayout() {
|
||||||
uint16 w, h;
|
uint16 w, h;
|
||||||
|
|
||||||
if (!g_gui.xmlEval()->getWidgetData("SaveLoadChooser.Thumbnail", x, y, 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 thumbW = kThumbnailWidth;
|
||||||
int thumbH = kThumbnailHeight2;
|
int thumbH = kThumbnailHeight2;
|
||||||
|
|
|
@ -42,7 +42,7 @@ enum OplEmulator {
|
||||||
|
|
||||||
OPL::OPL() {
|
OPL::OPL() {
|
||||||
if (_hasInstance)
|
if (_hasInstance)
|
||||||
error("There are multiple OPL output instances running.");
|
error("There are multiple OPL output instances running");
|
||||||
_hasInstance = true;
|
_hasInstance = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ Config::DriverId Config::detect(OplType type) {
|
||||||
} else {
|
} else {
|
||||||
// Else we will output a warning and just
|
// Else we will output a warning and just
|
||||||
// return that no valid driver is found.
|
// 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;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ OPL *Config::create(DriverId driver, OplType type) {
|
||||||
if (type == kOpl2)
|
if (type == kOpl2)
|
||||||
return new MAME::OPL();
|
return new MAME::OPL();
|
||||||
else
|
else
|
||||||
warning("MAME OPL emulator only supports OPL2 emulation.");
|
warning("MAME OPL emulator only supports OPL2 emulation");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#ifndef DISABLE_DOSBOX_OPL
|
#ifndef DISABLE_DOSBOX_OPL
|
||||||
|
|
|
@ -560,10 +560,10 @@ uint8 TownsEuphonyDriver::appendEvent(uint8 evt, uint8 chan) {
|
||||||
|
|
||||||
void TownsEuphonyDriver::sendEvent(uint8 mode, uint8 command) {
|
void TownsEuphonyDriver::sendEvent(uint8 mode, uint8 command) {
|
||||||
if (mode == 0) {
|
if (mode == 0) {
|
||||||
warning("TownsEuphonyDriver: Mode 0 not implemented.");
|
warning("TownsEuphonyDriver: Mode 0 not implemented");
|
||||||
|
|
||||||
} else if (mode == 0x10) {
|
} else if (mode == 0x10) {
|
||||||
warning("TownsEuphonyDriver: Mode 0x10 not implemented.");
|
warning("TownsEuphonyDriver: Mode 0x10 not implemented");
|
||||||
|
|
||||||
} else if (mode == 0xff) {
|
} else if (mode == 0xff) {
|
||||||
if (command >= 0xf0) {
|
if (command >= 0xf0) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue