[Scummvm-git-logs] scummvm master -> d9ab653052158ba37cb9e2a00efe1ea716f4b665

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ae340d847 XEEN: Remove debug code and unneeded variables
d9ab653052 XEEN: Remove old stubbed Screen::draw method


Commit: 8ae340d8479966b53bf2151627c05792362807f5
    https://github.com/scummvm/scummvm/commit/8ae340d8479966b53bf2151627c05792362807f5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T21:34:54-05:00

Commit Message:
XEEN: Remove debug code and unneeded variables

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/dialogs_difficulty.cpp
    engines/xeen/interface.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 32984c1..94d31bd 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -235,8 +235,7 @@ void Combat::giveCharDamage(int damage, DamageType attackType, int charIndex) {
 			if (damage < 0)
 				damage = 0;
 
-			// TODO: This seems weird.. maybe I've got attack types wrong..
-			// why should attack type 7 (DT_SLEEP) set the dead condition?
+			// Attacked characters which are asleep are killed
 			if (attackType == DT_SLEEP) {
 				damage = c._currentHp;
 				c._conditions[DEAD] = 1;
diff --git a/engines/xeen/dialogs_difficulty.cpp b/engines/xeen/dialogs_difficulty.cpp
index e7c7445..8d542dc 100644
--- a/engines/xeen/dialogs_difficulty.cpp
+++ b/engines/xeen/dialogs_difficulty.cpp
@@ -40,8 +40,6 @@ DifficultyDialog::DifficultyDialog(XeenEngine *vm) : ButtonContainer(vm) {
 
 int DifficultyDialog::execute() {
 	EventsManager &events = *_vm->_events;
-	Interface &intf = *_vm->_interface;
-	Party &party = *_vm->_party;
 	Windows &windows = *_vm->_windows;
 
 	Window &w = windows[6];
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index dff6dc7..fa06fa7 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -579,9 +579,6 @@ void Interface::perform() {
 		Quests::show(_vm);
 		break;
 
-	case Common::KEYCODE_x:
-		// ****DEBUG***
-		PartyDialog::show(_vm); //***DEBUG****
 	default:
 		break;
 	}


Commit: d9ab653052158ba37cb9e2a00efe1ea716f4b665
    https://github.com/scummvm/scummvm/commit/d9ab653052158ba37cb9e2a00efe1ea716f4b665
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T21:38:20-05:00

Commit Message:
XEEN: Remove old stubbed Screen::draw method

Changed paths:
    engines/xeen/screen.cpp
    engines/xeen/screen.h
    engines/xeen/worldofxeen/darkside_cutscenes.cpp


diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 98421dd..2c92ee1 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 0880042..5028b50 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 a772500..89ac9c6 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);