| … | |
… | |
| 61 | void |
61 | void |
| 62 | remove_friendly_object (object *op) |
62 | remove_friendly_object (object *op) |
| 63 | { |
63 | { |
| 64 | objectlink *obj; |
64 | objectlink *obj; |
| 65 | |
65 | |
| 66 | CLEAR_FLAG (op, FLAG_FRIENDLY); |
66 | op->clr_flag (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->golem == op) |
71 | && op->owner->contr->golem == op) |
| … | |
… | |
| 117 | int count = 0; |
117 | int count = 0; |
| 118 | |
118 | |
| 119 | for (obj = first_friendly_object; obj; obj = next) |
119 | for (obj = first_friendly_object; obj; obj = next) |
| 120 | { |
120 | { |
| 121 | next = obj->next; |
121 | next = obj->next; |
| 122 | if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY)) |
122 | if (obj->ob->flag [FLAG_FREED] || !obj->ob->flag [FLAG_FRIENDLY]) |
| 123 | { |
123 | { |
| 124 | if (prev) |
124 | if (prev) |
| 125 | prev->next = obj->next; |
125 | prev->next = obj->next; |
| 126 | else |
126 | else |
| 127 | first_friendly_object = obj->next; |
127 | first_friendly_object = obj->next; |
