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

Added support for String types to kFormat (seems to work but needs testing...)

Browse source 
svn-id: r47694
This commit is contained in:
Filippos Karapetis 2010-01-30 01:45:59 +00:00
parent 42ec4e3780
commit 928b4a6df6
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/sci/engine/kernel32.cpp
View file

@ -617,15 +617,7 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
warning("kString(Printf)");
break;
case 12: // Printf Buf
if (argc == 3)
return kFormat(s, argc - 1, argv + 1);
else
// TODO
// For some reason, argc > 3 crashes, e.g. in Torin full (there's a format
// string %s%s, but the string passed for the first %s is invalid). Perhaps
// a list is passed in this case?
warning("kString(PrintBuf) - parameter count %d not supported", argc);
break;
return kFormat(s, argc - 1, argv + 1);
case 13: { // atoi
Common::String string = s->_segMan->getString(argv[1]);
return make_reg(0, (uint16)atoi(string.c_str()));