From 80bba746406743ab7a7ae6c163c79c652f6d7624 Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Sat, 8 Mar 2014 08:33:13 -0500
Subject: [PATCH] MADS: Fix sprites loading for scene 804

---
 engines/mads/nebular/nebular_scenes8.cpp | 14 +++++++++-----
 engines/mads/sprites.cpp                 |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index caad1e79a7a..56c36794098 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -75,6 +75,11 @@ void Scene8xx::enter1() {
 /*------------------------------------------------------------------------*/
 
 void Scene804::setup() {
+	Scene8xx::setup1();
+	Scene8xx::setup2();
+}
+
+void Scene804::enter() {
 	_globals._chairHotspotIndex = 0;
 	_globals._v1 = _globals._v2 = 0;
 	_globals._v3 = _globals._v4 = 0;
@@ -101,7 +106,8 @@ void Scene804::setup() {
 			_globals._spriteIndexes[19] = _scene->_sequences.startCycle(
 				_globals._spriteIndexes[4], 0, 1);
 			_scene->_sequences.addTimer(60, 100);
-		} else {
+		}
+		else {
 			_globals._spriteIndexes[20] = _scene->_sequences.startCycle(
 				_globals._spriteIndexes[5], false, 1);
 			_globals._spriteIndexes[21] = _scene->_sequences.startReverseCycle(
@@ -109,7 +115,8 @@ void Scene804::setup() {
 			_scene->_sequences.addTimer(160, 70);
 			_vm->_game->_player._stepEnabled = false;
 		}
-	} else {
+	}
+	else {
 		if (_globals[167] == 0) {
 			_globals._spriteIndexes[22] = _scene->_sequences.startCycle(
 				_globals._spriteIndexes[7], false, 1);
@@ -136,9 +143,6 @@ void Scene804::setup() {
 	}
 }
 
-void Scene804::enter() {
-}
-
 void Scene804::step() {
 }
 
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 9a56ed38957..87a23d12961 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -347,7 +347,7 @@ int SpriteSets::add(SpriteAsset *asset, int idx) {
 	if (!idx)
 		idx = size();
 
-	if (idx >= (int)(size() + 1))
+	if (idx >= (int)size())
 		resize(idx + 1);
 	delete (*this)[idx];
 	(*this)[idx] = asset;