| … | |
… | |
| 469 | tmp->set_owner (op); |
469 | tmp->set_owner (op); |
| 470 | if (op->type == PLAYER) |
470 | if (op->type == PLAYER) |
| 471 | { |
471 | { |
| 472 | tmp->stats.exp = 0; |
472 | tmp->stats.exp = 0; |
| 473 | add_friendly_object (tmp); |
473 | add_friendly_object (tmp); |
| 474 | SET_FLAG (tmp, FLAG_FRIENDLY); |
|
|
| 475 | if (is_golem) |
474 | if (is_golem) |
| 476 | CLEAR_FLAG (tmp, FLAG_MONSTER); |
475 | CLEAR_FLAG (tmp, FLAG_MONSTER); |
| 477 | } |
476 | } |
| 478 | else |
477 | else |
| 479 | { |
478 | { |
| … | |
… | |
| 484 | if (owner) |
483 | if (owner) |
| 485 | { /* For now, we transfer ownership */ |
484 | { /* For now, we transfer ownership */ |
| 486 | tmp->set_owner (owner); |
485 | tmp->set_owner (owner); |
| 487 | tmp->attack_movement = PETMOVE; |
486 | tmp->attack_movement = PETMOVE; |
| 488 | add_friendly_object (tmp); |
487 | add_friendly_object (tmp); |
| 489 | SET_FLAG (tmp, FLAG_FRIENDLY); |
|
|
| 490 | } |
488 | } |
| 491 | } |
489 | } |
| 492 | } |
490 | } |
| 493 | |
491 | |
| 494 | if (op->type != PLAYER || !is_golem) |
492 | if (op->type != PLAYER || !is_golem) |
| … | |
… | |
| 733 | if (owner) |
731 | if (owner) |
| 734 | { /* For now, we transfer ownership */ |
732 | { /* For now, we transfer ownership */ |
| 735 | tmp->set_owner (owner); |
733 | tmp->set_owner (owner); |
| 736 | tmp->attack_movement = PETMOVE; |
734 | tmp->attack_movement = PETMOVE; |
| 737 | add_friendly_object (tmp); |
735 | add_friendly_object (tmp); |
| 738 | SET_FLAG (tmp, FLAG_FRIENDLY); |
|
|
| 739 | } |
736 | } |
| 740 | } |
737 | } |
| 741 | |
738 | |
| 742 | SET_FLAG (tmp, FLAG_MONSTER); |
739 | SET_FLAG (tmp, FLAG_MONSTER); |
| 743 | } |
740 | } |
| … | |
… | |
| 1049 | if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY)) |
1046 | if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY)) |
| 1050 | { |
1047 | { |
| 1051 | /* If this is not set, we make it friendly */ |
1048 | /* If this is not set, we make it friendly */ |
| 1052 | if (!QUERY_FLAG (spell_ob, FLAG_MONSTER)) |
1049 | if (!QUERY_FLAG (spell_ob, FLAG_MONSTER)) |
| 1053 | { |
1050 | { |
| 1054 | SET_FLAG (tmp, FLAG_FRIENDLY); |
|
|
| 1055 | add_friendly_object (tmp); |
1051 | add_friendly_object (tmp); |
| 1056 | tmp->stats.exp = 0; |
1052 | tmp->stats.exp = 0; |
| 1057 | |
1053 | |
| 1058 | if (spell_ob->attack_movement) |
1054 | if (spell_ob->attack_movement) |
| 1059 | tmp->attack_movement = spell_ob->attack_movement; |
1055 | tmp->attack_movement = spell_ob->attack_movement; |
