From: <ja...@us...> - 2007-11-29 19:46:58
|
Revision: 11709 http://vegastrike.svn.sourceforge.net/vegastrike/?rev=11709&view=rev Author: jacks Date: 2007-11-29 11:46:55 -0800 (Thu, 29 Nov 2007) Log Message: ----------- Fixes for docking to ships (see bug reports 1807619 and 1816079) Modified Paths: -------------- trunk/vegastrike/src/cmd/ai/firekeyboard.cpp Modified: trunk/vegastrike/src/cmd/ai/firekeyboard.cpp =================================================================== --- trunk/vegastrike/src/cmd/ai/firekeyboard.cpp 2007-11-29 00:28:36 UTC (rev 11708) +++ trunk/vegastrike/src/cmd/ai/firekeyboard.cpp 2007-11-29 19:46:55 UTC (rev 11709) @@ -1480,9 +1480,16 @@ static bool ExecuteRequestClearenceKey(Unit * parent, Unit * endt) { bool tmp=endt->RequestClearance(parent); if (endt->getRelation(parent)>=0) { - if (endt->graphicOptions.InWarp) - endt->graphicOptions.WarpRamping=1; - endt->graphicOptions.InWarp=0; + if (endt->graphicOptions.InWarp){ + endt->graphicOptions.WarpRamping=1; + } + endt->graphicOptions.InWarp=0; + static float clearencetime=(XMLSupport::parse_float (vs_config->getVariable ("general","dockingtime","20"))); + endt->EnqueueAIFirst (new ExecuteFor (new Orders::MatchVelocity (Vector(0,0,0), + Vector(0,0,0), + true, + false, + true),clearencetime)); } return tmp; } |