[ViewVC] Diff of: cvs/deliantra/server/include/object.h

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

…		…
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		486
487	MTH object *find_spell (shstr_cmp name) const;	487	MTH object *find_spell (const_utf8_string prefix) const;
488		488
489	MTH object *force_find (shstr_tmp name);	489	MTH object *force_find (shstr_tmp name);
490	MTH void force_set_timer (int duration);	490	MTH void force_set_timer (int duration);
491	MTH object *force_add (shstr_tmp name, int duration = 0);	491	MTH object *force_add (shstr_tmp name, int duration = 0);
492		492

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