From ee9e6b94ae73701f1c8f416464def62d905f2f9d Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 17 Oct 2013 13:40:26 +0200 Subject: [PATCH] DRASCULA: Fix build --- engines/drascula/converse.cpp | 6 +++--- engines/drascula/drascula.cpp | 2 +- engines/drascula/graphics.cpp | 10 +++++----- engines/drascula/objects.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp index 2aa12e106bd6..b3749445ec0d 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) { - strlcpy(phrase3, _text[405], 128); + Common::strlcpy(phrase3, _text[405], 128); strcpy(sound3, "405.als"); answer3 = 31; } if (currentChapter == 6 && !strcmp(fileName, "op_12.cal") && flags[7] == 1) { - strlcpy(phrase3, _text[273], 128); + Common::strlcpy(phrase3, _text[273], 128); strcpy(sound3, "273.als"); answer3 = 14; } if (currentChapter == 6 && !strcmp(fileName, "op_12.cal") && flags[10] == 1) { - strlcpy(phrase3, _text[274], 128); + 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 369e28c9e1f4..d25b37d18dce 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -324,7 +324,7 @@ Common::Error DrasculaEngine::run() { memset(iconName, 0, sizeof(iconName)); for (i = 0; i < 6; i++) - strlcpy(iconName[i + 1], _textverbs[i], 13); + Common::strlcpy(iconName[i + 1], _textverbs[i], 13); assignPalette(defaultPalette); diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index a28ca8a1cb89..fe954279c343 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(textY - (4 * CHAR_HEIGHT), 0, 320); - strlcpy(msg, message, 200); + 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') - strlcat(tmpMessageLine, " ", 200); - strlcat(tmpMessageLine, curWord, 200); + 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(textX - strlen(messageLine) * CHAR_WIDTH / 2, 60, 255); print_abc(messageLine, x, y + curLine * CHAR_HEIGHT); - strlcpy(messageLine, curWord, 200); - strlcpy(tmpMessageLine, curWord, 200); + Common::strlcpy(messageLine, curWord, 200); + Common::strlcpy(tmpMessageLine, curWord, 200); curLine++; } diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp index acc4bbf7ac54..519e9194331c 100644 --- a/engines/drascula/objects.cpp +++ b/engines/drascula/objects.cpp @@ -266,7 +266,7 @@ void DrasculaEngine::updateVisible() { if (_roomNumber == 22 && flags[27] == 1) visible[3] = 0; if (_roomNumber == 26 && flags[21] == 0) { - strlcpy(objName[2], _textmisc[0], 20); + Common::strlcpy(objName[2], _textmisc[0], 20); } if (_roomNumber == 26 && flags[18] == 1) visible[2] = 0;