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

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.100 by root, Sun Nov 16 03:52:12 2008 UTC vs.
Revision 1.107 by root, Mon Oct 12 04:02:17 2009 UTC

… …
83 83
84#define CHECK_ERROR \ 84#define CHECK_ERROR \
85 if (SvTRUE (ERRSV)) \ 85 if (SvTRUE (ERRSV)) \
86 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV)); 86 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
87 87
88inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
89inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
90
88#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) 91#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
89#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc 92#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
90#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) 93#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
91#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; 94#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
92#define CALL_END CHECK_ERROR; FREETMPS; LEAVE 95#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
93 96
94////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 97//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
95 98
96void cfperl_init (); 99void cfperl_init ();
97void cfperl_main (); 100void cfperl_main ();
… …
99void cfperl_emergency_save (); 102void cfperl_emergency_save ();
100void cfperl_cleanup (int make_core); 103void cfperl_cleanup (int make_core);
101void cfperl_make_book (object *book, int level); 104void cfperl_make_book (object *book, int level);
102void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); 105void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
103int cfperl_can_merge (object *ob1, object *ob2); 106int cfperl_can_merge (object *ob1, object *ob2);
107void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
108
109bool is_match_expr (const char *expr);
110/* applies the match expression and returns true if it matches */
111bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
104 112
105////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 113//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
106 114
107#if IVSIZE >= 8 115#if IVSIZE >= 8
108 typedef IV val64; 116 typedef IV val64;
… …
288 ~object_freezer (); 296 ~object_freezer ();
289 297
290 void put (attachable *ext); 298 void put (attachable *ext);
291 299
292 // used only for user-defined key-value pairs 300 // used only for user-defined key-value pairs
293 void put (const shstr &k, const shstr &v) 301 void put (shstr_tmp k, shstr_tmp v)
294 { 302 {
295 add (k); 303 add (k);
296 304
297 if (expect_true (v)) 305 if (expect_true (v))
298 add (' '), add (v); 306 add (' '), add (v);
… …
322 void put (keyword k, const char *v = 0) 330 void put (keyword k, const char *v = 0)
323 { 331 {
324 put_kw_string (k, v); 332 put_kw_string (k, v);
325 } 333 }
326 334
327 void put (keyword k, const shstr &v) 335 void put (keyword k, shstr_tmp v)
328 { 336 {
329 put_kw_string (k, v); 337 put_kw_string (k, v);
330 } 338 }
331 339
332 void put (keyword k, double v) 340 void put (keyword k, double v)
… …
366 void put (keyword k, signed long v) { put_(k, (sint64)v); } 374 void put (keyword k, signed long v) { put_(k, (sint64)v); }
367 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 375 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
368 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 376 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
369 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 377 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
370 378
371 void put (keyword kbeg, keyword kend, const shstr &v) 379 void put (keyword kbeg, keyword kend, shstr_tmp v)
372 { 380 {
373 force (MAX_KEYWORD_LEN + 1); 381 force (MAX_KEYWORD_LEN + 1);
374 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 382 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
375 383
376 if (expect_true (v)) 384 if (expect_true (v))

Diff Legend

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