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.103 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.104 by root, Thu May 17 14:14:55 2007 UTC

266 object *ob = pl->ob; 266 object *ob = pl->ob;
267 267
268 if (!ob || !pl->ns || !ob->active) 268 if (!ob || !pl->ns || !ob->active)
269 continue; 269 continue;
270 270
271 if (settings.casting_time)
272 {
273 if (ob->casting_time > 0.f)
274 {
275 --ob->casting_time;
276 ob->start_holding = 1;
277 }
278
279 /* set spell_state so we can update the range in stats field */
280 if (pl->ob->casting_time == 0.f && pl->ob->start_holding == 1)
281 pl->ob->start_holding = 0;
282 }
283
284 // process_events might steal us one speed slot, so adjust accordingly 271 // process_events might steal us one speed slot, so adjust accordingly
285 if (ob->speed_left > 0.f) 272 if (ob->speed_left > 0.f)
286 ++ob->speed_left; 273 ++ob->speed_left;
287 274
288 do_some_living (ob); 275 do_some_living (ob);
355 process_object (op); 342 process_object (op);
356 343
357 if (op->destroyed ()) 344 if (op->destroyed ())
358 continue; 345 continue;
359 } 346 }
360
361 if (settings.casting_time == TRUE && op->casting_time > 0.f)
362 --op->casting_time;
363 347
364 if (!op->contr) 348 if (!op->contr)
365 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
366 } 350 }
367 351

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines