[Scummvm-cvs-logs] SF.net SVN: scummvm: [24711] scummvm/trunk/engines/scumm/script_v6.cpp

[fingolfin at users.sourceforge.net]

Revision: 24711
          http://svn.sourceforge.net/scummvm/?rev=24711&view=rev
Author:   fingolfin
Date:     2006-11-13 12:20:01 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v6.cpp

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2006-11-13 20:12:52 UTC (rev 24710)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2006-11-13 20:20:01 UTC (rev 24711)
@@ -2524,16 +2524,17 @@
 
 			// SMUSH movie playback
 			if (args[1] == 0) {
-				assert(getStringAddressVar(VAR_VIDEONAME));
-				if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
+				const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME);
+				assert(videoname);
+				if (strcmp(videoname, "sq3.san") == 0)
 					_smushFrameRate = 14;
 
 				// Correct incorrect smush filename in Macintosh FT demo
 				if ((_game.id == GID_FT) && (_game.features & GF_DEMO) && (_game.platform == Common::kPlatformMacintosh) &&
-					(strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "jumpgorge.san") == 0))
+					(strcmp(videoname, "jumpgorge.san") == 0))
 					_splayer->play("jumpgorg.san", _smushFrameRate);
 				else
-					_splayer->play((char *)getStringAddressVar(VAR_VIDEONAME), _smushFrameRate);
+					_splayer->play(videoname, _smushFrameRate);
 
 				if (_game.id == GID_DIG) {
 					_disableFadeInEffect = true;


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