From: <fu...@us...> - 2009-05-15 20:18:15
|
Revision: 5978 http://gemrb.svn.sourceforge.net/gemrb/?rev=5978&view=rev Author: fuzzie Date: 2009-05-15 20:17:56 +0000 (Fri, 15 May 2009) Log Message: ----------- allow (dysfunctional) disarming of proximity traps Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/GameControl.cpp Modified: gemrb/trunk/gemrb/plugins/Core/GameControl.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2009-05-15 19:21:14 UTC (rev 5977) +++ gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2009-05-15 20:17:56 UTC (rev 5978) @@ -1440,6 +1440,12 @@ //don't bother with this region further return true; } + if ((target_mode == TARGET_MODE_PICK)) { + TryToDisarm(actor, trap); + target_mode = TARGET_MODE_NONE; + return true; + } + switch(trap->Type) { case ST_TRAVEL: trap->Flags|=TRAP_RESET; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |