From: <mal...@us...> - 2012-11-06 02:06:39
|
Revision: 7157 http://exult.svn.sourceforge.net/exult/?rev=7157&view=rev Author: malignantmanor Date: 2012-11-06 02:06:31 +0000 (Tue, 06 Nov 2012) Log Message: ----------- * Fix bug #3581649 by stopping Actor::ready_best_shield from trying to equip the lhand object (weapon). Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/actors.cc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2012-11-05 21:20:47 UTC (rev 7156) +++ exult/trunk/ChangeLog 2012-11-06 02:06:31 UTC (rev 7157) @@ -1,3 +1,7 @@ +2012-11-06 Malignant Manor <mal...@us...> + * Fix bug #3581649 by stopping Actor::ready_best_shield from trying to equip + the lhand object (weapon). + 2012-11-05 Willem Jan Palenstijn <wjp...@us...> * actors.cc: Prevent schedules from being executed for off-screen actors. Modified: exult/trunk/actors.cc =================================================================== --- exult/trunk/actors.cc 2012-11-05 21:20:47 UTC (rev 7156) +++ exult/trunk/actors.cc 2012-11-06 02:06:31 UTC (rev 7157) @@ -565,6 +565,8 @@ Armor_info *arinf = info.get_armor_info(); if (!arinf) continue; // Not a shield. + if (spots[lhand] == obj) // Don't take the weapon. + continue; int strength = arinf->get_base_strength(); if (strength > best_strength) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |