ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/button.C
(Generate patch)

Comparing deliantra/server/common/button.C (file contents):
Revision 1.30 by root, Sat Apr 28 17:51:57 2007 UTC vs.
Revision 1.31 by root, Mon Apr 30 04:25:29 2007 UTC

… …
741 * dereference a null value 741 * dereference a null value
742 */ 742 */
743 if (tmp->type == GOLEM 743 if (tmp->type == GOLEM
744 && tmp->owner 744 && tmp->owner
745 && tmp->owner->type == PLAYER 745 && tmp->owner->type == PLAYER
746 && tmp->owner->contr->ranges[range_golem] == tmp) 746 && tmp->owner->contr->golem == tmp)
747 tmp->owner->contr->ranges[range_golem] = 0; 747 tmp->owner->contr->golem = 0;
748 748
749 tmp->owner = 0; 749 tmp->owner = 0;
750 750
751 remove_friendly_object (tmp); 751 remove_friendly_object (tmp);
752 } 752 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines