Revision: 7299
http://playerstage.svn.sourceforge.net/playerstage/?rev=7299&view=rev
Author: thjc
Date: 2009-01-25 02:59:56 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
applied 7298 from trunk:
fix for bug 2525924: VFH stall escape bug
Modified Paths:
--------------
code/player/branches/release-2-1-patches/server/drivers/position/vfh/vfh.cc
Modified:
code/player/branches/release-2-1-patches/server/drivers/position/vfh/vfh.cc
===================================================================
--- code/player/branches/release-2-1-patches/server/drivers/position/vfh/vfh.cc
2009-01-25 02:36:39 UTC (rev 7298)
+++ code/player/branches/release-2-1-patches/server/drivers/position/vfh/vfh.cc
2009-01-25 02:59:56 UTC (rev 7299)
@@ -381,21 +381,11 @@
if (this->sonar_addr.interf && this->SetupSonar() != 0)
return -1;
-
-/*
-<<<<<<< vfh.cc
- // FIXME
- // Allocate and intialize
- vfh_Algorithm->Init();
-
// initialize some navigation state
rotatedir = 1;
escapedir = 1;
escaping = 0;
-=======
->>>>>>> 1.82
-*/
// Start the driver thread.
if( ! synchronous_mode )
this->StartThread();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
