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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.94 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.95 by root, Mon Oct 26 11:31:39 2009 UTC

… …
1230 { 1230 {
1231 /* remove an old force with a slaying field == op->name */ 1231 /* remove an old force with a slaying field == op->name */
1232 if (object *force = tmp->force_find (op->name)) 1232 if (object *force = tmp->force_find (op->name))
1233 force->destroy (); 1233 force->destroy ();
1234 1234
1235 if (!tmp->force_find (op->slaying)) 1235 if (op->slaying && !tmp->force_find (op->slaying))
1236 { 1236 {
1237 tmp->force_add (op->slaying, op->stats.food); 1237 tmp->force_add (op->slaying, op->stats.food);
1238 1238
1239 if (op->msg) 1239 if (op->msg)
1240 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1240 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines