--- deliantra/server/include/object.h 2007/05/26 15:44:04 1.126
+++ deliantra/server/include/object.h 2007/07/01 05:00:18 1.135
@@ -1,25 +1,24 @@
/*
- * CrossFire, A Multiplayer Online RPG
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * 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
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001,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
+ * 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
+ * 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@schmorp.de
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
*/
#ifndef OBJECT_H
@@ -61,7 +60,7 @@
typedef struct Body_Locations
{
- const char *save_name; /* Name used to load/save it to disk */
+ 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;
@@ -248,8 +247,8 @@
UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
int ACC (RO, count);
- int ACC (RO, index); // index into objects
- int ACC (RO, active); // index into actives
+ object_vector_index ACC (RO, index); // index into objects
+ object_vector_index ACC (RO, active); // index into actives
player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
@@ -402,6 +401,11 @@
return head ? head : this;
}
+ MTH bool is_head ()
+ {
+ return head_ () == this;
+ }
+
MTH std::string long_desc (object *who = 0);
MTH std::string describe_monster (object *who = 0);
MTH std::string describe_item (object *who = 0);
@@ -484,9 +488,7 @@
MTH struct region *region () const;
protected:
- friend struct archetype;
-
- void link ();
+ void link ();
void unlink ();
object ();
@@ -512,20 +514,6 @@
return ob;
}
-typedef object_vector objectvec;
-typedef object_vector activevec;
-
-extern objectvec objects;
-extern activevec actives;
-
-#define for_all_objects(var) \
- for (unsigned _i = 0; _i < objects.size (); ++_i) \
- declvar (object *, var, objects [_i])
-
-#define for_all_actives(var) \
- for (unsigned _i = 0; _i < actives.size (); ++_i) \
- declvar (object *, var, actives [_i])
-
typedef struct oblnk
{ /* Used to link together several objects */
object_ptr ob;
@@ -553,9 +541,9 @@
*/
INTERFACE_CLASS (archetype)
-struct archetype : zero_initialised, attachable
+struct archetype : object
{
- archetype ();
+ archetype (const char *name);
~archetype ();
void gather_callbacks (AV *&callbacks, event_type event) const;
@@ -563,21 +551,44 @@
static archetype *get (const char *name); // find or create
static archetype *find (const char *name);
- void hash_add (); // add to hashtable
- void hash_del (); // remove from hashtable
+ void link ();
+ void unlink ();
- shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
- struct archetype *ACC (RW, next); /* Next archetype in a linked list */
- struct archetype *ACC (RW, head); /* The main part of a linked object */
- struct archetype *ACC (RW, more); /* Next part of a linked object */
- object ACC (RO, clone); /* An object from which to do ->copy_to () */
+ object_vector_index ACC (RW, archid); // index in archvector
+ shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
+ bool ACC (RW, stub); // if true, this is an invalid archetype
uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
- bool ACC (RW, linked); // linked into list of heads
- sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
- * in comparison to the head.
- */
+
+ sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
+ sint8 ACC (RW, max_x), ACC (RW, max_y);
};
+inline void
+object_freezer::put (keyword k, archetype *v)
+{
+ put (k, v ? &v->archname : (const char *)0);
+}
+
+typedef object_vector objectvec;
+typedef object_vector activevec;
+typedef object_vector archvec;
+
+extern objectvec objects;
+extern activevec actives;
+extern archvec archetypes;
+
+#define for_all_objects(var) \
+ for (unsigned _i = 0; _i < objects.size (); ++_i) \
+ statementvar (object *, var, objects [_i])
+
+#define for_all_actives(var) \
+ for (unsigned _i = 0; _i < actives.size (); ++_i) \
+ statementvar (object *, var, actives [_i])
+
+#define for_all_archetypes(var) \
+ for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
+ statementvar (archetype *, var, archetypes [_i])
+
/* Used by update_object to know if the object being passed is
* being added or removed.
*/
@@ -620,10 +631,7 @@
#define INS_BELOW_ORIGINATOR 0x0010
#define INS_MAP_LOAD 0x0020
-#define ARCH_SINGULARITY "singularity"
-#define ARCH_DETECT_MAGIC "detect_magic"
#define ARCH_DEPLETION "depletion"
-#define ARCH_SYMPTOM "symptom"
#endif