From d9ab653052158ba37cb9e2a00efe1ea716f4b665 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 24 Feb 2018 21:38:20 -0500
Subject: XEEN: Remove old stubbed Screen::draw method

---
 engines/xeen/screen.cpp                         |  6 ------
 engines/xeen/screen.h                           | 14 ++++++++++++--
 engines/xeen/worldofxeen/darkside_cutscenes.cpp | 11 ++---------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 98421dd5bb..2c92ee14c4 100644
--- a/engines/xeen/screen.cpp
+++ b/engines/xeen/screen.cpp
@@ -104,12 +104,6 @@ void Screen::vertMerge(int yp) {
 	markAllDirty();
 }
 
-void Screen::draw(void *data) {
-	// TODO: Figure out data structure that can be passed to method
-	assert(!data);
-	drawScreen();
-}
-
 void Screen::drawScreen() {
 	addDirtyRect(Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
 }
diff --git a/engines/xeen/screen.h b/engines/xeen/screen.h
index 0880042fd6..5028b505f0 100644
--- a/engines/xeen/screen.h
+++ b/engines/xeen/screen.h
@@ -93,14 +93,24 @@ public:
 	 */
 	void vertMerge(int yp);
 
-	void draw(void *data = nullptr);
-
+	/**
+	 * Fades in the screen
+	 */
 	void fadeIn(int step = 4);
 
+	/**
+	 * Fades out the screen
+	 */
 	void fadeOut(int step = 4);
 
+	/**
+	 * Saves a copy of the current screen into a specified slot
+	 */
 	void saveBackground(int slot = 1);
 
+	/**
+	 * Restores a previously saved screen
+	 */
 	void restoreBackground(int slot = 1);
 };
 
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index a772500eaa..89ac9c6783 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -62,7 +62,6 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 
 	// Draw the screen and fade it in
 	screen.horizMerge(0);
-	screen.draw();
 	screen.fadeIn();
 
 	sound.setMusicVolume(0x5f);
@@ -74,8 +73,7 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 		// Render the next frame
 		screen.vertMerge(0);
 		nwc[nwcIndex].draw(0, nwcFrame);
-		screen.draw();
-
+	
 		switch (idx) {
 		case 17:
 			sound.playSound(voc[0]);
@@ -99,8 +97,7 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 	for (int idx = 0; idx < 42 && !_vm->shouldExit(); ++idx) {
 		screen.vertMerge(SCREEN_HEIGHT);
 		nwc[3].draw(0, idx);
-		screen.draw();
-
+	
 		switch (idx) {
 		case 3:
 			sound.playFX(40);
@@ -134,7 +131,6 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 
 	screen.fadeOut(8);
 	screen.loadBackground("jvc.raw");
-	screen.draw();
 	screen.fadeIn();
 
 	WAIT(60);
@@ -196,7 +192,6 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 		if (!idx1)
 			frameNum = (frameNum + 1) % 10;
 
-		screen.draw();
 		if (!skipElapsed) {
 			timeExpired = MAX((int)events.timeElapsed() - 1, 1);
 			skipElapsed = true;
@@ -215,7 +210,6 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 
 	screen.vertMerge(SCREEN_HEIGHT);
 	screen.saveBackground(1);
-	screen.draw();
 	screen.freePages();
 
 	WAIT(30);
@@ -224,7 +218,6 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 	for (int idx = 14; idx >= 0; --idx) {
 		pyraTop.draw(0, 0, Common::Point(XLIST1[idx], YLIST1[idx]));
 		pyraTop.draw(0, 1, Common::Point(XLIST2[idx], YLIST1[idx]));
-		screen.draw();
 
 		if (idx == 2)
 			sound.setMusicVolume(48);
-- 
cgit v1.2.3