diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /engines/scumm/he/script_v70he.cpp | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'engines/scumm/he/script_v70he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v70he.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index 9b160151b0..adb2fcac2e 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/config-manager.h" @@ -364,10 +361,10 @@ void ScummEngine_v70he::o70_getStringLen() { void ScummEngine_v70he::o70_isResourceLoaded() { // Reports percentage of resource loaded by queue - int type; + ResType type; byte subOp = fetchScriptByte(); - /* int idx = */ pop(); + int idx = pop(); switch (subOp) { case 18: @@ -388,6 +385,7 @@ void ScummEngine_v70he::o70_isResourceLoaded() { default: error("o70_isResourceLoaded: default case %d", subOp); } + debug(7, "o70_isResourceLoaded(%d,%d)", type, idx); push(100); } |