From: <ma...@us...> - 2013-07-28 22:59:35
|
Revision: 7397 http://sourceforge.net/p/exult/code/7397 Author: marzojr Date: 2013-07-28 22:59:32 +0000 (Sun, 28 Jul 2013) Log Message: ----------- * schedule.cc: Fixed bug #1847 "SI: Ghosts in cave talk as Chaos Hierophant" using Dominus' workaround. Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/schedule.cc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2013-07-28 22:35:18 UTC (rev 7396) +++ exult/trunk/ChangeLog 2013-07-28 22:59:32 UTC (rev 7397) @@ -8,6 +8,8 @@ * usecode/ucxt/src/ucfunc.cc: Output local statics with an 'l' prefix. * usecode/compiler/ucparse.yy: Allow implicit pushing of 'item' for original usecode function calls. + * schedule.cc: Fixed bug #1847 "SI: Ghosts in cave talk as Chaos Hierophant" + using Dominus' workaround. 2013-05-15 Dominik Reichardt <do...@us...> * keyactions.cc: different messages for toggling fullscreen mode Modified: exult/trunk/schedule.cc =================================================================== --- exult/trunk/schedule.cc 2013-07-28 22:35:18 UTC (rev 7396) +++ exult/trunk/schedule.cc 2013-07-28 22:59:32 UTC (rev 7397) @@ -1519,8 +1519,11 @@ // Pure guess. Since only some schedules seem to call proximity // usecode, I guess I should put it in here. // Seems rare for pure loiter, quite frequent for tend shop. - if ((npc->get_schedule_type() == Schedule::loiter && try_proximity_usecode(12)) || - (npc->get_schedule_type() == Schedule::tend_shop && try_proximity_usecode(8))) + if ((npc->get_schedule_type() == Schedule::loiter + && !(GAME_SI && npc->get_shapenum() == 0x355) + && try_proximity_usecode(12)) + || (npc->get_schedule_type() == Schedule::tend_shop + && try_proximity_usecode(8))) return; int newx = center.tx - dist + rand() % (2 * dist); int newy = center.ty - dist + rand() % (2 * dist); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |