--- deliantra/server/include/cfperl.h 2007/05/19 00:08:11 1.64 +++ deliantra/server/include/cfperl.h 2007/06/03 11:22:02 1.75 @@ -1,3 +1,27 @@ +/* + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to + */ + // // cfperl.h perl interface // @@ -66,6 +90,7 @@ void cfperl_main (); void cfperl_emergency_save (); void cfperl_cleanup (int make_core); +void cfperl_make_book (object *book, int level); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -111,14 +136,13 @@ #define ARG_REGION(o) DT_REGION, (void *)(static_cast (o)) // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension - -// all these return true when the normal event processing should be skipped (if any) -#define INVOKE_GLOBAL(event, ...) gbl_ev.invoke (EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_ATTACHABLE(event, obj, ...) (obj)->invoke (EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_OBJECT(event, obj, ...) (obj)->invoke (EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_CLIENT(event, obj, ...) (obj)->invoke (EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_PLAYER(event, obj, ...) (obj)->invoke (EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__, DT_END) -#define INVOKE_MAP(event, obj, ...) (obj)->invoke (EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__, DT_END) +#define INVOKE(obj,event, ...) (expect_false ((obj)->should_invoke (event)) ? (obj)->invoke (event, ## __VA_ARGS__, DT_END) : 0) +#define INVOKE_GLOBAL(event, ...) INVOKE (&gbl_ev, EVENT_ ## GLOBAL ## _ ## event, ## __VA_ARGS__) +#define INVOKE_ATTACHABLE(event, obj, ...) INVOKE (obj , EVENT_ ## ATTACHABLE ## _ ## event, ## __VA_ARGS__) +#define INVOKE_OBJECT(event, obj, ...) INVOKE (obj , EVENT_ ## OBJECT ## _ ## event, ## __VA_ARGS__) +#define INVOKE_CLIENT(event, obj, ...) INVOKE (obj , EVENT_ ## CLIENT ## _ ## event, ## __VA_ARGS__) +#define INVOKE_PLAYER(event, obj, ...) INVOKE (obj , EVENT_ ## PLAYER ## _ ## event, ## __VA_ARGS__) +#define INVOKE_MAP(event, obj, ...) INVOKE (obj , EVENT_ ## MAP ## _ ## event, ## __VA_ARGS__) //TODO should index into @result #define RESULT(idx,type) cfperl_result_ ## type (idx) @@ -152,7 +176,7 @@ MTH int refcnt_cnt () const; // check wether the object has died and destroy - MTH void refcnt_chk () { if (refcnt <= 0) do_check (); } + MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } // destroy the object unless it was already destroyed // this politely asks everybody interested the reduce @@ -191,18 +215,14 @@ attachable &operator =(const attachable &src); - bool vinvoke (event_type event, va_list &ap); - bool invoke (event_type event, ...) + // used to _quickly_ device wether to shortcut the evaluation + bool should_invoke (event_type event) { - if (ev_want_event [event] || cb) - { - va_list ap; - va_start (ap, event); - vinvoke (event, ap); - va_end (ap); - } + return ev_want_event [event] || cb; } + bool invoke (event_type event, ...); + MTH void instantiate (); void reattach (); @@ -238,21 +258,12 @@ { add (k); - if (v) + if (expect_true (v)) add (' '), add (v); add ('\n'); } - //TODO//temporary, used only for saving body locations - void put (const char *k, int v) - { - add (k); - add (' '); - add (sint32 (v)); - add ('\n'); - } - template void put_string (keyword k, const T &v) { @@ -263,7 +274,7 @@ memcpy (p, keyword_str [k], klen); p += klen; - if (v) + if (expect_true (v)) { *p++ = ' '; vlen--; memcpy (p, v, vlen); p += vlen; @@ -284,40 +295,29 @@ void put (keyword k, double v) { - char buf [128]; - - snprintf (buf, 128, "%.7g", v); - - put (k, (const char *)buf); + force (MAX_KEYWORD_LEN + 2 + 32); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); + falloc (sprintf (ptr, "%.7g", v)); + fadd ('\n'); } void put_(keyword k, sint64 v) { - add (keyword_str [k], keyword_len [k]); - add (' '); + force (MAX_KEYWORD_LEN + 2 + sint64_digits); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); add (v); - add ('\n'); + fadd ('\n'); } void put_(keyword k, sint32 v) { - add (keyword_str [k], keyword_len [k]); - add (' '); + force (MAX_KEYWORD_LEN + 2 + sint32_digits); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); add (v); - add ('\n'); - } - - void put (keyword kbeg, keyword kend, const shstr &v) - { - add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); - - if (v) - { - add (v); - add ('\n'); - } - - add (keyword_str [kend], keyword_len [kend]); add ('\n'); + fadd ('\n'); } void put (keyword k, float v) { put (k, (double)v); } @@ -332,6 +332,21 @@ void put (keyword k, signed long long v) { put_(k, (sint64)v); } void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } + void put (keyword kbeg, keyword kend, const shstr &v) + { + force (MAX_KEYWORD_LEN + 1); + fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); + + if (expect_true (v)) + { + add (v); + add ('\n'); + } + + force (MAX_KEYWORD_LEN + 1); + fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); + } + template void put (keyword k, const T *v) { @@ -353,18 +368,16 @@ operator bool () { return !!av; } }; -// compatibility support, should be removed when no longer needed -void fprintf (object_freezer &freezer, const char *format, ...); -void fputs (const char *s, object_freezer &freezer); - struct object_thawer { + char *line; // current beginning of line SV *text; // text part AV *av; // perl part int linenum; - char *line; // current beginning of line keyword kw; - char *kw_str, *value; + char *kw_str; // the keyword parsed, as string + char *value; // the value, or 0 if no value + char *value_nn; // the value, or the empty string if no value const char *name; operator bool () { return !!text; } @@ -378,30 +391,24 @@ // parse next line void next (); // skip the current key-value (usually fetch next line, for - // multiline-fields, skips untilt he corresponding end-kw + // multiline-fields, skips till the corresponding end-kw void skip (); - //TODO: remove, deprecated - keyword get_kv () - { - next (); - return kw; - } - char *get_str () { return value; } // may be 0 + void get_ml (keyword kend, shstr &sh); - void get (shstr &sh) const; void get_ornull (shstr &sh) const { sh = value; } - void get_ml (keyword kend, shstr &sh); + void get (shstr &sh) const { sh = value; } // might want to check for non-null here + bool get_bool () const { return *value_nn == '1'; } sint32 get_sint32 () const; - sint64 get_sint64 () const; - double get_double () const; + sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); } + double get_double () const { return strtod (value_nn, 0); } void get (float &v) { v = get_double (); } void get (double &v) { v = get_double (); } - void get (bool &i) { i = get_sint32 (); } + void get (bool &i) { i = get_bool (); } void get (sint8 &i) { i = get_sint32 (); } void get (uint8 &i) { i = get_sint32 (); } void get (sint16 &i) { i = get_sint32 (); } @@ -435,19 +442,19 @@ static void cede_every (int count) { - if (++cede_counter >= count) + if (expect_false (++cede_counter >= count)) do_cede_every (); } static void cede_to_tick () { - if (time () >= next_cede) + if (expect_false (time () >= next_cede)) do_cede_to_tick (); } static void cede_to_tick_every (int count) { - if (++cede_counter >= count) + if (expect_false (++cede_counter >= count)) cede_to_tick (); }