aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-06-09 23:59:11 +0200
committerJohannes Schickel2011-12-26 16:18:10 +0100
commit80ece6caaef652e4d0f618ab793c11b00fcf9441 (patch)
tree3cc93801de0d064bf2418655f875c530fec298d5 /engines/kyra/screen_eob.cpp
parentaa031bf98ef1b6da485122fabef1178f6101aded (diff)
downloadscummvm-rg350-80ece6caaef652e4d0f618ab793c11b00fcf9441.tar.gz
scummvm-rg350-80ece6caaef652e4d0f618ab793c11b00fcf9441.tar.bz2
scummvm-rg350-80ece6caaef652e4d0f618ab793c11b00fcf9441.zip
KYRA: (EOB) - replace snprintf/sprintf
Diffstat (limited to 'engines/kyra/screen_eob.cpp')
-rw-r--r--engines/kyra/screen_eob.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index eb5a52477b..f095b0409e 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -146,15 +146,13 @@ void Screen_Eob::loadEobBitmap(const char *file, int tempPage, int destPage) {
}
void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
- char tmp[13];
- sprintf(tmp, "%s.CPS", file);
-
+ Common::String tmp = Common::String::format("%s.CPS", file);
Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
bool loadAlternative = false;
if (s) {
// This additional check is necessary since some localized versions of EOB II seem to contain invalid (size zero) cps files
if (s->size())
- loadBitmap(tmp, tempPage, destPage, 0);
+ loadBitmap(tmp.c_str(), tempPage, destPage, 0);
else
loadAlternative = true;
@@ -164,7 +162,7 @@ void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringDa
}
if (loadAlternative) {
- tmp[0] = 'X';
+ tmp.setChar('X', 0);
s = _vm->resource()->createReadStream(tmp);
if (!s)
error("Screen_Eob::loadEobCpsFileToPage(): CPS file loading failed.");