[Gemrb-commits] SF.net SVN: gemrb:[6267] gemrb/trunk/gemrb/plugins/Core

[<fu...@us...>]

Revision: 6267
          http://gemrb.svn.sourceforge.net/gemrb/?rev=6267&view=rev
Author:   fuzzie
Date:     2009-06-02 23:49:04 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
add Door::TryUnlockDoor

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp
    gemrb/trunk/gemrb/plugins/Core/ActorBlock.h

Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp	2009-06-02 20:50:19 UTC (rev 6266)
+++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp	2009-06-02 23:49:04 UTC (rev 6267)
@@ -1488,6 +1488,51 @@
 	area->ActivateWallgroups(closed_wg_index, closed_wg_count, !(Flags&DOOR_OPEN));
 }
 
+bool Door::TryUnlockDoor(Actor *actor) {
+	if (!(Flags&DOOR_LOCKED)) return true;
+
+	// not sure what we should do without an actor (see OpenDoor/CloseDoor actions)
+	if (!actor) return false;
+
+	const char *Key = GetKey();
+	Actor *haskey = NULL;
+
+	if (Key && actor->InParty) {
+		Game *game = core->GetGame();
+		//allow opening/closing of a door when the key is on any partymember
+		for (int idx = 0; idx < game->GetPartySize(false); idx++) {
+			Actor *pc = game->FindPC(idx + 1);
+			if (!pc) continue;
+
+			if (pc->inventory.HasItem(Key,0) ) {
+				haskey = pc;
+				break;
+			}
+		}
+	} else if (Key) {
+		//actor is not in party, check only actor
+		if (actor->inventory.HasItem(Key,0) ) {
+			haskey = actor;
+		}
+	}
+
+	if (!haskey) {
+		return false;
+	}
+
+	// remove the key (but not in PS:T!)
+	if (!core->HasFeature(GF_REVERSE_DOOR) && Flags&DOOR_KEY) {
+		CREItem *item = NULL;
+		haskey->inventory.RemoveItem(Key,0,&item);
+		//the item should always be existing!!!
+		if (item) {
+			delete item;
+		}
+	}
+
+	return true;
+}
+
 void Door::SetPolygon(bool Open, Gem_Polygon* poly)
 {
 	if (Open) {

Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/ActorBlock.h	2009-06-02 20:50:19 UTC (rev 6266)
+++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.h	2009-06-02 23:49:04 UTC (rev 6267)
@@ -483,6 +483,7 @@
 	int IsOpen() const;
 	void TryPickLock(Actor *actor);
 	void TryBashLock(Actor* actor) ;
+	bool TryUnlockDoor(Actor *actor);
 	void DebugDump();
 	int TrapResets() { return Flags & DOOR_RESET; }
 };


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