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

orgads noreply at scummvm.org
Thu May 26 12:06:45 UTC 2022


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

Summary:
e16007f3d7 GOB: Remove unused function overload


Commit: e16007f3d7ea15635a2ef63295b52d4020b0a1a4
    https://github.com/scummvm/scummvm/commit/e16007f3d7ea15635a2ef63295b52d4020b0a1a4
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-05-26T15:06:32+03:00

Commit Message:
GOB: Remove unused function overload

Changed paths:
    engines/gob/sound/sounddesc.cpp
    engines/gob/sound/sounddesc.h


diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp
index f2a02ac9777..ea243e9d14d 100644
--- a/engines/gob/sound/sounddesc.cpp
+++ b/engines/gob/sound/sounddesc.cpp
@@ -71,20 +71,6 @@ void SoundDesc::set(SoundType type, byte *data, uint32 dSize) {
 	_size = dSize;
 }
 
-void SoundDesc::set(SoundType type, Resource *resource) {
-	byte *data = nullptr;
-	uint32 dSize = 0;
-
-	if (resource && (resource->getSize() > 0)) {
-		data = resource->getData();
-		dSize = resource->getSize();
-	}
-
-	set(type, data, dSize);
-
-	_resource = resource;
-}
-
 bool SoundDesc::load(SoundType type, byte *data, uint32 dSize) {
 	free();
 
diff --git a/engines/gob/sound/sounddesc.h b/engines/gob/sound/sounddesc.h
index 3affb966bc3..4412cfe4197 100644
--- a/engines/gob/sound/sounddesc.h
+++ b/engines/gob/sound/sounddesc.h
@@ -56,7 +56,6 @@ public:
 	bool isId(int16 id) const { return _dataPtr && (_id == id); }
 
 	void set(SoundType type, byte *data, uint32 dSize);
-	void set(SoundType type, Resource *resource);
 	bool load(SoundType type, byte *data, uint32 dSize);
 	bool load(SoundType type, Resource *resource);
 




More information about the Scummvm-git-logs mailing list