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

[digitall]

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:
e394071b98 SAGA2: Remove Several Chunks of Dead Code


Commit: e394071b98037b081161df3a1f758c4a21db83b1
    https://github.com/scummvm/scummvm/commit/e394071b98037b081161df3a1f758c4a21db83b1
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-20T13:06:22Z

Commit Message:
SAGA2: Remove Several Chunks of Dead Code

This also removes several of the Undefined Macro GCC warnings emitted
when -Wundef is passed.

Changed paths:
    engines/saga2/annoy.h
    engines/saga2/property.h


diff --git a/engines/saga2/annoy.h b/engines/saga2/annoy.h
index a86f46711ec..c2e15d1dd25 100644
--- a/engines/saga2/annoy.h
+++ b/engines/saga2/annoy.h
@@ -104,15 +104,6 @@ void audioEnvironmentSetWorld(int mapNum);
 void clearActiveFactions();
 void useActiveFactions();
 
-
-//-----------------------------------------------------------------------
-//	prototypes
-
-#if DEBUG
-int annoyingTestSound(int32);          // prototype for annoying test sound calls
-int annoyingTestMusic(int32);
-#endif
-
 }
 
 #endif  //ANNOY_H
diff --git a/engines/saga2/property.h b/engines/saga2/property.h
index 39fe94e6043..c4eaf5f1215 100644
--- a/engines/saga2/property.h
+++ b/engines/saga2/property.h
@@ -114,9 +114,8 @@ CompoundProperty< T >::CompoundProperty(
 
 	//  Allocate memory to copy the array.
 	propertyArray = (Property< T > **)malloc(arrayBytes);
-#if DEBUG
 	assert(propertyArray);
-#endif
+
 	//  Copy the array
 	memcpy(propertyArray, array, arrayBytes);
 	arraySize = size;