[Scummvm-git-logs] scummvm master -> 0eca2dcc221a826a3f4eeccc42a68c313fbc1d75

[neuromancer]

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:
0eca2dcc22 PRIVATE: re-enabled sound areas and fail if they are invalid


Commit: 0eca2dcc221a826a3f4eeccc42a68c313fbc1d75
    https://github.com/scummvm/scummvm/commit/0eca2dcc221a826a3f4eeccc42a68c313fbc1d75
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-03-07T12:52:23-03:00

Commit Message:
PRIVATE: re-enabled sound areas and fail if they are invalid

Changed paths:
    engines/private/funcs.cpp
    engines/private/symbol.cpp


diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index 54d34f5961..1aeb259eed 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -650,7 +650,8 @@ static void fSoundArea(ArgArray args) {
 		delete g_private->_phoneArea.surf;
 		g_private->_phoneArea = m;
 		g_private->_masks.push_front(m);
-	}
+	} else
+		error("Invalid type for SoundArea");
 }
 
 static void fSafeDigit(ArgArray args) {
diff --git a/engines/private/symbol.cpp b/engines/private/symbol.cpp
index fb9da2f4c6..bffea6447c 100644
--- a/engines/private/symbol.cpp
+++ b/engines/private/symbol.cpp
@@ -124,8 +124,8 @@ Symbol *SymbolMaps::lookupName(const char *n) {
 		return lookup(s, rects);
 
 	else {
-		debugC(1, kPrivateDebugCode, "WARNING: %s not defined", s.c_str());
-		return constant(STRING, 0, s.c_str());
+		debugC(1, kPrivateDebugCode, "WARNING: %s not defined", n);
+		return constant(STRING, 0, n);
 	}
 }