[Scummvm-git-logs] scummvm master -> dd4866dd1b5d24eb92d3c364c3a1da2c185ac27c
sev-
sev at scummvm.org
Mon Aug 3 09:05:59 UTC 2020
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:
3a390e863d DIRECTOR: LINGO: Remove dead code
1841c29bca DIRECTOR: Remove unneeded condition
3e5d519858 FULLPIPE: Initialize class variable
dd4866dd1b FULLPIPE: Another class variable initialization
Commit: 3a390e863d85682427b2f7198075f2b677bd60da
https://github.com/scummvm/scummvm/commit/3a390e863d85682427b2f7198075f2b677bd60da
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-03T11:05:38+02:00
Commit Message:
DIRECTOR: LINGO: Remove dead code
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index b7ebcc3d58..a37d7d64ab 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1766,7 +1766,6 @@ void LB::b_puppetPalette(int nargs) {
break;
default:
ARGNUMCHECK(1);
- g_lingo->dropStack(nargs);
return;
}
Commit: 1841c29bca5cf8ed464cf9d23e13bdc5daa955bf
https://github.com/scummvm/scummvm/commit/1841c29bca5cf8ed464cf9d23e13bdc5daa955bf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-03T11:05:38+02:00
Commit Message:
DIRECTOR: Remove unneeded condition
Changed paths:
engines/director/resource.cpp
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 48ac3e72e1..a898af5eee 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -72,9 +72,7 @@ Common::Error Stage::loadInitialMovie() {
_currentMovie = new Movie(this);
_currentPath = getPath(movie, _currentPath);
_currentMovie->loadSharedCastsFrom(_currentPath + g_director->_sharedCastFile);
-
- if (_currentMovie)
- _currentMovie->setArchive(_mainArchive);
+ _currentMovie->setArchive(_mainArchive);
return Common::kNoError;
}
Commit: 3e5d51985887af53ae074a2705372e2b46165385
https://github.com/scummvm/scummvm/commit/3e5d51985887af53ae074a2705372e2b46165385
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-03T11:05:38+02:00
Commit Message:
FULLPIPE: Initialize class variable
Changed paths:
engines/fullpipe/gfx.cpp
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index a8620c348a..b542a7d917 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -696,6 +696,7 @@ Bitmap::Bitmap() {
_dataSize = 0;
_flags = 0;
_flipping = Graphics::FLIP_NONE;
+ _surface = nullptr;
}
Bitmap::Bitmap(const Bitmap &src) {
@@ -708,6 +709,7 @@ Bitmap::Bitmap(const Bitmap &src) {
_height = src._height;
_surface = src._surface;
_flipping = src._flipping;
+ _surface = src._surface;
}
Bitmap::~Bitmap() {
Commit: dd4866dd1b5d24eb92d3c364c3a1da2c185ac27c
https://github.com/scummvm/scummvm/commit/dd4866dd1b5d24eb92d3c364c3a1da2c185ac27c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-03T11:05:38+02:00
Commit Message:
FULLPIPE: Another class variable initialization
Changed paths:
engines/fullpipe/gfx.cpp
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index b542a7d917..c9f186905a 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -97,6 +97,7 @@ PictureObject::PictureObject() {
_ox2 = 0;
_oy2 = 0;
_objtype = kObjTypePictureObject;
+ _picture = nullptr;
}
PictureObject::PictureObject(PictureObject *src) : GameObject(src) {
More information about the Scummvm-git-logs
mailing list