[Scummvm-cvs-logs] SF.net SVN: scummvm: [27119] scummvm/branches/branch-0-10-0/engines/saga

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Wed Jun 6 00:39:36 CEST 2007


Revision: 27119
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27119&view=rev
Author:   Kirben
Date:     2007-06-05 15:39:36 -0700 (Tue, 05 Jun 2007)

Log Message:
-----------
Avoid compiler warnings.

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/saga/script.cpp
    scummvm/branches/branch-0-10-0/engines/saga/sfuncs.cpp

Modified: scummvm/branches/branch-0-10-0/engines/saga/script.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/saga/script.cpp	2007-06-05 22:38:43 UTC (rev 27118)
+++ scummvm/branches/branch-0-10-0/engines/saga/script.cpp	2007-06-05 22:39:36 UTC (rev 27119)
@@ -464,7 +464,7 @@
 			}
 		}
 
-		if (objectType == NULL)
+		if (objectType == 0)
 			return;
 		else if (objectType == kGameObjectHitZone) {
 			scriptModuleNumber = _vm->_scene->getScriptModuleNumber();
@@ -619,7 +619,7 @@
 
 	hitZone = NULL;
 
-	if (objectTypeId(_pendingObject[0]) == NULL)
+	if (objectTypeId(_pendingObject[0]) == 0)
 		return;
 	else if (objectTypeId(_pendingObject[0]) == kGameObjectHitZone) {
 		 hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(_pendingObject[0]));

Modified: scummvm/branches/branch-0-10-0/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/saga/sfuncs.cpp	2007-06-05 22:38:43 UTC (rev 27118)
+++ scummvm/branches/branch-0-10-0/engines/saga/sfuncs.cpp	2007-06-05 22:39:36 UTC (rev 27119)
@@ -386,7 +386,7 @@
 			break;
 		case kGameObjectHitZone:
 		case kGameObjectStepZone:
-			if (objectTypeId(objectId) == NULL)
+			if (objectTypeId(objectId) == 0)
 				return;
 			else if (objectTypeId(objectId) == kGameObjectHitZone)
 				hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId));
@@ -739,7 +739,7 @@
 		return;		// Do nothing
 	}
 
-	if (objectTypeId(objectId) == NULL)
+	if (objectTypeId(objectId) == 0)
 		return;
 	else if (objectTypeId(objectId) == kGameObjectHitZone)
 		hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId));


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




More information about the Scummvm-git-logs mailing list