--- deliantra/server/include/object.h 2006/08/31 09:19:34 1.13
+++ deliantra/server/include/object.h 2009/10/11 05:43:35 1.211
@@ -1,59 +1,74 @@
/*
- * static char *rcsid_object_h =
- * "$Id$";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001,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
*/
-/*
- 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
-*/
-
#ifndef OBJECT_H
#define OBJECT_H
+#include
+
#include "cfperl.h"
#include "shstr.h"
-typedef uint32 tag_t;
-#define NUM_BODY_LOCATIONS 12
-#define BODY_ARMS 1
+typedef int tag_t;
+
+enum {
+ body_skill,
+ body_combat,
+ body_range,
+ body_shield,
+ body_arm,
+ body_torso,
+ body_head,
+ body_neck,
+ body_finger,
+ body_shoulder,
+ body_foot,
+ body_hand,
+ body_wrist,
+ body_waist,
+ NUM_BODY_LOCATIONS
+};
+
+enum slottype_t
+{
+ slot_none,
+ slot_combat,
+ slot_ranged,
+};
/* See common/item.c */
-typedef struct Body_Locations {
- const char *save_name; /* 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 */
+typedef struct Body_Locations
+{
+ keyword save_name; /* 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];
-typedef struct _event
-{
- int type;
- const char *hook;
- const char *plugin;
- const char *options;
- struct _event *next;
-} event;
+#define NUM_COINS 4 /* number of coin types */
+extern const char *const coins[NUM_COINS + 1];
/*
* Each object (this also means archetypes!) could have a few of these
@@ -61,222 +76,690 @@
*
* 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.
*/
-typedef struct _key_value {
- const char * key;
- const char * value;
- struct _key_value * next;
-} key_value;
+struct key_value : slice_allocated
+{
+ key_value *next;
+ shstr key, value;
+};
+
+struct UUID
+{
+ uint64 seq;
+
+ 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; }
+
+ typedef char BUF [32];
+
+ bool parse (const char *s)
+ {
+ return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
+ }
+ const char *c_str (char *buf, int len) const
+ {
+ snprintf (buf, len, "<1.%" PRIx64 ">", seq);
+
+ return buf;
+ }
+
+ const char *c_str () const
+ {
+ static BUF buf;
+
+ return c_str (buf, sizeof (buf));
+ }
+};
/* Definition for WILL_APPLY values. Replaces having harcoded values
* sprinkled in the code. Note that some of these also replace fields
* that were in the can_apply area. What is the point of having both
* can_apply and will_apply?
*/
-#define WILL_APPLY_HANDLE 0x1
-#define WILL_APPLY_TREASURE 0x2
-#define WILL_APPLY_EARTHWALL 0x4
-#define WILL_APPLY_DOOR 0x8
-#define WILL_APPLY_FOOD 0x10
+#define WILL_APPLY_HANDLE 0x01
+#define WILL_APPLY_TREASURE 0x02
+#define WILL_APPLY_EARTHWALL 0x04
+#define WILL_APPLY_DOOR 0x08
+#define WILL_APPLY_FOOD 0x10
+struct body_slot
+{
+ signed char info:4; /* body info as loaded from the file */
+ signed char used:4; /* Calculated value based on items equipped */
+};
-/* Note that the ordering of this structure is sort of relevent -
- * copy_object copies everything over beyond 'name' using memcpy.
- * Thus, values that need to be copied need to be located beyond that
- * point.
- *
- * 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-object
- *
- * I've tried to clean up this structure a bit (in terms of formatting)
- * by making it more consistent. I've also tried to locate some of the fields
- * more logically together (put the item related ones together, the monster
- * related ones, etc.
- * This structure is best viewed with about a 100 width screen.
- * MSW 2002-07-05
- */
+typedef struct oblnk
+{ /* Used to link together several objects */
+ object_ptr ob;
+ struct oblnk *next;
+} objectlink;
-struct object_simple : attachable