[Scummvm-cvs-logs] SF.net SVN: scummvm: [22950] scummvm/trunk/engines/scumm/he
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue Jun 6 06:33:15 CEST 2006
Revision: 22950
Author: kirben
Date: 2006-06-05 21:33:09 -0700 (Mon, 05 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22950&view=rev
Log Message:
-----------
Minor cleanup
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/animation_he.cpp
scummvm/trunk/engines/scumm/he/script_v90he.cpp
Modified: scummvm/trunk/engines/scumm/he/animation_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/animation_he.cpp 2006-06-06 04:09:58 UTC (rev 22949)
+++ scummvm/trunk/engines/scumm/he/animation_he.cpp 2006-06-06 04:33:09 UTC (rev 22950)
@@ -23,8 +23,6 @@
#include "common/stdafx.h"
-#include "common/rect.h"
-
#include "scumm/he/animation_he.h"
#include "scumm/he/intern_he.h"
@@ -87,7 +85,7 @@
}
int MoviePlayer::load(const char *filename, int flags, int image) {
- char filename2[100];
+ char videoName[100];
uint32 tag;
int32 frameRate;
@@ -96,17 +94,17 @@
}
// Change file extension to dxa
- strcpy(filename2, filename);
- int len = strlen(filename2) - 3;
- filename2[len++] = 'd';
- filename2[len++] = 'x';
- filename2[len++] = 'a';
+ strcpy(videoName, filename);
+ int len = strlen(videoName) - 3;
+ videoName[len++] = 'd';
+ videoName[len++] = 'x';
+ videoName[len++] = 'a';
- if (_fd.open(filename2) == false) {
- warning("Failed to load video file %s", filename2);
+ if (_fd.open(videoName) == false) {
+ warning("Failed to load video file %s", videoName);
return -1;
}
- debug(0, "Playing video %s", filename2);
+ debug(1, "Playing video %s", videoName);
tag = _fd.readUint32BE();
assert(tag == MKID_BE('DEXA'));
@@ -133,8 +131,6 @@
// Skip sound tag
_fd.readUint32BE();
- debug(0, "frames_count %d width %d height %d rate %d ticks %d", _framesCount, _width, _height, _framesPerSec, _frameTicks);
-
_frameSize = _width * _height;
_frameBuffer1 = (uint8 *)malloc(_frameSize);
_frameBuffer2 = (uint8 *)malloc(_frameSize);
@@ -249,7 +245,6 @@
if (tag == MKID_BE('FRAM')) {
uint8 type = _fd.readByte();
uint32 size = _fd.readUint32BE();
- debug(0, "frame %d type %d size %d", _frameNum, type, size);
_fd.read(_frameBuffer2, size);
Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp 2006-06-06 04:09:58 UTC (rev 22949)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp 2006-06-06 04:33:09 UTC (rev 22950)
@@ -516,7 +516,6 @@
int status = fetchScriptByte();
int subOp = status - 49;
- debug(0, "o90_videoOps stub (%d)", subOp);
switch (subOp) {
case 0:
copyScriptString(_videoParams.filename, sizeof(_videoParams.filename));
@@ -565,7 +564,6 @@
byte subOp = fetchScriptByte();
subOp -= 32;
- debug(0, "o90_getVideoData stub (%d)", subOp);
switch (subOp) {
case 0: // Get width
pop();
@@ -588,8 +586,7 @@
push(_moviePlay->getImageNum());
break;
case 107: // Get statistics
- pop();
- pop();
+ debug(0, "o90_getVideoData: subOp 107 stub (%d, %d)", pop(), pop());
push(0);
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list