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.113 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.114 by root, Thu May 3 09:26:45 2007 UTC

331 || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR)) 331 || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
332 && !flag [FLAG_IS_A_TEMPLATE]; } 332 && !flag [FLAG_IS_A_TEMPLATE]; }
333 MTH bool is_arrow () const { return type == ARROW 333 MTH bool is_arrow () const { return type == ARROW
334 || (type == SPELL_EFFECT 334 || (type == SPELL_EFFECT
335 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 335 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
336 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
336 337
337 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 338 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
338 339
339 // temporary: wether the object can be saved in a map file 340 // temporary: wether the object can be saved in a map file
340 // contr => is a player 341 // contr => is a player

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines