[Scummvm-cvs-logs] SF.net SVN: scummvm:[39194] scummvm/trunk/engines/sword2/animation.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 39194
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39194&view=rev
Author:   eriktorbjorn
Date:     2009-03-07 17:27:18 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Don't show a warning dialog for missing cutscenes in the demo. As noted in bug
#2669360, the demo tries to play cutscenes which really aren't there.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.cpp

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2009-03-07 17:12:42 UTC (rev 39193)
+++ scummvm/trunk/engines/sword2/animation.cpp	2009-03-07 17:27:18 UTC (rev 39194)
@@ -31,6 +31,7 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/header.h"
+#include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
@@ -348,9 +349,14 @@
 		return NULL;
 	}
 
-	sprintf(buf, "Cutscene '%s' not found", name);
- 	GUI::MessageDialog dialog(buf, "OK");
- 	dialog.runModal();
+	// The demo tries to play some cutscenes that aren't there, so make
+	// those warnings more discreet.
+	if (!vm->_logic->readVar(DEMO)) {
+		sprintf(buf, "Cutscene '%s' not found", name);
+	 	GUI::MessageDialog dialog(buf, "OK");
+	 	dialog.runModal();
+	} else
+		warning("Cutscene '%s' not found", name);
 
 	return NULL;
 }


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