5 files changed, 67 insertions, 13 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 1145c8c3ff..ee981c36da 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -1645,10 +1645,10 @@ void DrasculaEngine::animation_9_6() {
 
 	int v_cd;
 
-	animate("fin.bin", 14);
+	(void)animate("fin.bin", 14);
 	playMusic(13);
 	flags[5] = 1;
-	animate("drf.bin", 16);
+	(void)animate("drf.bin", 16);
 	fadeToBlack(0);
 	clearRoom();
 	curX = -1;
diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp
index 95a5f7d87f..b3749445ec 100644
--- a/engines/drascula/converse.cpp
+++ b/engines/drascula/converse.cpp
@@ -168,19 +168,19 @@ void DrasculaEngine::converse(int index) {
 	// delete stream;
 
 	if (currentChapter == 2 && !strcmp(fileName, "op_5.cal") && flags[38] == 1 && flags[33] == 1) {
-		strcpy(phrase3, _text[405]);
+		Common::strlcpy(phrase3, _text[405], 128);
 		strcpy(sound3, "405.als");
 		answer3 = 31;
 	}
 
 	if (currentChapter == 6 && !strcmp(fileName, "op_12.cal") && flags[7] == 1) {
-		strcpy(phrase3, _text[273]);
+		Common::strlcpy(phrase3, _text[273], 128);
 		strcpy(sound3, "273.als");
 		answer3 = 14;
 	}
 
 	if (currentChapter == 6 && !strcmp(fileName, "op_12.cal") && flags[10] == 1) {
-		strcpy(phrase3, _text[274]);
+		Common::strlcpy(phrase3, _text[274], 128);
 		strcpy(sound3, "274.als");
 		answer3 = 15;
 	}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index cde00baa32..9699dda021 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -89,6 +89,59 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	_talkSequences = 0;
 	_currentSaveSlot = 0;
 
+	bjX = 0;
+	bjY = 0;
+	trackBJ = 0;
+    framesWithoutAction = 0;
+	term_int = 0;
+	currentChapter = 0;
+	_loadedDifferentChapter = 0;
+	musicStopped = 0;
+	FrameSSN = 0;
+	globalSpeed = 0;
+	LastFrame = 0;
+	flag_tv = 0;
+	_charMapSize = 0;
+	_itemLocationsSize = 0;
+	_polXSize = 0;
+	_verbBarXSize = 0;
+	_x1dMenuSize = 0;
+	_frameXSize = 0;
+	_candleXSize = 0;
+	_pianistXSize = 0;
+	_drunkXSize = 0;
+	_roomPreUpdatesSize = 0;
+	_roomUpdatesSize = 0;
+	_roomActionsSize = 0;
+	_talkSequencesSize = 0;
+	_numLangs = 0;
+	feetHeight = 0;
+	floorX1 = 0;
+	floorY1 = 0;
+	floorX2 = 0;
+	floorY2 = 0;
+	lowerLimit = 0;
+	upperLimit = 0;
+	trackFinal = 0;
+	walkToObject = 0;
+	objExit = 0;
+	_startTime = 0;
+	hasAnswer = 0;
+	savedTime = 0;
+	breakOut = 0;
+	vonBraunX = 0;
+	trackVonBraun = 0;
+	vonBraunHasMoved = 0;
+	newHeight = 0;
+	newWidth = 0;
+	color_solo = 0;
+	igorX = 0;
+	igorY = 0;
+	trackIgor = 0;
+	drasculaX = 0;
+	drasculaY = 0;
+	trackDrascula = 0;
+
 	_color = 0;
 	blinking = 0;
 	_mouseX = 0;
@@ -297,7 +350,7 @@ Common::Error DrasculaEngine::run() {
 		memset(iconName, 0, sizeof(iconName));
 
 		for (i = 0; i < 6; i++)
-			strcpy(iconName[i + 1], _textverbs[i]);
+			Common::strlcpy(iconName[i + 1], _textverbs[i], 13);
 
 		assignPalette(defaultPalette);
 
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index b28de669b6..fe954279c3 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -336,7 +336,7 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 	// original starts printing 4 lines above textY
 	int y = CLIP<int>(textY - (4 * CHAR_HEIGHT), 0, 320);
 
-	strcpy(msg, message);
+	Common::strlcpy(msg, message, 200);
 
 	// If the message fits on screen as-is, just print it here
 	if (textFitsCentered(msg, textX)) {
@@ -363,8 +363,8 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 	while (curWord != NULL) {
 		// Check if the word and the current line fit on screen
 		if (tmpMessageLine[0] != '\0')
-			strcat(tmpMessageLine, " ");
-		strcat(tmpMessageLine, curWord);
+			Common::strlcat(tmpMessageLine, " ", 200);
+		Common::strlcat(tmpMessageLine, curWord, 200);
 		if (textFitsCentered(tmpMessageLine, textX)) {
 			// Line fits, so add the word to the current message line
 			strcpy(messageLine, tmpMessageLine);
@@ -374,8 +374,8 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 			// If it goes off screen, print_abc will adjust it
 			x = CLIP<int>(textX - strlen(messageLine) * CHAR_WIDTH / 2, 60, 255);
 			print_abc(messageLine, x, y + curLine * CHAR_HEIGHT);
-			strcpy(messageLine, curWord);
-			strcpy(tmpMessageLine, curWord);
+			Common::strlcpy(messageLine, curWord, 200);
+			Common::strlcpy(tmpMessageLine, curWord, 200);
 			curLine++;
 		}
 
diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp
index 35dfd3162a..519e919433 100644
--- a/engines/drascula/objects.cpp
+++ b/engines/drascula/objects.cpp
@@ -265,8 +265,9 @@ void DrasculaEngine::updateVisible() {
 		}
 		if (_roomNumber == 22 && flags[27] == 1)
 			visible[3] = 0;
-		if (_roomNumber == 26 && flags[21] == 0)
-			strcpy(objName[2], _textmisc[0]);
+		if (_roomNumber == 26 && flags[21] == 0) {
+			Common::strlcpy(objName[2], _textmisc[0], 20);
+		}
 		if (_roomNumber == 26 && flags[18] == 1)
 			visible[2] = 0;
 		if (_roomNumber == 26 && flags[12] == 1)