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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.214 by root, Tue Nov 10 05:11:06 2009 UTC vs.
Revision 1.215 by root, Sun Nov 29 09:41:28 2009 UTC

1353 trap->stats.maxsp = 2; 1353 trap->stats.maxsp = 2;
1354 1354
1355 /* Is this correct? From the docs, it doesn't look like it 1355 /* Is this correct? From the docs, it doesn't look like it
1356 * should be divided by trap->speed 1356 * should be divided by trap->speed
1357 */ 1357 */
1358 victim->speed_left = -fabs (trap->stats.maxsp * victim->speed / trap->speed); 1358 victim->speed_left = -trap->stats.maxsp * victim->speed / trap->speed;
1359 1359
1360 /* Just put in some sanity check. I think there is a bug in the 1360 /* Just put in some sanity check. I think there is a bug in the
1361 * above with some objects have zero speed, and thus the player 1361 * above with some objects have zero speed, and thus the player
1362 * getting permanently paralyzed. 1362 * getting permanently paralyzed.
1363 */ 1363 */
3959 /* bigger morsel of food = longer effect time */ 3959 /* bigger morsel of food = longer effect time */
3960 int duration = TIME2TICK (food->stats.food); 3960 int duration = TIME2TICK (food->stats.food);
3961 3961
3962 if (force = who->force_find (key)) 3962 if (force = who->force_find (key))
3963 { 3963 {
3964 if (duration > abs (force->speed_left / force->speed)) 3964 if (duration > fabs (force->speed_left / force->speed))
3965 { 3965 {
3966 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration)); 3966 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3967 force->force_set_timer (duration); 3967 force->force_set_timer (duration);
3968 } 3968 }
3969 else 3969 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines