--- deliantra/server/include/cfperl.h 2008/09/08 11:27:25 1.99 +++ deliantra/server/include/cfperl.h 2008/11/20 12:18:07 1.101 @@ -89,7 +89,7 @@ #define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc #define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) #define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; -#define CALL_END CHECK_ERROR; FREETMPS; LEAVE +#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -185,14 +185,14 @@ { static MGVTBL vtbl; - static unordered_vector mortals; - MTH static void check_mortals (); - enum { F_DESTROYED = 0x01, F_DEBUG_TRACE = 0x02, }; - int ACC (RW, flags); + uint8 ACC (RW, flags); + + static unordered_vector mortals; + MTH static void check_mortals (); // object is delete'd after the refcount reaches 0 MTH int refcnt_cnt () const;