[Gemrb-commits] SF.net SVN: gemrb:[5981] gemrb/trunk/gemrb/plugins/Core/Actions.cpp

[<lyn...@us...>]

Revision: 5981
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5981&view=rev
Author:   lynxlupodian
Date:     2009-05-16 10:32:02 +0000 (Sat, 16 May 2009)

Log Message:
-----------
disallow suicide attempts by equipped weaponry

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/Actions.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/Actions.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actions.cpp	2009-05-15 22:31:40 UTC (rev 5980)
+++ gemrb/trunk/gemrb/plugins/Core/Actions.cpp	2009-05-16 10:32:02 UTC (rev 5981)
@@ -4524,7 +4524,7 @@
 	Scriptable* tar;
 	tar = GetActorFromObject( Sender, parameters->objects[1], GA_NO_DEAD );
 
-	if (!tar || (tar->Type != ST_ACTOR && tar->Type !=ST_DOOR && tar->Type !=ST_CONTAINER) ) {
+	if (!tar || (tar->Type != ST_ACTOR && tar->Type !=ST_DOOR && tar->Type !=ST_CONTAINER) || tar == Sender) {
 		Sender->ReleaseCurrentAction();
 		return;
 	}


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