From: <fu...@us...> - 2009-06-20 18:59:49
|
Revision: 6547 http://gemrb.svn.sourceforge.net/gemrb/?rev=6547&view=rev Author: fuzzie Date: 2009-06-20 18:59:43 +0000 (Sat, 20 Jun 2009) Log Message: ----------- don't trigger ST_PROXIMITY traps based on operating distance, it leads to disaster Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-06-20 18:36:53 UTC (rev 6546) +++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-06-20 18:59:43 UTC (rev 6547) @@ -1844,7 +1844,10 @@ goto check; } } - if (Distance(Pos, actor->Pos)<MAX_OPERATING_DISTANCE) { + // why is this here? actors which aren't *in* a trap get IF_INTRAP + // repeatedly unset, so this triggers again and again and again. + // i disabled it for ST_PROXIMITY for now.. + if (Type != ST_PROXIMITY && Distance(Pos, actor->Pos)<MAX_OPERATING_DISTANCE) { goto check; } if (Flags&TRAP_USEPOINT) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |