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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.133 by root, Sat May 12 22:04:20 2007 UTC vs.
Revision 1.134 by root, Sun May 13 08:43:12 2007 UTC

1632 if (arrow->slaying) 1632 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying); 1633 arrow->spellarg = strdup (arrow->slaying);
1634 1634
1635 if (player *pl = op->contr) 1635 if (player *pl = op->contr)
1636 { 1636 {
1637 {
1637 pl->has_hit = 1; 1638 pl->has_hit = 1;
1639 pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
1640 }
1638#if 0 1641#if 0
1639 float speed = pl->weapon_sp; 1642 float speed = pl->weapon_sp;
1640 1643
1641 /* penalize ROF for bestarrow */ 1644 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow) 1645 if (pl->bowtype == bow_bestarrow)
2168 */ 2171 */
2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2172 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2173 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2171 { 2174 {
2172 op->contr->has_hit = 1; 2175 op->contr->has_hit = 1;
2176 op->speed_left += op->contr->weapon_sp - op->speed;
2173 2177
2174 skill_attack (mon, op, 0, 0, 0); 2178 skill_attack (mon, op, 0, 0, 0);
2175 2179
2176 /* If attacking another player, that player gets automatic 2180 /* If attacking another player, that player gets automatic
2177 * hitback, and doesn't loose luck either. 2181 * hitback, and doesn't loose luck either.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines