thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Silenced warning when exiting in LSL6 (bug report #3035533), and commented out a related unused variable in kSetQuitStr

Browse source 
svn-id: r51456
This commit is contained in:
Filippos Karapetis 2010-07-29 07:58:48 +00:00
parent 3e6f3716ac
commit c40b9801df
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/kstring.cpp
View file

@ -566,7 +566,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
} }
reg_t kSetQuitStr(EngineState *s, int argc, reg_t *argv) { reg_t kSetQuitStr(EngineState *s, int argc, reg_t *argv) {
Common::String quitStr = s->_segMan->getString(argv[0]); //Common::String quitStr = s->_segMan->getString(argv[0]);
//debug("Setting quit string to '%s'", quitStr.c_str()); //debug("Setting quit string to '%s'", quitStr.c_str());
return s->r_acc; return s->r_acc;
} }

8
engines/sci/engine/message.cpp
View file

@ -379,8 +379,16 @@ void MessageState::outputString(reg_t buf, const Common::String &str) {
if ((unsigned)buffer_r.maxSize >= str.size() + 1) { if ((unsigned)buffer_r.maxSize >= str.size() + 1) {
_segMan->strcpy(buf, str.c_str()); _segMan->strcpy(buf, str.c_str());
} else {
// LSL6 sets an exit text here, but the buffer size allocated
// is too small. Don't display a warning in this case, as we
// don't use the exit text anyway - bug report #3035533
const char *foo = str.c_str();
if (g_sci->getGameId() == GID_LSL6 && str.hasPrefix("\r\n(c) 1993 Sierra On-Line, Inc")) {
// LSL6 buggy exit text, don't show warning
} else { } else {
warning("Message: buffer %04x:%04x invalid or too small to hold the following text of %i bytes: '%s'", PRINT_REG(buf), str.size() + 1, str.c_str()); warning("Message: buffer %04x:%04x invalid or too small to hold the following text of %i bytes: '%s'", PRINT_REG(buf), str.size() + 1, str.c_str());
}
// Set buffer to empty string if possible // Set buffer to empty string if possible
if (buffer_r.maxSize > 0) if (buffer_r.maxSize > 0)