diff options
| author | Einar Johan Trøan Sømåen | 2012-07-22 23:17:32 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-22 23:17:32 +0200 |
| commit | 8c378f794e0398e646eb3598c9e27c09b4d68dfc (patch) | |
| tree | 6b02b5ee105402e163f212adf96cc66b5b68c8d1 /engines/wintermute/ad/ad_layer.cpp | |
| parent | f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838 (diff) | |
| download | scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.tar.gz scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.tar.bz2 scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.zip | |
WINTERMUTE: Wrap _name in base_named_object in getters/setters.
Diffstat (limited to 'engines/wintermute/ad/ad_layer.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp index e59b5cde18..80fbc683ef 100644 --- a/engines/wintermute/ad/ad_layer.cpp +++ b/engines/wintermute/ad/ad_layer.cpp @@ -237,8 +237,8 @@ bool AdLayer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, if (val->_type == VAL_INT) node = val->getInt();
else { // get by name
for (int i = 0; i < _nodes.getSize(); i++) {
- if ((_nodes[i]->_type == OBJECT_ENTITY && scumm_stricmp(_nodes[i]->_entity->_name, val->getString()) == 0) ||
- (_nodes[i]->_type == OBJECT_REGION && scumm_stricmp(_nodes[i]->_region->_name, val->getString()) == 0)) {
+ if ((_nodes[i]->_type == OBJECT_ENTITY && scumm_stricmp(_nodes[i]->_entity->getName(), val->getString()) == 0) ||
+ (_nodes[i]->_type == OBJECT_REGION && scumm_stricmp(_nodes[i]->_region->getName(), val->getString()) == 0)) {
node = i;
break;
}
@@ -478,7 +478,7 @@ const char *AdLayer::scToString() { //////////////////////////////////////////////////////////////////////////
bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "LAYER {\n");
- buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", _name);
+ buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", getName());
buffer->putTextIndent(indent + 2, "CAPTION=\"%s\"\n", getCaption());
buffer->putTextIndent(indent + 2, "MAIN=%s\n", _main ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "WIDTH=%d\n", _width);
|