libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-20 19:21:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Replace use of strdup with Common::String

Browse Source
This commit is contained in:
Colin Snover 2017-12-05 11:15:00 -06:00 committed by Eugene Sandulenko
parent f7e05a6ace
commit 072a52a9d2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/scumm/smush/smush_font.cpp
View File

@ -22,6 +22,7 @@
#include "common/file.h"
#include "common/str.h"
#include "scumm/scumm.h"
#include "scumm/util.h"
@ -226,11 +227,11 @@ void SmushFont::drawStringWrap(const char *str, byte *buffer, int dst_width, int
debugC(DEBUG_SMUSH, "SmushFont::drawStringWrap(%s, %d, %d, %d, %d, %d)", str, x, y, left, right, center);
const int width = right - left;
char *s = strdup(str);
Common::String s(str);
char *words[MAX_WORDS];
int word_count = 0;
char *tmp = s;
Common::String::iterator tmp = s.begin();
while (tmp) {
assert(word_count < MAX_WORDS);
words[word_count++] = tmp;
@ -293,8 +294,6 @@ void SmushFont::drawStringWrap(const char *str, byte *buffer, int dst_width, int
y += getStringHeight(substrings[i]);
}
}
free(s);
}
} // End of namespace Scumm