| … | |
… | |
| 63 | { |
63 | { |
| 64 | objectlink *obj; |
64 | objectlink *obj; |
| 65 | |
65 | |
| 66 | CLEAR_FLAG (op, FLAG_FRIENDLY); |
66 | CLEAR_FLAG (op, FLAG_FRIENDLY); |
| 67 | |
67 | |
|
|
68 | if (op->type == GOLEM |
|
|
69 | && op->owner |
|
|
70 | && op->owner->contr |
|
|
71 | && op->owner->contr->golem == op) |
|
|
72 | op->owner->contr->golem = 0; |
|
|
73 | |
| 68 | if (!first_friendly_object) |
74 | if (!first_friendly_object) |
| 69 | { |
75 | { |
| 70 | 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); |
| 71 | return; |
77 | return; |
| 72 | } |
78 | } |
| … | |
… | |
| 86 | |
92 | |
| 87 | for (obj = first_friendly_object->next; obj; obj = obj->next) |
93 | for (obj = first_friendly_object->next; obj; obj = obj->next) |
| 88 | { |
94 | { |
| 89 | if (obj->ob == op) |
95 | if (obj->ob == op) |
| 90 | break; |
96 | break; |
|
|
97 | |
| 91 | prev = obj; |
98 | prev = obj; |
| 92 | } |
99 | } |
| 93 | |
100 | |
| 94 | if (obj) |
101 | if (obj) |
| 95 | { |
102 | { |
