diff options
| author | Willem Jan Palenstijn | 2015-05-07 23:35:36 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-05-07 23:35:36 +0200 |
| commit | 57109ef0a8d30f15aa1fcef7d9d229fc9701f630 (patch) | |
| tree | 230c0a7822875e9c41a4606fce54166d4dc37db0 /engines/sci/console.h | |
| parent | d9e93f8e015ce27a95090e854494c4b3f7d1c0d4 (diff) | |
| parent | 04931d040085d77d031290fda57ca2c5dc486f54 (diff) | |
| download | scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.gz scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.bz2 scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.zip | |
Merge branch 'master' into sherlock
Diffstat (limited to 'engines/sci/console.h')
| -rw-r--r-- | engines/sci/console.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/console.h b/engines/sci/console.h index c8e99f78f7..00d95b511f 100644 --- a/engines/sci/console.h +++ b/engines/sci/console.h @@ -68,6 +68,7 @@ private: bool cmdSaid(int argc, const char **argv); // Resources bool cmdDiskDump(int argc, const char **argv); + void cmdDiskDumpWorker(ResourceType resourceType, int resourceNumber, uint32 resourceTuple); bool cmdHexDump(int argc, const char **argv); bool cmdResourceId(int argc, const char **argv); bool cmdResourceInfo(int argc, const char **argv); @@ -146,6 +147,7 @@ private: bool cmdBreakpointFunction(int argc, const char **argv); // VM bool cmdScriptSteps(int argc, const char **argv); + bool cmdScriptStrings(int argc, const char **argv); bool cmdVMVarlist(int argc, const char **argv); bool cmdVMVars(int argc, const char **argv); bool cmdStack(int argc, const char **argv); @@ -157,6 +159,7 @@ private: bool cmdViewAccumulatorObject(int argc, const char **argv); bool parseInteger(const char *argument, int &result); + bool parseResourceNumber36(const char *userParameter, uint16 &resourceNumber, uint32 &resourceTuple); void printBasicVarInfo(reg_t variable); |