| … | |
… | |
| 523 | { |
523 | { |
| 524 | int mtype; |
524 | int mtype; |
| 525 | |
525 | |
| 526 | switch (hitter->current_weapon->weapontype) |
526 | switch (hitter->current_weapon->weapontype) |
| 527 | { |
527 | { |
| 528 | case WEAP_HIT: |
528 | case WEAP_HIT: mtype = ATM_BASIC; break; |
| 529 | mtype = ATM_BASIC; |
529 | case WEAP_SLASH: mtype = ATM_SLASH; break; |
| 530 | break; |
530 | case WEAP_PIERCE: mtype = ATM_PIERCE; break; |
| 531 | case WEAP_SLASH: |
531 | case WEAP_CLEAVE: mtype = ATM_CLEAVE; break; |
| 532 | mtype = ATM_SLASH; |
532 | case WEAP_SLICE: mtype = ATM_SLICE; break; |
| 533 | break; |
533 | case WEAP_STAB: mtype = ATM_STAB; break; |
| 534 | case WEAP_PIERCE: |
534 | case WEAP_WHIP: mtype = ATM_WHIP; break; |
| 535 | mtype = ATM_PIERCE; |
535 | case WEAP_CRUSH: mtype = ATM_CRUSH; break; |
| 536 | break; |
536 | case WEAP_BLUD: mtype = ATM_BLUD; break; |
| 537 | case WEAP_CLEAVE: |
537 | default: mtype = ATM_BASIC; break; |
| 538 | mtype = ATM_CLEAVE; |
|
|
| 539 | break; |
|
|
| 540 | case WEAP_SLICE: |
|
|
| 541 | mtype = ATM_SLICE; |
|
|
| 542 | break; |
|
|
| 543 | case WEAP_STAB: |
|
|
| 544 | mtype = ATM_STAB; |
|
|
| 545 | break; |
|
|
| 546 | case WEAP_WHIP: |
|
|
| 547 | mtype = ATM_WHIP; |
|
|
| 548 | break; |
|
|
| 549 | case WEAP_CRUSH: |
|
|
| 550 | mtype = ATM_CRUSH; |
|
|
| 551 | break; |
|
|
| 552 | case WEAP_BLUD: |
|
|
| 553 | mtype = ATM_BLUD; |
|
|
| 554 | break; |
|
|
| 555 | default: |
|
|
| 556 | mtype = ATM_BASIC; |
|
|
| 557 | break; |
|
|
| 558 | } |
538 | } |
| 559 | |
539 | |
| 560 | for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) |
540 | for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) |
| 561 | if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) |
541 | if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) |
| 562 | { |
542 | { |
