From: <ken...@us...> - 2009-05-14 21:36:01
|
Revision: 3688 http://planeshift.svn.sourceforge.net/planeshift/?rev=3688&view=rev Author: kennygraunke Date: 2009-05-14 21:35:52 +0000 (Thu, 14 May 2009) Log Message: ----------- Trivial cleanups Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-14 20:42:23 UTC (rev 3687) +++ trunk/src/server/gem.cpp 2009-05-14 21:35:52 UTC (rev 3688) @@ -745,15 +745,9 @@ bool gemObject::IsNear(gemObject *obj, float radius) { - float distance = proxlist->RangeTo(obj); - - if ( distance < radius) - return true; - else - return false; + return proxlist->RangeTo(obj) < radius; } - float gemObject::RangeTo(gemObject* obj, bool ignoreY, bool ignoreInstance) { return proxlist->RangeTo(obj, ignoreY, ignoreInstance); @@ -776,9 +770,8 @@ proxlist->Initialize(clientnum,this); // store these for fast access later - bool subscribed_self=false; // A client should always subscribe to itself - if (!subscribed_self && clientnum) + if (clientnum) { // CPrintf(CON_DEBUG, "Forcing a self-subscription for %s\n",GetName()); proxlist->StartMutualWatching(clientnum,this,0.0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |