ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.266 by root, Wed Nov 14 05:25:25 2012 UTC vs.
Revision 1.267 by root, Wed Nov 21 12:12:03 2012 UTC

481 // strangely enough, using ?: here causes code to inflate 481 // strangely enough, using ?: here causes code to inflate
482 return type == CONTAINER 482 return type == CONTAINER
483 && ((env && env->container_ () == this) 483 && ((env && env->container_ () == this)
484 || (!env && flag [FLAG_APPLIED])); 484 || (!env && flag [FLAG_APPLIED]));
485 } 485 }
486
487 MTH object *find_spell (shstr_cmp name) const;
486 488
487 MTH object *force_find (shstr_tmp name); 489 MTH object *force_find (shstr_tmp name);
488 MTH void force_set_timer (int duration); 490 MTH void force_set_timer (int duration);
489 MTH object *force_add (shstr_tmp name, int duration = 0); 491 MTH object *force_add (shstr_tmp name, int duration = 0);
490 492

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines