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_entity.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_entity.cpp')
-rw-r--r-- | engines/wintermute/ui/ui_entity.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp index acbcd2430f..a67ba6b29f 100644 --- a/engines/wintermute/ui/ui_entity.cpp +++ b/engines/wintermute/ui/ui_entity.cpp @@ -64,8 +64,7 @@ bool UIEntity::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 ENTITY container file '%s'", filename);
@@ -188,8 +187,8 @@ bool UIEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- if (_entity && _entity->_filename)
- buffer->putTextIndent(indent + 2, "ENTITY=\"%s\"\n", _entity->_filename);
+ if (_entity && _entity->getFilename())
+ buffer->putTextIndent(indent + 2, "ENTITY=\"%s\"\n", _entity->getFilename());
buffer->putTextIndent(indent + 2, "\n");
|