remove accidentally committed debugging code; fix shadowing warning

svn-id: r33064

2 files changed, 9 insertions, 15 deletions

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 89532b8961..e4e2b2b620 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -31,8 +31,6 @@
 
 #include "graphics/scaler.h"
 
-#include "valgrind/memcheck.h"
-
 #ifdef __DS__
 #include "scummhelp.h"
 #endif
@@ -328,10 +326,6 @@ void SaveLoadChooser::reflowLayout() {
 
 		_container->resize(thumbX - hPad, thumbY - vPad, kThumbnailWidth + hPad * 2, thumbH + vPad * 2 + kLineHeight * 4);
 
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbX);
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbY);
-		VALGRIND_CHECK_VALUE_IS_DEFINED(thumbH);
-
 		// Add the thumbnail display
 		_gfxWidget->resize(thumbX, thumbY, kThumbnailWidth, thumbH);
 
@@ -368,7 +362,7 @@ void SaveLoadChooser::reflowLayout() {
 	Dialog::reflowLayout();
 }
 
-void SaveLoadChooser::updateInfos(bool draw) {
+void SaveLoadChooser::updateInfos(bool redraw) {
 	int selItem = _list->getSelected();
 	Graphics::Surface *thumb;
 	thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
@@ -382,7 +376,7 @@ void SaveLoadChooser::updateInfos(bool draw) {
 	}
 
 	delete thumb;
-	if (draw)
+	if (redraw)
 		_gfxWidget->draw();
 
 	InfoStuff infos;
@@ -393,13 +387,13 @@ void SaveLoadChooser::updateInfos(bool draw) {
 			(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
 			infos.date & 0xFFFF);
 		_date->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_date->draw();
 
 		snprintf(buffer, 32, "Time: %.2d:%.2d",
 			(infos.time >> 8) & 0xFF, infos.time & 0xFF);
 		_time->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_time->draw();
 
 		int minutes = infos.playtime / 60;
@@ -409,22 +403,22 @@ void SaveLoadChooser::updateInfos(bool draw) {
 		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
 			hours & 0xFF, minutes & 0xFF);
 		_playtime->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_playtime->draw();
 	} else {
 		snprintf(buffer, 32, "No date saved");
 		_date->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_date->draw();
 
 		snprintf(buffer, 32, "No time saved");
 		_time->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_time->draw();
 
 		snprintf(buffer, 32, "No playtime saved");
 		_playtime->setLabel(buffer);
-		if (draw)
+		if (redraw)
 			_playtime->draw();
 	}
 }
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 730952676c..0d04d8faea 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -69,7 +69,7 @@ protected:
 
 	uint8 _fillR, _fillG, _fillB;
 
-	void updateInfos(bool draw);
+	void updateInfos(bool redraw);
 public:
 	SaveLoadChooser(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine);
 	~SaveLoadChooser();