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

Comparing deliantra/server/common/friend.C (file contents):
Revision 1.11 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.13 by root, Thu May 17 21:32:08 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
66 CLEAR_FLAG (op, FLAG_FRIENDLY); 66 CLEAR_FLAG (op, FLAG_FRIENDLY);
67 67
68 if (op->type == GOLEM 68 if (op->type == GOLEM
69 && op->owner 69 && op->owner
70 && op->owner->contr 70 && op->owner->contr
71 && op->owner->contr->ranges[range_golem] == op) 71 && op->owner->contr->golem == op)
72 {
73 op->owner->contr->ranges[range_golem] = 0; 72 op->owner->contr->golem = 0;
74 op->owner->contr->shoottype = range_none;
75 }
76 73
77 if (!first_friendly_object) 74 if (!first_friendly_object)
78 { 75 {
79 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); 76 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
80 return; 77 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines