--- deliantra/server/include/object.h 2006/12/12 21:39:56 1.49
+++ deliantra/server/include/object.h 2011/05/03 11:23:48 1.260
@@ -1,25 +1,26 @@
/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2001 Mark Wedel & Crossfire Development Team
- Copyright (C) 1992 Frank Tore Johansen
-
- This program 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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- The authors can be reached via e-mail at crossfire-devel@real-time.com
-*/
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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 Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
+ *
+ * The authors can be reached via e-mail to
+ */
#ifndef OBJECT_H
#define OBJECT_H
@@ -27,45 +28,129 @@
#include "cfperl.h"
#include "shstr.h"
-typedef uint32 tag_t;
-#define NUM_BODY_LOCATIONS 12
-#define BODY_ARMS 1
+//+GPL
+
+typedef int tag_t;
+
+// also see common/item.C
+enum
+{
+# define def(name, use, nonuse) body_ ## name,
+# include "slotinc.h"
+# undef def
+ NUM_BODY_LOCATIONS
+};
/* See common/item.c */
-typedef struct Body_Locations
+struct Body_Locations
{
- const char *save_name; /* Name used to load/save it to disk */
+ const char *name; /* Short name/identifier */
+ keyword kw; /* Name used to load/save it to disk */
const char *use_name; /* Name used when describing an item we can use */
const char *nonuse_name; /* Name to describe objects we can't use */
-} Body_Locations;
+};
extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
+// for each set of directions (1 == up, 2 == right, 4 == down, 8 == left)
+// contains the wall suffix (0, 1_3, 1_4 and so on).
+extern const char *wall_suffix[16];
+
+#define NUM_COINS 4 /* number of coin types */
+extern const char *const coins[NUM_COINS + 1];
+
+// restart server when object_count reaches this value
+#define RESTART_COUNT 0xe0000000
+
/*
* Each object (this also means archetypes!) could have a few of these
* "dangling" from it; this could also end up containing 'parse errors'.
*
* key and value are shared-strings.
*
- * Please use get_ob_key_value(), set_ob_key_value() from object.c rather than
+ * Please use kv_get/kv_set/kv_del from object rather than
* accessing the list directly.
* Exception is if you want to walk this list for some reason.
*/
-struct key_value
+struct key_value : slice_allocated
{
- key_value *next;
+ key_value *next; // must be first element
shstr key, value;
};
+// "crossfires version of a perl hash."
+struct key_values
+{
+ key_value *first; // must be first element
+
+ bool empty() const
+ {
+ return !first;
+ }
+
+ void clear ();
+ shstr_tmp get (shstr_tmp key) const;
+ void del (shstr_tmp key);
+ void set (shstr_tmp key, shstr_tmp value);
+
+ void add (shstr_tmp key, shstr_tmp value); // liek set, but doesn't check for duplicates
+ void reverse (); // reverses the ordering, to be used after loading an object
+ key_values &operator =(const key_values &kv);
+
+ // custom extra fields management
+ struct access_proxy
+ {
+ key_values &kv;
+ shstr_tmp key;
+
+ access_proxy (key_values &kv, shstr_tmp key)
+ : kv (kv), key (key)
+ {
+ }
+
+ const access_proxy &operator =(shstr_tmp value) const
+ {
+ kv.set (key, value);
+ return *this;
+ }
+
+ operator const shstr_tmp () const { return kv.get (key); }
+ operator const char *() const { return kv.get (key); }
+
+ private:
+ void operator =(int);
+ };
+
+ const access_proxy operator [](shstr_tmp key)
+ {
+ return access_proxy (*this, key);
+ }
+};
+
+//-GPL
+
struct UUID
{
uint64 seq;
+
+ enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
+
+ static UUID cur; // last uuid generated
+ static void init ();
+ static UUID gen ();
+
+ UUID () { }
+ UUID (uint64 seq) : seq(seq) { }
+ operator uint64() { return seq; }
+ void operator =(uint64 seq) { this->seq = seq; }
+
+ bool parse (const char *s);
+ char *append (char *buf) const;
+ char *c_str () const;
};
-extern void init_uuid ();
-extern UUID gen_uuid ();
-extern const uint64 UUID_SKIP;
+//+GPL
/* Definition for WILL_APPLY values. Replaces having harcoded values
* sprinkled in the code. Note that some of these also replace fields
@@ -78,60 +163,51 @@
#define WILL_APPLY_DOOR 0x08
#define WILL_APPLY_FOOD 0x10
-/* However, if you're keeping a pointer of some sort, you probably
- * don't just want it copied, so you'll need to add to common/object.C,
- * e.g. ->copy_to ()
- */
-
-typedef refptr