[Scummvm-git-logs] scummvm master -> 4e8db68d4a5e7efd022d434e4f1f1a5ced155e93

[sluicebox]

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:
f7ba6bb448 SCI: Remove redundant assert
4e8db68d4a SCI: Remove asserting "new" allocation results


Commit: f7ba6bb448dc5621f791e293d1839d34d5de8cca
    https://github.com/scummvm/scummvm/commit/f7ba6bb448dc5621f791e293d1839d34d5de8cca
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-05-23T16:52:43-06:00

Commit Message:
SCI: Remove redundant assert

Changed paths:
    engines/sci/graphics/cursor.cpp


diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index f2a445ca5c..c07a9696db 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -527,8 +527,6 @@ void GfxCursor::kernelSetMacCursor(GuiResourceId viewNum, int loopNum, int celNu
 
 	CursorMan.disableCursorPalette(false);
 
-	assert(resource);
-
 	Common::MemoryReadStream resStream(resource->toStream());
 	Graphics::MacCursor *macCursor = new Graphics::MacCursor();
 


Commit: 4e8db68d4a5e7efd022d434e4f1f1a5ced155e93
    https://github.com/scummvm/scummvm/commit/4e8db68d4a5e7efd022d434e4f1f1a5ced155e93
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-05-23T16:55:35-06:00

Commit Message:
SCI: Remove asserting "new" allocation results

Changed paths:
    engines/sci/resource/resource.cpp
    engines/sci/resource/resource_patcher.cpp
    engines/sci/sci.cpp
    engines/sci/sound/drivers/cms.cpp


diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index d9f8a9728d..eef3f9ea67 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -267,7 +267,6 @@ ResourceSource::~ResourceSource() {
 MacResourceForkResourceSource::MacResourceForkResourceSource(const Common::String &name, int volNum)
  : ResourceSource(kSourceMacResourceFork, name, volNum) {
 	_macResMan = new Common::MacResManager();
-	assert(_macResMan);
 }
 
 MacResourceForkResourceSource::~MacResourceForkResourceSource() {
diff --git a/engines/sci/resource/resource_patcher.cpp b/engines/sci/resource/resource_patcher.cpp
index 63d3f974a9..ad16e5f84b 100644
--- a/engines/sci/resource/resource_patcher.cpp
+++ b/engines/sci/resource/resource_patcher.cpp
@@ -577,7 +577,6 @@ void ResourcePatcher::patchResource(Resource &resource, const GameResourcePatch
 		assert(newSize > 0);
 
 		target = new byte[newSize];
-		assert(target);
 
 		oldData = resource._data;
 		resource._data = target;
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 58f0b34926..150cc676d7 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -258,7 +258,6 @@ extern int showScummVMDialog(const Common::U32String &message, const Common::U32
 
 Common::Error SciEngine::run() {
 	_resMan = new ResourceManager();
-	assert(_resMan);
 	_resMan->addAppropriateSources();
 	_resMan->init();
 
diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp
index f7347616cc..b7004cd073 100644
--- a/engines/sci/sound/drivers/cms.cpp
+++ b/engines/sci/sound/drivers/cms.cpp
@@ -768,7 +768,6 @@ int MidiDriver_CMS::open() {
 
 	_rate = _mixer->getOutputRate();
 	_cms = new CMSEmulator(_rate);
-	assert(_cms);
 
 	for (uint i = 0; i < ARRAYSIZE(_channel); ++i)
 		_channel[i] = Channel();