| version 1.11 | | version 1.12 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_button_c = | | * static char *rcsid_button_c = |
| * "$Id: button.c,v 1.11 2001/03/09 00:42:58 avogl Exp $"; | | * "$Id: button.c,v 1.12 2001/03/20 05:46:18 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| if(QUERY_FLAG(tmp, FLAG_UNAGGRESSIVE)) | | if(QUERY_FLAG(tmp, FLAG_UNAGGRESSIVE)) |
| CLEAR_FLAG(tmp, FLAG_UNAGGRESSIVE); | | CLEAR_FLAG(tmp, FLAG_UNAGGRESSIVE); |
| if(QUERY_FLAG(tmp, FLAG_FRIENDLY)) { | | if(QUERY_FLAG(tmp, FLAG_FRIENDLY)) { |
| tmp->owner = 0; | | |
| CLEAR_FLAG(tmp, FLAG_FRIENDLY); | | CLEAR_FLAG(tmp, FLAG_FRIENDLY); |
| remove_friendly_object(tmp); | | remove_friendly_object(tmp); |
| tmp->move_type = 0; | | tmp->move_type = 0; |
| | | /* lots of checks here, but want to make sure we don't |
| | | * dereference a null value |
| | | */ |
| | | if (tmp->type == GOLEM && tmp->owner && tmp->owner->type==PLAYER && |
| | | tmp->owner->contr->golem==tmp) |
| | | tmp->owner->contr->golem=NULL; |
| | | tmp->owner = 0; |
| } | | } |
| break; | | break; |
| case 1: /* angry -- get neutral monsters mad */ | | case 1: /* angry -- get neutral monsters mad */ |