[Scummvm-cvs-logs] SF.net SVN: scummvm:[33106] residual/trunk/engine

[drmccoy at users.sourceforge.net]

Revision: 33106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33106&view=rev
Author:   drmccoy
Date:     2008-07-18 22:44:11 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
lip sync patch, courtesy of salty-horse

Modified Paths:
--------------
    residual/trunk/engine/lipsynch.h
    residual/trunk/engine/resource.cpp

Modified: residual/trunk/engine/lipsynch.h
===================================================================
--- residual/trunk/engine/lipsynch.h	2008-07-18 22:10:59 UTC (rev 33105)
+++ residual/trunk/engine/lipsynch.h	2008-07-18 22:44:11 UTC (rev 33106)
@@ -43,6 +43,7 @@
 	};
 
 	int getAnim(int pos);
+	bool isValid() { return _numEntries > 0; }
 
 private:
 	LipEntry *_entries;

Modified: residual/trunk/engine/resource.cpp
===================================================================
--- residual/trunk/engine/resource.cpp	2008-07-18 22:10:59 UTC (rev 33105)
+++ residual/trunk/engine/resource.cpp	2008-07-18 22:44:11 UTC (rev 33106)
@@ -265,8 +265,15 @@
 		result = NULL;
 	} else {
 		result = new LipSynch(filename, b->data(), b->len());
-		delete b;
-		_cache[fname] = result;
+		
+		// Some lipsynch files have no data
+		if (result->isValid()) {
+			delete b;
+			_cache[fname] = result;
+		} else {
+			delete result;
+			result = NULL;
+		}
 	}	
 
 	return result;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.