--- deliantra/server/include/object.h 2009/11/05 15:57:16 1.214 +++ deliantra/server/include/object.h 2009/11/07 18:30:05 1.215 @@ -533,7 +533,7 @@ && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } - MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } + MTH bool has_active_speed () const { return fabs (speed) >= MIN_ACTIVE_SPEED; } // temporary: wether the object can be saved in a map file // contr => is a player @@ -762,7 +762,7 @@ // move this object to the top of its env's inventory to speed up // searches for it. -static object * +static inline object * splay (object *ob) { if (ob->above && ob->env) @@ -904,8 +904,6 @@ #define INS_ON_TOP 0x0008 #define INS_BELOW_ORIGINATOR 0x0010 -#define ARCH_DEPLETION "depletion" - //-GPL #endif