[simspark-svn] SF.net SVN: simspark:[284] trunk/rcssserver3d

[<he...@us...>]

Revision: 284
          http://simspark.svn.sourceforge.net/simspark/?rev=284&view=rev
Author:   hedayat
Date:     2011-06-06 10:23:16 +0000 (Mon, 06 Jun 2011)

Log Message:
-----------
Fixed a small but important mistake I made in AnalyseTouchGroups

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2011-05-13 21:56:12 UTC (rev 283)
+++ trunk/rcssserver3d/ChangeLog	2011-06-06 10:23:16 UTC (rev 284)
@@ -1,3 +1,10 @@
+2011-06-06  Hedayat Vatankhah  <hed...@gm...>
+
+	* plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
+	 (SoccerRuleAspect::AnalyseTouchGroups):
+	- fixed a horrible mistake of mine which prevented from touch group rules
+	  to be applied at all 
+
 2011-05-14  Hedayat Vatankhah  <hed...@gm...>
 
 	* plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 

Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp	2011-05-13 21:56:12 UTC (rev 283)
+++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp	2011-06-06 10:23:16 UTC (rev 284)
@@ -277,10 +277,11 @@
     SoccerBase::TAgentStateList::iterator i = agent_states.begin();
     for (; i != agent_states.end(); ++i)
     {
-        boost::shared_ptr<TouchGroup> touchGroup = (*i)->GetOldTouchGroup();
+        boost::shared_ptr<TouchGroup> touchGroup = (*i)->GetTouchGroup();
 
         // Wasn't touching before, joined group making group too large
-        if (touchGroup->size() == 1 && touchGroup->size() > mMaxTouchGroupSize)
+        if ((*i)->GetOldTouchGroup()->size() == 1 &&
+                touchGroup->size() > mMaxTouchGroupSize)
         {
             // determine the team that has more players in the touch group
             int pl[3] = { 0 };


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