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.102 by root, Sat May 12 21:56:34 2007 UTC vs.
Revision 1.103 by root, Sun May 13 15:13:57 2007 UTC

295 /* Then check if any players should use weapon-speed instead of speed */ 295 /* Then check if any players should use weapon-speed instead of speed */
296 for_all_players (pl) 296 for_all_players (pl)
297 { 297 {
298 if (pl->has_hit) 298 if (pl->has_hit)
299 { 299 {
300 pl->ob->speed_left = min (pl->weapon_sp, pl->ob->speed_left + pl->weapon_sp); 300 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
301 301
302 if (pl->ob->speed_left > 0.f) 302 if (pl->ob->speed_left > 0.f)
303 pl->has_hit = 0; 303 pl->has_hit = 0;
304 } 304 }
305 else 305 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines