[Scummvm-cvs-logs] SF.net SVN: scummvm:[49215] scummvm/trunk/engines/mohawk/video.cpp

[mthreepwood at users.sourceforge.net]

Revision: 49215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49215&view=rev
Author:   mthreepwood
Date:     2010-05-25 18:11:14 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Fix a Myst regression: not a good idea to use memset on a Common::String :)

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/video.cpp

Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp	2010-05-25 15:38:30 UTC (rev 49214)
+++ scummvm/trunk/engines/mohawk/video.cpp	2010-05-25 18:11:14 UTC (rev 49215)
@@ -121,7 +121,9 @@
 	}
 
 	delete _videoStreams[videoHandle].video;
-	memset(&_videoStreams[videoHandle], 0, sizeof(VideoEntry));
+	_videoStreams[videoHandle].video = 0;
+	_videoStreams[videoHandle].id = 0;
+	_videoStreams[videoHandle].filename = "";
 }
 
 void VideoManager::playBackgroundMovie(Common::String filename, int16 x, int16 y, bool loop) {
@@ -152,8 +154,9 @@
 				_videoStreams[i]->rewind();
 			} else {
 				delete _videoStreams[i].video;
-				memset(&_videoStreams[i], 0, sizeof(VideoEntry));
-				_videoStreams[i].video = NULL;
+				_videoStreams[i].video = 0;
+				_videoStreams[i].id = 0;
+				_videoStreams[i].filename = "";
 				continue;
 			}
 		}


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