--- deliantra/server/include/cfperl.h 2007/07/13 15:54:40 1.83
+++ deliantra/server/include/cfperl.h 2007/11/08 19:43:24 1.90
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 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
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * 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.
@@ -18,7 +18,7 @@
* 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
+ * The authors can be reached via e-mail to
*/
//
@@ -57,6 +57,7 @@
#undef gethostbyname
#undef ctime
#undef strerror
+#undef _
// same here, massive symbol spamming
#undef do_open
@@ -71,6 +72,11 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define _(msg) (msg)
+#define N_(msg) (msg)
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
// some macros to simplify perl in-calls
#define CHECK_ERROR \
@@ -91,6 +97,7 @@
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);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -155,7 +162,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
{
static MGVTBL vtbl;
@@ -166,14 +173,9 @@
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 (expect_false (refcnt <= 0)) do_check (); }
@@ -202,17 +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)
{
}
// set a custom key to the given value, or delete it if value = 0
- void set_key (const char *key, const char *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);
@@ -248,6 +260,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+INTERFACE_CLASS(object_freezer)
struct object_freezer : dynbuf_text
{
AV *av;
@@ -361,12 +374,13 @@
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
@@ -379,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);
@@ -388,10 +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 till the corresponding end-kw
- void skip ();
+ 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);
@@ -417,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