| … | |
… | |
| 531 | || (pl->type == PLAYER && !pl->contr->party) |
531 | || (pl->type == PLAYER && !pl->contr->party) |
| 532 | || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party)) |
532 | || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party)) |
| 533 | exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */ |
533 | exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */ |
| 534 | |
534 | |
| 535 | return exp; /* note that calc_skill_exp() is already called by skill_attack() */ |
535 | return exp; /* note that calc_skill_exp() is already called by skill_attack() */ |
| 536 | } |
|
|
| 537 | |
|
|
| 538 | /* If the space has fly on set (no matter what the space is), |
|
|
| 539 | * we should get the effects - after all, the player is |
|
|
| 540 | * effectively flying. |
|
|
| 541 | */ |
|
|
| 542 | if (tmp->move_on & MOVE_FLY_LOW) |
|
|
| 543 | { |
|
|
| 544 | pl->x = x; |
|
|
| 545 | pl->y = y; |
|
|
| 546 | pl->map = m; |
|
|
| 547 | stop_jump (pl, i, spaces); |
|
|
| 548 | |
|
|
| 549 | return calc_skill_exp (pl, NULL, skill); |
|
|
| 550 | } |
536 | } |
| 551 | } |
537 | } |
| 552 | |
538 | |
| 553 | if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) |
539 | if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) |
| 554 | { |
540 | { |
