[Scummvm-git-logs] scummvm master -> 00e8bc1945ee0727bb77a8e48f8a20edb0619068

[sev-]

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

Summary:
b643af27c3 PLUMBERS: Remove unnecessary conditional
c77e34b607 PLUMBERS: Change file allocation from heap to stack
6e661ab485 PLUMBERS: Removed unnecessary calls
00e8bc1945 PLUMBERS: Optimized heap allocation


Commit: b643af27c3f259afba872332c29c487021b3093b
    https://github.com/scummvm/scummvm/commit/b643af27c3f259afba872332c29c487021b3093b
Author: whitertandrek (whiterandrek at gmail,com)
Date: 2018-04-07T11:33:13+02:00

Commit Message:
PLUMBERS: Remove unnecessary conditional

delete perfoms the check anyway

Changed paths:
    engines/plumbers/plumbers.cpp


diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index 9904acb..62e994e 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -182,8 +182,7 @@ void PlumbersGame::loadImage(const Common::String &dirname, const Common::String
 	if (!file->open(name))
 		error("unable to load image %s", name.c_str());
 
-	if (_image)
-		delete _image;
+	delete _image;
 
 	_image = new Image::BitmapDecoder();
 	_image->loadStream(*file);


Commit: c77e34b607f43d1c3947bc170f701891c59afe0f
    https://github.com/scummvm/scummvm/commit/c77e34b607f43d1c3947bc170f701891c59afe0f
Author: whitertandrek (whiterandrek at gmail,com)
Date: 2018-04-07T11:33:13+02:00

Commit Message:
PLUMBERS: Change file allocation from heap to stack

Changed paths:
    engines/plumbers/plumbers.cpp


diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index 62e994e..d71b7ec 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -178,16 +178,15 @@ Common::Error PlumbersGame::run() {
 void PlumbersGame::loadImage(const Common::String &dirname, const Common::String &filename) {
 	Common::String name = dirname + "/" + filename;
 	debugC(1, kDebugGeneral, "%s : %s", __FUNCTION__, name.c_str());
-	Common::File *file = new Common::File();
-	if (!file->open(name))
+	Common::File file;
+	if (!file.open(name))
 		error("unable to load image %s", name.c_str());
 
 	delete _image;
 
 	_image = new Image::BitmapDecoder();
-	_image->loadStream(*file);
-	file->close();
-	delete file;
+	_image->loadStream(file);
+	file.close();
 }
 
 void PlumbersGame::drawScreen() {


Commit: 6e661ab4850e282e135e97831236b1677d16c285
    https://github.com/scummvm/scummvm/commit/6e661ab4850e282e135e97831236b1677d16c285
Author: whitertandrek (whiterandrek at gmail,com)
Date: 2018-04-07T11:33:13+02:00

Commit Message:
PLUMBERS: Removed unnecessary calls

destructor of Common::File anyway calls close method

Changed paths:
    engines/plumbers/plumbers.cpp


diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index d71b7ec..3821170 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -186,7 +186,6 @@ void PlumbersGame::loadImage(const Common::String &dirname, const Common::String
 
 	_image = new Image::BitmapDecoder();
 	_image->loadStream(file);
-	file.close();
 }
 
 void PlumbersGame::drawScreen() {
@@ -360,7 +359,6 @@ void PlumbersGame::readTables(const Common::String &fileName) {
 		file.read(buf, kMaxName);
 		_bitmaps[i]._filename = Common::String(buf);
 	}
-	file.close();
 }
 
 int PlumbersGame::getSceneNumb(int sNo) {


Commit: 00e8bc1945ee0727bb77a8e48f8a20edb0619068
    https://github.com/scummvm/scummvm/commit/00e8bc1945ee0727bb77a8e48f8a20edb0619068
Author: whitertandrek (whiterandrek at gmail,com)
Date: 2018-04-07T11:33:13+02:00

Commit Message:
PLUMBERS: Optimized heap allocation

No sense in deleting and then allocating an object again because loadStream method destroy previous data.

Changed paths:
    engines/plumbers/plumbers.cpp


diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index 3821170..5491f81 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -90,6 +90,7 @@ static const byte cursorPalette[] = {
 Common::Error PlumbersGame::run() {
 	initGraphics(640, 480);
 	_console = new Console();
+	_image = new Image::BitmapDecoder();
 
 	CursorMan.replaceCursor(MOUSECURSOR_SCI, 11, 16, 0, 0, 0);
 	CursorMan.replaceCursorPalette(cursorPalette, 0, 3);
@@ -182,9 +183,6 @@ void PlumbersGame::loadImage(const Common::String &dirname, const Common::String
 	if (!file.open(name))
 		error("unable to load image %s", name.c_str());
 
-	delete _image;
-
-	_image = new Image::BitmapDecoder();
 	_image->loadStream(file);
 }