| version 1.33 | | version 1.34 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_attack_c = | | * static char *rcsid_attack_c = |
| * "$Id: attack.c,v 1.33 2001/03/12 23:10:15 avogl Exp $"; | | * "$Id: attack.c,v 1.34 2001/04/17 05:26:25 mwedel Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| } | | } |
| if(QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) { | | if(QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) { |
| remove_friendly_object(op); | | remove_friendly_object(op); |
| if (get_owner (op) != NULL && op->owner->type == PLAYER) | | if (op->type == GOLEM && get_owner (op) != NULL && op->owner->type == PLAYER) |
| op->owner->contr->golem=NULL; | | op->owner->contr->golem=NULL; |
| | | #if 0 |
| else | | else |
| LOG (llevError, "BUG: hit_player(): Encountered golem " | | LOG (llevError, "BUG: hit_player(): Encountered golem " |
| "without owner.\n"); | | "without owner.\n"); |
| | | #endif |
| remove_ob(op); | | remove_ob(op); |
| free_object(op); | | free_object(op); |
| return maxdam; | | return maxdam; |