SUPERNOVA: Fix logic in rendering code

There were several issues fixed by this commit. The main ones are:
 - It was in many places only drawing the first section even for
   images that have multiple sections.
 - It was in some places using the wrong image.

The first issue has been fixed by removing the GameManager::drawImage
function, and moving its logic to SupernovaEngine::renderImage which
was initially only drawing one section, but was nevertheless called
directly from many place.

The second image required more changes to the rendering code to allow
setting the current image file when it is different from the room file.
This fixes some memory issues and random crashes in places where it was
for example trying to use the image -1. This also fixes the rendering
of the flying cutscene.

1 files changed, 3 insertions, 2 deletions

diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 8606600019..fe171084b8 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -105,7 +105,6 @@ public:
 	Common::StringArray _gameStrings;
 	Common::String _nullString;
 
-	byte _imageIndex;
 	byte _menuBrightness;
 	byte _brightness;
 	uint _delay;
@@ -127,8 +126,10 @@ public:
 	void playSound(AudioIndex sample);
 	void playSoundMod(int filenumber);
 	void stopSound();
-	void renderImage(MSNImageDecoder &image, int section);
+	void renderImageSection(int section);
 	void renderImage(int filenumber, int section);
+	void renderImage(int section);
+	bool setCurrentImage(int filenumber);
 	void saveScreen(int x, int y, int width, int height);
 	void restoreScreen();
 	void renderRoom(Room &room);