[Scummvm-cvs-logs] scummvm master -> a762173794935efe4ab4d229fdc73f4d9c65e5ab

fuzzie fuzzie at fuzzie.org
Thu Apr 14 18:47:22 CEST 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:
a762173794 SWORD25: Always create the MoviePlayer, even without USE_THEORADEC.


Commit: a762173794935efe4ab4d229fdc73f4d9c65e5ab
    https://github.com/scummvm/scummvm/commit/a762173794935efe4ab4d229fdc73f4d9c65e5ab
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-04-14T09:45:45-07:00

Commit Message:
SWORD25: Always create the MoviePlayer, even without USE_THEORADEC.

Changed paths:
    engines/sword25/kernel/kernel.cpp



diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index 6b99b0a..99fec52 100644
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -95,10 +95,8 @@ Kernel::Kernel() :
 	_geometry = new Geometry(this);
 	assert(_geometry);
 
-#ifdef USE_THEORADEC
 	_fmv = new MoviePlayer(this);
 	assert(_fmv);
-#endif
 
 	_initSuccess = true;
 }
@@ -121,10 +119,8 @@ Kernel::~Kernel() {
 	delete _geometry;
 	_geometry = 0;
 
-#ifdef USE_THEORADEC
 	delete _fmv;
 	_fmv = 0;
-#endif
 
 	delete _script;
 	_script = 0;






More information about the Scummvm-git-logs mailing list