[Scummvm-cvs-logs] SF.net SVN: scummvm:[35396] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Dec 16 21:21:30 CET 2008
Revision: 35396
http://scummvm.svn.sourceforge.net/scummvm/?rev=35396&view=rev
Author: drmccoy
Date: 2008-12-16 20:21:29 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
Rotating the object backwards in the magnifing view works now
Modified Paths:
--------------
scummvm/trunk/engines/gob/coktelvideo.cpp
scummvm/trunk/engines/gob/videoplayer.cpp
scummvm/trunk/engines/gob/videoplayer.h
Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp 2008-12-16 19:55:51 UTC (rev 35395)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp 2008-12-16 20:21:29 UTC (rev 35396)
@@ -1213,7 +1213,7 @@
if (!_vidMem)
setVideoMemory();
- for (uint16 i = 0; i < _partsPerFrame; i++) {
+ for (uint16 i = 0; (i < _partsPerFrame) && (frame < _framesCount); i++) {
Part &part = _frames[frame].parts[i];
if (part.type == kPartTypeAudio) {
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2008-12-16 19:55:51 UTC (rev 35395)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2008-12-16 20:21:29 UTC (rev 35396)
@@ -38,7 +38,7 @@
namespace Gob {
-const char *VideoPlayer::_extensions[] = { "IMD", "VMD" };
+const char *VideoPlayer::_extensions[] = { "IMD", "VMD", "RMD" };
VideoPlayer::Video::Video(GobEngine *vm) : _vm(vm), _fileName(0), _stream(0), _video(0) {
}
@@ -63,6 +63,8 @@
_video = new Imd();
} else if (which == kVideoTypeVMD) {
_video = new Vmd(_vm->_video->_palLUT);
+ } else if (which == kVideoTypeRMD) {
+ _video = new Vmd(_vm->_video->_palLUT);
} else {
warning("Couldn't open video \"%s\": Invalid video Type", fileName);
close();
Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h 2008-12-16 19:55:51 UTC (rev 35395)
+++ scummvm/trunk/engines/gob/videoplayer.h 2008-12-16 20:21:29 UTC (rev 35396)
@@ -48,7 +48,8 @@
enum Type {
kVideoTypeTry = -1,
kVideoTypeIMD = 0,
- kVideoTypeVMD = 1
+ kVideoTypeVMD = 1,
+ kVideoTypeRMD = 2
};
VideoPlayer(GobEngine *vm);
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