[Scummvm-cvs-logs] scummvm master -> a5b198b23337e3b4f44dabefccb9f097b37b3198
lskovlun
lskovlun at sprogklog.dk
Sun Feb 13 22:48:42 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a5b198b233 Remove erroneous comment. It reflected a false belief resulting from
Commit: a5b198b23337e3b4f44dabefccb9f097b37b3198
https://github.com/scummvm/scummvm/commit/a5b198b23337e3b4f44dabefccb9f097b37b3198
Author: Lars Skovlund (lskovlun at image.dk)
Date: 2011-02-13T13:34:29-08:00
Commit Message:
Remove erroneous comment. It reflected a false belief resulting from
a missing parameter check, which has also been added.
Changed paths:
engines/sci/engine/kvideo.cpp
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index 155dec5..0706da0 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -236,10 +236,8 @@ reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv) {
case 0: // init
s->_videoState.reset();
s->_videoState.fileName = s->_segMan->derefString(argv[1]);
- // TODO: argv[2] (usually null). When it exists, it points to an "Event" object,
- // that holds no data initially (e.g. in the intro of Phantasmagoria 1 demo).
- // Perhaps it's meant for syncing
- if (argv[2] != NULL_REG)
+
+ if (argc > 2 && argv[2] != NULL_REG)
warning("kPlayVMD: third parameter isn't 0 (it's %04x:%04x - %s)", PRINT_REG(argv[2]), s->_segMan->getObjectName(argv[2]));
break;
case 1:
More information about the Scummvm-git-logs
mailing list