--- deliantra/server/include/cfperl.h 2007/05/27 23:56:21 1.70
+++ deliantra/server/include/cfperl.h 2007/11/08 19:43:24 1.90
@@ -1,3 +1,26 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Deliantra 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 3 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 this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
+ */
+
//
// cfperl.h perl interface
//
@@ -34,6 +57,7 @@
#undef gethostbyname
#undef ctime
#undef strerror
+#undef _
// same here, massive symbol spamming
#undef do_open
@@ -48,6 +72,11 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define _(msg) (msg)
+#define N_(msg) (msg)
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
// some macros to simplify perl in-calls
#define CHECK_ERROR \
@@ -67,11 +96,13 @@
void cfperl_emergency_save ();
void cfperl_cleanup (int make_core);
void cfperl_make_book (object *book, int level);
+void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
+int cfperl_can_merge (object *ob1, object *ob2);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// virtual server time, excluding time jumps and lag
-extern double runtime;
+extern tstamp runtime; // virtual server time, excluding time jumps and lag
+extern tstamp NOW; // real time of current server tick
enum event_klass
{
@@ -131,7 +162,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
{
static MGVTBL vtbl;
@@ -142,17 +173,12 @@
F_DESTROYED = 0x01,
F_DEBUG_TRACE = 0x02,
};
-
- // object is delete'd after the refcount reaches 0
int ACC (RW, flags);
- mutable int ACC (RW, refcnt);
-
- MTH void refcnt_inc () const { ++refcnt; }
- MTH void refcnt_dec () const { --refcnt; }
+ // object is delete'd after the refcount reaches 0
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
@@ -178,16 +204,27 @@
void optimise (); // possibly save some memory by destroying unneeded data
attachable ()
- : flags (0), refcnt (0), self (0), cb (0), attach (0)
+ : flags (0), self (0), cb (0), attach (0)
{
}
attachable (const attachable &src)
- : flags (0), refcnt (0), self (0), cb (0), attach (src.attach)
+ : flags (0), self (0), cb (0), attach (src.attach)
{
}
- virtual ~attachable ();
+ // set a custom key to the given value, or delete it if value = 0
+ void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
+
+ void set_key_text (const char *key, const char *value = 0)
+ {
+ set_key (key, value, 1);
+ }
+
+ void set_key_data (const char *key, const char *value = 0)
+ {
+ set_key (key, value, 0);
+ }
attachable &operator =(const attachable &src);
@@ -208,6 +245,9 @@
// the method that does the real destroy work
virtual void do_destroy ();
+
+ // destructor is protected, should not be called by anybody
+ virtual ~attachable ();
};
// the global object is a pseudo object that cares for the global events
@@ -220,6 +260,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+INTERFACE_CLASS(object_freezer)
struct object_freezer : dynbuf_text
{
AV *av;
@@ -241,7 +282,7 @@
}
template
- void put_string (keyword k, const T &v)
+ void put_kw_string (keyword k, const T &v)
{
int klen = keyword_len [k];
int vlen = v ? strlen (v) + 1 : 0;
@@ -261,12 +302,12 @@
void put (keyword k, const char *v = 0)
{
- put_string (k, v);
+ put_kw_string (k, v);
}
void put (keyword k, const shstr &v)
{
- put_string (k, v);
+ put_kw_string (k, v);
}
void put (keyword k, double v)
@@ -296,21 +337,6 @@
fadd ('\n');
}
- 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');
- }
-
void put (keyword k, float v) { put (k, (double)v); }
void put (keyword k, signed char v) { put_(k, (sint32)v); }
void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
@@ -323,27 +349,38 @@
void put (keyword k, signed long long v) { put_(k, (sint64)v); }
void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
- template
- void put (keyword k, const T *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))
- put (k, v->name);
- else
- put (k, (const char *)0);
+ {
+ add (v);
+ add ('\n');
+ }
+
+ force (MAX_KEYWORD_LEN + 1);
+ fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
}
+ void put (keyword k, archetype *v);
+ void put (keyword k, treasurelist *v);
+ void put (keyword k, faceinfo *v);
+
template
void put (keyword k, const refptr &v)
{
put (k, (T *)v);
}
- bool save (const char *path);
+ MTH bool save (const_octet_string path);
char *as_string (); // like strdup
operator bool () { return !!av; }
};
+INTERFACE_CLASS(object_thawer)
struct object_thawer
{
char *line; // current beginning of line
@@ -356,7 +393,7 @@
char *value_nn; // the value, or the empty string if no value
const char *name;
- operator bool () { return !!text; }
+ operator bool () const { return !!text; }
object_thawer (const char *path = 0);
object_thawer (const char *data, AV *perlav);
@@ -365,17 +402,11 @@
void get (attachable *obj, int oid);
// parse next line
- void next ();
+ MTH void next ();
// skip the current key-value (usually fetch next line, for
- // multiline-fields, skips untilt he corresponding end-kw
- void skip ();
-
- //TODO: remove, deprecated
- keyword get_kv ()
- {
- next ();
- return kw;
- }
+ // multiline-fields, skips till the corresponding end-kw
+ MTH void skip ();
+ MTH void skip_block (); // skips till and over KW_end
char *get_str () { return value; } // may be 0
void get_ml (keyword kend, shstr &sh);
@@ -385,8 +416,8 @@
bool get_bool () const { return *value_nn == '1'; }
sint32 get_sint32 () const;
- sint64 get_sint64 () const { return atoll (value_nn); }
- double get_double () const { return atof (value_nn); }
+ 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 (); }
@@ -401,7 +432,18 @@
void get (uint32 &i) { i = get_sint64 (); }
void get (sint64 &i) { i = get_sint64 (); }
- bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+ MTH void parse_warn (const char *msg);
+ MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+
+ struct delayed_ref {
+ attachable *op;
+ object_ptr *ptr;
+ const char *ref;
+ };
+ std::vector delrefs;
+
+ void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+ MTH void resolve_delayed_derefs (bool deref = true);
};
//TODO: remove
@@ -415,8 +457,7 @@
static int nready () { return CORO_NREADY; }
static int cede () { return CORO_CEDE ; }
- static double (*time)();
- static double next_cede;
+ static tstamp next_cede;
static int cede_counter;
static void do_cede_every ();
@@ -429,16 +470,21 @@
do_cede_every ();
}
- static void cede_to_tick ()
+ static bool cede_to_tick ()
{
- if (expect_false (time () >= next_cede))
- do_cede_to_tick ();
+ if (expect_true (now () < next_cede))
+ return false;
+
+ do_cede_to_tick ();
+ return true;
}
- static void cede_to_tick_every (int count)
+ static bool cede_to_tick_every (int count)
{
- if (expect_false (++cede_counter >= count))
- cede_to_tick ();
+ if (expect_true (++cede_counter < count))
+ return false;
+
+ return cede_to_tick ();
}
static void wait_for_tick ();