aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2006-06-29 12:55:57 +0000
committerSven Hesse2006-06-29 12:55:57 +0000
commit27a8b8a255478ebe76fb616e7d5dba0b8f433dce (patch)
treeb89a6172d493552179273241322c75e88206c115 /engines/gob/inter_v2.cpp
parent221afd715a0806405de3e86bc30323a208096cc7 (diff)
downloadscummvm-rg350-27a8b8a255478ebe76fb616e7d5dba0b8f433dce.tar.gz
scummvm-rg350-27a8b8a255478ebe76fb616e7d5dba0b8f433dce.tar.bz2
scummvm-rg350-27a8b8a255478ebe76fb616e7d5dba0b8f433dce.zip
- Renamed a few mult-variables to something more fitting
- Fixed a small mistake, making the entering animation work - Correcting Game_v2::playTot() so that the loading screen is shown - Updated most of the collisions stuff, the objects names hint stuff works now svn-id: r23346
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r--engines/gob/inter_v2.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 2e14691537..5a692e9aaf 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -526,7 +526,7 @@ void Inter_v2::setupOpcodes(void) {
OPCODE(o1_waitEndPlay),
OPCODE(o1_playComposition),
OPCODE(o1_getFreeMem),
- OPCODE(o1_checkData),
+ OPCODE(o2_checkData),
/* 40 */
{NULL, ""},
OPCODE(o1_prepareStr),
@@ -1180,6 +1180,23 @@ void Inter_v2::loadMult(void) {
}
}
+bool Inter_v2::o2_checkData(char &cmdCount, int16 &counter, int16 &retFlag) {
+ int16 handle;
+ int16 varOff;
+
+ evalExpr(0);
+ varOff = _vm->_parse->parseVarIndex();
+ handle = _vm->_dataio->openData(_vm->_global->_inter_resStr);
+
+ WRITE_VAR_OFFSET(varOff, handle);
+ if (handle >= 0) {
+ _vm->_dataio->closeData(handle);
+ WRITE_VAR(16, (uint32) _vm->_dataio->getDataSize(_vm->_global->_inter_resStr));
+ } else
+ WRITE_VAR(16, (uint32) -1);
+ return false;
+}
+
bool Inter_v2::o2_stopSound(char &cmdCount, int16 &counter, int16 &retFlag) {
_vm->_snd->stopSound(_vm->_parse->parseValExpr());
_soundEndTimeKey = 0;