[Scummvm-cvs-logs] SF.net SVN: scummvm:[33384] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 33384
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33384&view=rev
Author:   peres001
Date:     2008-07-28 23:21:03 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
Enforcing use of nullZonePtr only for nulling out pointers, as it is useless for comparisons.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_ns.cpp
    scummvm/trunk/engines/parallaction/input.cpp
    scummvm/trunk/engines/parallaction/walk.cpp

Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-07-28 22:21:11 UTC (rev 33383)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-07-28 23:21:03 UTC (rev 33384)
@@ -487,7 +487,7 @@
 //
 
 void Parallaction::enterCommentMode(ZonePtr z) {
-	if (z == nullZonePtr) {
+	if (!z) {
 		return;
 	}
 

Modified: scummvm/trunk/engines/parallaction/input.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/input.cpp	2008-07-28 22:21:11 UTC (rev 33383)
+++ scummvm/trunk/engines/parallaction/input.cpp	2008-07-28 23:21:03 UTC (rev 33384)
@@ -187,7 +187,7 @@
 		return;
 	}
 
-	if (z == nullZonePtr) {
+	if (!z) {
 		return;
 	}
 

Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp	2008-07-28 22:21:11 UTC (rev 33383)
+++ scummvm/trunk/engines/parallaction/walk.cpp	2008-07-28 23:21:03 UTC (rev 33384)
@@ -400,13 +400,13 @@
 
 	// look for short circuit cases
 	ZonePtr z0 = _vm->hitZone(kZonePath, x, y);
-	if (z0 == nullZonePtr) {
+	if (!z0) {
 		_ch->_walkPath.push_back(dest);
 		debugC(3, kDebugWalk, "buildPath: corner case 0");
 		return;
 	}
 	ZonePtr z1 = _vm->hitZone(kZonePath, foot.x, foot.y);
-	if (z1 == nullZonePtr || z1 == z0) {
+	if (!z1 || z1 == z0) {
 		_ch->_walkPath.push_back(dest);
 		debugC(3, kDebugWalk, "buildPath: corner case 1");
 		return;
@@ -444,7 +444,7 @@
 	_ch->getFoot(foot);
 
 	ZonePtr z = _vm->hitZone(kZoneDoor, foot.x, foot.y);
-	if (z != nullZonePtr && (z->_flags & kFlagsClosed) == 0) {
+	if (z && ((z->_flags & kFlagsClosed) == 0)) {
 		_vm->_location._startPosition = z->u.door->_startPos; // foot pos
 		_vm->_location._startFrame = z->u.door->_startFrame;
 


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