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

kLocalToGlobal has a 'Plane' variant in SCI32 like its kGlobalToLocal sibling. The restore menu is now slightly navigatable.

Browse source 
svn-id: r46790
This commit is contained in:
Matthew Hoops 2009-12-31 05:30:25 +00:00
parent 7d131627fe
commit 92a8d1360a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,7 @@ SciKernelFunction kfunct_mappers[] = {
/*1c*/ DEFUN("GetEvent", kGetEvent, ".*"),
///*1c*/ DEFUN("GetEvent", kGetEvent, "io"),
/*1d*/ DEFUN("GlobalToLocal", kGlobalToLocal, "oo*"),
/*1e*/ DEFUN("LocalToGlobal", kLocalToGlobal, "o"),
/*1e*/ DEFUN("LocalToGlobal", kLocalToGlobal, "oo*"),
/*1f*/ DEFUN("MapKeyToDir", kMapKeyToDir, "o"),
/*20*/ DEFUN("DrawMenuBar", kDrawMenuBar, "i"),
/*21*/ DEFUN("MenuSelect", kMenuSelect, "oi*"),

6
engines/sci/engine/kevent.cpp
View file

@ -229,6 +229,12 @@ reg_t kGlobalToLocal(EngineState *s, int argc, reg_t *argv) {
}
reg_t kLocalToGlobal(EngineState *s, int argc, reg_t *argv) {
#ifdef ENABLE_SCI32
// SCI32 has an extra argument for a plane here
if (argc > 1)
warning("kLocalToGlobal Plane: %04x:%04x", PRINT_REG(argv[1]));
#endif
reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars
SegManager *segMan = s->_segMan;