ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/attack.C
(Generate patch)

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.73 by root, Thu Jul 26 00:38:33 2007 UTC vs.
Revision 1.74 by root, Tue Jul 31 01:18:16 2007 UTC

613 if (hitter->owner != NULL) 613 if (hitter->owner != NULL)
614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
615 else 615 else
616 { 616 {
617 sprintf (buf, "%s%s you.", &hitter->name, buf2); 617 sprintf (buf, "%s%s you.", &hitter->name, buf2);
618
618 if (dam != 0) 619 if (dam != 0)
619 { 620 {
620 if (dam < 10) 621 if (dam < 10)
621 op->contr->play_sound (sound_find ("player_is_hit1")); 622 op->contr->play_sound (sound_find ("player_is_hit1"));
622 else if (dam < 20) 623 else if (dam < 20)
630 } /* end of player hitting player */ 631 } /* end of player hitting player */
631 632
632 if (hitter->type == PLAYER) 633 if (hitter->type == PLAYER)
633 { 634 {
634 sprintf (buf, "You %s.", buf1); 635 sprintf (buf, "You %s.", buf1);
636
635 if (dam != 0) 637 if (dam != 0)
636 { 638 {
637 if (dam < 10) 639 if (dam < 10)
638 hitter->contr->play_sound (sound_find ("player_hits1")); 640 op->play_sound (sound_find ("player_hits1"));
639 else if (dam < 20) 641 else if (dam < 20)
640 hitter->contr->play_sound (sound_find ("player_hits2")); 642 op->play_sound (sound_find ("player_hits2"));
641 else 643 else
642 hitter->contr->play_sound (sound_find ("player_hits3")); 644 op->play_sound (sound_find ("player_hits3"));
643 } 645 }
644 646
645 new_draw_info (NDI_BLACK, 0, hitter, buf); 647 new_draw_info (NDI_BLACK, 0, hitter, buf);
646 } 648 }
647 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 649 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines