Fix regression - zbuffer room masks are optional, the alley doesn't have one, so don't error.
This commit is contained in:
parent
6945e91ba1
commit
fbd8932a33
1 changed files with 5 additions and 3 deletions
8
scene.h
8
scene.h
|
@ -38,11 +38,13 @@ public:
|
||||||
~Scene();
|
~Scene();
|
||||||
|
|
||||||
void drawBackground() const {
|
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());
|
error("Null background for setup %s in %s", currSetup_->name_.c_str(), name_.c_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
currSetup_->bkgnd_zbm_->draw();
|
|
||||||
currSetup_->bkgnd_bm_->draw();
|
currSetup_->bkgnd_bm_->draw();
|
||||||
}
|
}
|
||||||
void setupCamera() {
|
void setupCamera() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue