[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.120 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.128 by root, Mon May 28 21:15:56 2007 UTC

 /*
- * CrossFire, A Multiplayer Online RPG
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published by
+ * under the terms of the GNU General Public License as published by the Free
- * the Free Software Foundation; either version 2 of the License, or
+ * Software Foundation; either version 2 of the License, or (at your option)
- * (at your option) any later version.
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * GNU General Public License for more details.
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #ifndef OBJECT_H
 #define OBJECT_H
 #include "shstr.h"
 typedef int tag_t;
 enum {
+  body_skill,
+  body_combat,
   body_range,
   body_shield,
-  body_combat,
   body_arm,
   body_torso,
   body_head,
   body_neck,
-  body_skill,
   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 */
+  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];
 #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
-/* 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 ()
- */
 struct body_slot
 {
   signed char info:4;	/* body info as loaded from the file */
   signed char used:4;	/* Calculated value based on items equipped */
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   void post_load_check ();          // do some adjustments after parsing
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
+  MTH int slottype () const;
   MTH static object *create ();
   object &operator =(const object &src);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
   void do_destroy ();
   {
     if (!flag [FLAG_REMOVED])
       do_remove ();
   }
-  // move this object to the top of its env's inventory to speed up
-  // searches for it.
-  MTH void inv_splay ()
-  {
-    if (env && env->inv != this)
-      {
-        if (above) above->below = below;
-        if (below) below->above = above;
-        above = 0;
-        below = env->inv;
-        below->above = this;
-        env->inv = this;
-      }
-  }
   static bool can_merge_slow (object *op1, object *op2);
   // this is often used in time-critical code, so optimise
   MTH static bool can_merge (object *op1, object *op2)
   {
   }
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
   MTH bool change_weapon (object *ob);
+  MTH bool change_skill (object *ob);
   MTH void open_container (object *new_container);
   MTH void close_container ()
   {
     open_container (0);
+  }
+  // overwrite the attachable should_invoke function with a version that also checks ev_want_type
+  bool should_invoke (event_type event)
+  {
+    return ev_want_event [event] || ev_want_type [type] || cb;
   }
   MTH void instantiate ();
   // recalculate all stats
   object ();
   ~object ();
 };
+// move this object to the top of its env's inventory to speed up
+// searches for it.
+static object *
+splay (object *ob)
+{
+  if (ob->env && ob->env->inv != ob)
+    {
+      if (ob->above) ob->above->below = ob->below;
+      if (ob->below) ob->below->above = ob->above;
+      ob->above = 0;
+      ob->below = ob->env->inv;
+      ob->below->above = ob;
+      ob->env->inv = ob;
+    }
+  return ob;
+}
 typedef object_vector<object, &object::index > objectvec;
 typedef object_vector<object, &object::active> activevec;
 extern objectvec objects;
 extern activevec actives;
 {				/* Used to link together several object links */
   struct oblnk *link;
   long value;			/* Used as connected value in buttons/gates */
   struct oblinkpt *next;
 } oblinkpt;
+object *find_skill_by_name (object *who, const char *name);
+object *find_skill_by_name (object *who, const shstr &sh);
+object *find_skill_by_number (object *who, int skillno);
 /*
  * The archetype structure is a set of rules on how to generate and manipulate
  * objects which point to archetypes.
  * This probably belongs in arch.h, but there really doesn't appear to

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/object.h (file contents): Revision 1.120 by root, Sat May 12 16:06:42 2007 UTC vs. Revision 1.128 by root, Mon May 28 21:15:56 2007 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.120 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.128 by root, Mon May 28 21:15:56 2007 UTC