[Scummvm-cvs-logs] CVS: residual scene.h,1.8,1.9

[James Brown]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv10818

Modified Files:
	scene.h 
Log Message:
Fix regression - zbuffer room masks are optional, the alley doesn't have one, so don't error.


Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scene.h	23 Aug 2003 13:52:43 -0000	1.8
+++ scene.h	30 Aug 2003 13:37:03 -0000	1.9
@@ -38,11 +38,13 @@
   ~Scene();
 
   void drawBackground() const {
-    if ((currSetup_->bkgnd_bm_ == NULL) || (currSetup_->bkgnd_zbm_ == NULL)) {
+    if (currSetup_->bkgnd_zbm_ != NULL) // Some screens have no zbuffer mask (eg, Alley)
+      currSetup_->bkgnd_zbm_->draw();
+
+    if (currSetup_->bkgnd_bm_ == NULL) {
       error("Null background for setup %s in %s", currSetup_->name_.c_str(), name_.c_str());
       return;
-    }
-    currSetup_->bkgnd_zbm_->draw();
+    } 
     currSetup_->bkgnd_bm_->draw();
   }
   void setupCamera() {