From f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 22 Jul 2012 22:55:54 +0200
Subject: WINTERMUTE: Wrap away base_script_holder's _filename field in
 getters/setters, avoiding direct writes.

---
 engines/wintermute/ad/ad_entity.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'engines/wintermute/ad/ad_entity.cpp')

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 06a551b252..df469b4321 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -93,8 +93,7 @@ bool AdEntity::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 file '%s'", filename);
 
@@ -914,8 +913,8 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 		buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
 	}
 
-	if (_subtype == ENTITY_NORMAL && _sprite && _sprite->_filename)
-		buffer->putTextIndent(indent + 2, "SPRITE=\"%s\"\n", _sprite->_filename);
+	if (_subtype == ENTITY_NORMAL && _sprite && _sprite->getFilename())
+		buffer->putTextIndent(indent + 2, "SPRITE=\"%s\"\n", _sprite->getFilename());
 
 	if (_subtype == ENTITY_SOUND && _sFX && _sFX->_soundFilename) {
 		buffer->putTextIndent(indent + 2, "SOUND=\"%s\"\n", _sFX->_soundFilename);
@@ -936,11 +935,11 @@ bool AdEntity::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 	if (_relativeScale != 0)
 		buffer->putTextIndent(indent + 2, "RELATIVE_SCALE = %d\n", (int)_relativeScale);
 
-	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());
 
 	AdTalkHolder::saveAsText(buffer, indent + 2);
 
-- 
cgit v1.2.3