[Scummvm-cvs-logs] SF.net SVN: scummvm:[53595] scummvm/trunk/engines/lastexpress/data

[littleboy at users.sourceforge.net]

Revision: 53595
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53595&view=rev
Author:   littleboy
Date:     2010-10-18 23:06:52 +0000 (Mon, 18 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Check for a valid sequence in SequenceFrame::getName

This allows the demo to fail gracefully to the debugger instead of crashing

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/data/sequence.cpp
    scummvm/trunk/engines/lastexpress/data/sequence.h

Modified: scummvm/trunk/engines/lastexpress/data/sequence.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/sequence.cpp	2010-10-18 22:30:44 UTC (rev 53594)
+++ scummvm/trunk/engines/lastexpress/data/sequence.cpp	2010-10-18 23:06:52 UTC (rev 53595)
@@ -468,6 +468,13 @@
 	return _sequence->getFrameInfo(_frame);
 }
 
+Common::String SequenceFrame::getName() {
+	if (!_sequence)
+		error("SequenceFrame::getName: Invalid sequence!");
+
+	return _sequence->getName();
+}
+
 bool SequenceFrame::equal(const SequenceFrame *other) const {
 	return _sequence->getName() == other->_sequence->getName() && _frame == other->_frame;
 }

Modified: scummvm/trunk/engines/lastexpress/data/sequence.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/sequence.h	2010-10-18 22:30:44 UTC (rev 53594)
+++ scummvm/trunk/engines/lastexpress/data/sequence.h	2010-10-18 23:06:52 UTC (rev 53595)
@@ -189,7 +189,7 @@
 	uint32 getFrame() { return _frame; }
 	bool nextFrame();
 
-	Common::String getName() { return _sequence->getName(); }
+	Common::String getName();
 	FrameInfo *getInfo();
 
 	bool equal(const SequenceFrame *other) const;


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