Cutaway code also handles some talking stuff... Updated this part too, to fix 'bug' #1034715

svn-id: r15996

1 files changed, 5 insertions, 1 deletions

diff --git a/queen/talk.cpp b/queen/talk.cpp
index 13fd1924d7..fe412eafde 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -792,7 +792,7 @@ void Talk::speakSegment(
 	segment[length] = '\0';
 	
 	char voiceFileName[MAX_STRING_SIZE];
-	snprintf(voiceFileName, sizeof(voiceFileName), "%s%1x", voiceFilePrefix, index + 1);
+	sprintf(voiceFileName, "%s%1x", voiceFilePrefix, index + 1);
 
 	// FIXME - it seems the french talkie version has a useless voice file ; 
 	// the c30e_102 file is very similar to c30e_101, so there is no need to 
@@ -1044,6 +1044,10 @@ void Talk::getString(const byte *ptr, uint16 &offset, char *str, int maxLength,
 			str[length] = '\0';
 		}
 		offset = (offset + length + (align - 1)) & ~(align - 1);
+	} else {
+		if (str) {
+			str[0] = '\0';
+		}
 	}
 }