diff options
author | Einar Johan Trøan Sømåen | 2012-07-22 22:55:54 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-22 22:55:54 +0200 |
commit | f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838 (patch) | |
tree | 11fc0f9994c0e938027f767dc5e054bd42c921fd /engines/wintermute/ui/ui_text.cpp | |
parent | 30ada3c13f63ef35ccdd21ca76fb45aa9fb1dc3c (diff) | |
download | scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.tar.gz scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.tar.bz2 scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.zip |
WINTERMUTE: Wrap away base_script_holder's _filename field in getters/setters, avoiding direct writes.
Diffstat (limited to 'engines/wintermute/ui/ui_text.cpp')
-rw-r--r-- | engines/wintermute/ui/ui_text.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index fdf7f6287f..62ef968552 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -104,8 +104,7 @@ bool UIText::loadFile(const char *filename) { bool ret;
- _filename = new char [strlen(filename) + 1];
- strcpy(_filename, filename);
+ setFilename(filename);
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing STATIC file '%s'", filename);
@@ -302,17 +301,17 @@ bool UIText::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "\n");
- if (_back && _back->_filename)
- buffer->putTextIndent(indent + 2, "BACK=\"%s\"\n", _back->_filename);
+ if (_back && _back->getFilename())
+ buffer->putTextIndent(indent + 2, "BACK=\"%s\"\n", _back->getFilename());
- if (_image && _image->_filename)
- buffer->putTextIndent(indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
+ if (_image && _image->getFilename())
+ buffer->putTextIndent(indent + 2, "IMAGE=\"%s\"\n", _image->getFilename());
- if (_font && _font->_filename)
- buffer->putTextIndent(indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ if (_font && _font->getFilename())
+ buffer->putTextIndent(indent + 2, "FONT=\"%s\"\n", _font->getFilename());
- if (_cursor && _cursor->_filename)
- buffer->putTextIndent(indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ if (_cursor && _cursor->getFilename())
+ buffer->putTextIndent(indent + 2, "CURSOR=\"%s\"\n", _cursor->getFilename());
if (_text)
buffer->putTextIndent(indent + 2, "TEXT=\"%s\"\n", _text);
|