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

[aquadran at users.sourceforge.net]

Revision: 22496
Author:   aquadran
Date:     2006-05-16 15:16:31 -0700 (Tue, 16 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22496&view=rev

Log Message:
-----------
added two workarounds/checks for now

Modified Paths:
--------------
    residual/trunk/actor.cpp
    residual/trunk/bitmap.h
Modified: residual/trunk/actor.cpp
===================================================================
--- residual/trunk/actor.cpp	2006-05-16 20:00:48 UTC (rev 22495)
+++ residual/trunk/actor.cpp	2006-05-16 22:16:31 UTC (rev 22496)
@@ -404,9 +404,12 @@
 }
 
 void Actor::setColormap(const char *map) {
-	Costume *cost = _costumeStack.back();
-	
-	cost->setColormap((char *) map);
+	if (!_costumeStack.empty()) {
+		Costume *cost = _costumeStack.back();
+		cost->setColormap((char *) map);
+	} else {
+		warning("Actor::setColormap: No costumes");
+	}
 }
 
 void Actor::setCostume(const char *name) {

Modified: residual/trunk/bitmap.h
===================================================================
--- residual/trunk/bitmap.h	2006-05-16 20:00:48 UTC (rev 22495)
+++ residual/trunk/bitmap.h	2006-05-16 22:16:31 UTC (rev 22496)
@@ -24,6 +24,7 @@
 #define BITMAP_H
 
 #include "resource.h"
+#include "debug.h"
 
 #include <cstring>
 
@@ -36,7 +37,7 @@
 	void draw() const;
 
 	// Set which image in an animated bitmap to use
-	void setNumber(int n) { _currImage = n; }
+	void setNumber(int n) { if ((n - 1) >= _numImages) warning("Bitmap::setNumber: no anim image: %d", n); else _currImage = n; }
 
 	int numImages() const { return _numImages; }
 	int currentImage() const { return _currImage; }


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