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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.104 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.105 by root, Fri May 18 15:05:09 2007 UTC

282 /* Then check if any players should use weapon-speed instead of speed */ 282 /* Then check if any players should use weapon-speed instead of speed */
283 for_all_players (pl) 283 for_all_players (pl)
284 { 284 {
285 if (pl->has_hit) 285 if (pl->has_hit)
286 { 286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ()); 287 pl->ob->speed_left = min (pl->weapon_sp, pl->ob->speed_left + pl->weapon_sp);
288 288
289 if (pl->ob->speed_left > 0.f) 289 if (pl->ob->speed_left > 0.f)
290 pl->has_hit = 0; 290 pl->has_hit = 0;
291 } 291 }
292 else 292 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines