From: <ave...@us...> - 2009-09-23 21:33:49
|
Revision: 7254 http://gemrb.svn.sourceforge.net/gemrb/?rev=7254&view=rev Author: avenger_teambg Date: 2009-09-23 21:33:37 +0000 (Wed, 23 Sep 2009) Log Message: ----------- removed blocking flag from EquipItem, switched equipunequip flag (hopefully fixed trolls in iwd) Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Actions.cpp gemrb/trunk/gemrb/plugins/Core/GameScript.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Actions.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-09-23 20:59:21 UTC (rev 7253) +++ gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-09-23 21:33:37 UTC (rev 7254) @@ -4171,16 +4171,14 @@ void GameScript::EquipItem(Scriptable *Sender, Action* parameters) { if (Sender->Type!=ST_ACTOR) { - Sender->ReleaseCurrentAction(); //why blocking??? return; } Actor *actor = (Actor *) Sender; int slot = actor->inventory.FindItem(parameters->string0Parameter, 0); if (slot<0) { - Sender->ReleaseCurrentAction(); //why blocking??? return; } - if (parameters->int0Parameter==0) { //unequip + if (parameters->int0Parameter) { //unequip //move item to inventory if possible if (actor->inventory.UnEquipItem(slot, true)) { CREItem *si = actor->inventory.RemoveItem(slot); @@ -4188,11 +4186,9 @@ } } else { //equip //equip item if possible - /// actor->inventory.EquipItem(slot); } actor->ReinitQuickSlots(); - Sender->ReleaseCurrentAction(); //why blocking??? } void GameScript::DropItem(Scriptable *Sender, Action* parameters) Modified: gemrb/trunk/gemrb/plugins/Core/GameScript.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2009-09-23 20:59:21 UTC (rev 7253) +++ gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2009-09-23 21:33:37 UTC (rev 7254) @@ -523,7 +523,7 @@ {"endcutscenemode", GameScript::EndCutSceneMode, 0}, {"endgame", GameScript::QuitGame, 0}, //ending in iwd2 {"enemy", GameScript::Enemy, 0}, - {"equipitem", GameScript::EquipItem, AF_BLOCKING}, //why blocking??? + {"equipitem", GameScript::EquipItem, 0}, {"equipmostdamagingmelee",GameScript::EquipMostDamagingMelee,0}, {"equipranged", GameScript::EquipRanged,0}, {"equipweapon", GameScript::EquipWeapon,0}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |