[Scummvm-git-logs] scummvm-tools master -> 5e08dc7693e033c4e8c237b294c73dc769b3f343

sev- sev at scummvm.org
Mon Dec 7 22:53:43 UTC 2020


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

Summary:
5e08dc7693 TOOLS: Fix compilation on non-c++11 compilers


Commit: 5e08dc7693e033c4e8c237b294c73dc769b3f343
    https://github.com/scummvm/scummvm-tools/commit/5e08dc7693e033c4e8c237b294c73dc769b3f343
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-12-07T23:53:18+01:00

Commit Message:
TOOLS: Fix compilation on non-c++11 compilers

Changed paths:
    engines/scumm/compress_scumm_bun.cpp


diff --git a/engines/scumm/compress_scumm_bun.cpp b/engines/scumm/compress_scumm_bun.cpp
index 23efabdf8..7bd9b49f3 100644
--- a/engines/scumm/compress_scumm_bun.cpp
+++ b/engines/scumm/compress_scumm_bun.cpp
@@ -734,7 +734,7 @@ byte *CompressScummBun::decompressBundleSound(int index, Common::File  &input, i
 	}
 
 	if (tag != 'COMP')
-		return nullptr;
+		return NULL;
 	rawMuse = false;
 	assert(tag == 'COMP');
 	int numCompItems = input.readUint32BE();
@@ -1190,4 +1190,3 @@ int main(int argc, char *argv[]) {
 	return scummbun.run(argc, argv);
 }
 #endif
-




More information about the Scummvm-git-logs mailing list