[Scummvm-cvs-logs] SF.net SVN: scummvm: [25121] residual/trunk

[aquadran at users.sourceforge.net]

Revision: 25121
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25121&view=rev
Author:   aquadran
Date:     2007-01-19 06:21:29 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
free object resource at killTextObject() and adapt other places (part of patch #1495487) 

Modified Paths:
--------------
    residual/trunk/actor.cpp
    residual/trunk/engine.h
    residual/trunk/lua.cpp

Modified: residual/trunk/actor.cpp
===================================================================
--- residual/trunk/actor.cpp	2007-01-18 22:08:02 UTC (rev 25120)
+++ residual/trunk/actor.cpp	2007-01-19 14:21:29 UTC (rev 25121)
@@ -342,7 +342,6 @@
 
 	if (_sayLineText) {
 		g_engine->killTextObject(_sayLineText);
-		delete _sayLineText;
 		_sayLineText = NULL;
 	}
 
@@ -391,7 +390,6 @@
 
 	if (_sayLineText != NULL) {
 		g_engine->killTextObject(_sayLineText);
-		delete _sayLineText;
 		_sayLineText = NULL;
 	}
 }

Modified: residual/trunk/engine.h
===================================================================
--- residual/trunk/engine.h	2007-01-18 22:08:02 UTC (rev 25120)
+++ residual/trunk/engine.h	2007-01-19 14:21:29 UTC (rev 25121)
@@ -125,6 +125,7 @@
 	void registerTextObject(TextObject *a) { _textObjects.push_back(a); }
 	void killTextObject(TextObject *a) {
 		_textObjects.remove(a);
+		delete a;
 	}
 	void killTextObjects() {
 		while (!_textObjects.empty()) {

Modified: residual/trunk/lua.cpp
===================================================================
--- residual/trunk/lua.cpp	2007-01-18 22:08:02 UTC (rev 25120)
+++ residual/trunk/lua.cpp	2007-01-19 14:21:29 UTC (rev 25121)
@@ -2439,11 +2439,8 @@
 	if (lua_istable(tableObj))
 		getTextObjectParams(textObject, tableObj);
 
-	while (TextObjectExists((char *)text.c_str()) != NULL)
-		text += TEXT_NULL;
+	//printf("Blast: %s\n", (char *)text.c_str());
 
-	//printf("Make: %s\n", (char *)text.c_str());
-
 	textObject->setText((char *)text.c_str());
 	textObject->createBitmap();
 	textObject->draw();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.