[Gemrb-commits] gemrb: branch master updated. v0.6.2-980-gb6bb97e

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b6bb97ed84332c5c3a92c96f5414a8c16cb7f3a4 (commit)

Summary of changes:
 gemrb/core/GameScript/GameScript.cpp |   11 +++++------
 gemrb/core/GameScript/GameScript.h   |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)
      from  6d145af0532d8f35e2d0967ee648b10666874388 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b6bb97ed84332c5c3a92c96f5414a8c16cb7f3a4

commit b6bb97ed84332c5c3a92c96f5414a8c16cb7f3a4
Author: Tom Prince <tom...@ua...>
Date:   Sat Mar 19 09:57:33 2011 -0700

    GameScript: Rename ReadyToDie to isNull, to make its purpose clearer.
    
    This also change it to not suicide.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/GameScript/GameScript.cpp b/gemrb/core/GameScript/GameScript.cpp
index 56c7633..9c15f1b 100644
--- a/gemrb/core/GameScript/GameScript.cpp
+++ b/gemrb/core/GameScript/GameScript.cpp
@@ -1729,8 +1729,9 @@ static Object* DecodeObject(const char* line)
 		printf("%s\n", origline);
 	}
 	//let the object realize it has no future (in case of null objects)
-	if (oB->ReadyToDie()) {
-		oB = NULL;
+	if (oB->isNull()) {
+		oB->Release();
+		return NULL;
 	}
 	return oB;
 }
@@ -2320,8 +2321,8 @@ Action* GenerateActionDirect(char *String, Scriptable *object)
 	return action;
 }
 
-/** Self-destructing object if it is empty */
-bool Object::ReadyToDie()
+/** Return true if object is null */
+bool Object::isNull()
 {
 	if (objectName[0]!=0) {
 		return false;
@@ -2334,8 +2335,6 @@ bool Object::ReadyToDie()
 			return false;
 		}
 	}
-	//commit suicide
-	Release();
 	return true;
 }
 
diff --git a/gemrb/core/GameScript/GameScript.h b/gemrb/core/GameScript/GameScript.h
index f0925d3..874aa00 100644
--- a/gemrb/core/GameScript/GameScript.h
+++ b/gemrb/core/GameScript/GameScript.h
@@ -192,7 +192,7 @@ public:
 		canary = 0xdddddddd;
 		delete this;
 	}
-	bool ReadyToDie();
+	bool isNull();
 };
 
 class GEM_EXPORT Trigger {

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator