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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.253 by root, Sun May 9 21:43:41 2010 UTC vs.
Revision 1.264 by root, Mon Nov 12 03:14:32 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #ifndef OBJECT_H
 #define OBJECT_H
 typedef int tag_t;
 // also see common/item.C
 enum
 {
-  body_skill,
+# define def(name, use, nonuse) body_ ## name,
-  body_combat,
+#  include "slotinc.h"
-  body_range,
+# undef def
-  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
 };
 /* See common/item.c */
-typedef struct Body_Locations
+struct Body_Locations
 {
+  const char *name;		/* Short name/identifier */
-  keyword     save_name;	/* Name used to load/save it to disk */
+  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
  * accessing the list directly.
  * Exception is if you want to walk this list for some reason.
  */
 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
   object *ACC (RW, env);	/* Pointer to the object which is the environment.
 				 * This is typically the container that the object is in.
 				 */
   object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
   object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
-  key_value *key_values;	/* Fields not explictly known by the loader. */
   MTH void set_flag (int flagnum)
   {
     flag [flagnum] = true;
   }
   MTH void clr_flag (int flagnum)
   {
     flag [flagnum] = false;
   }
-  // privates / perl
+  // extra key value pairs
-  shstr_tmp kv_get (shstr_tmp key) const;
+  key_values kv;
-  void kv_del (shstr_tmp key);
-  void kv_set (shstr_tmp key, shstr_tmp value);
 //-GPL
-  // custom extra fields management
-  struct key_value_access_proxy
-  {
-    object &ob;
-    shstr_tmp key;
-    key_value_access_proxy (object &ob, shstr_tmp key)
-    : ob (ob), key (key)
-    {
-    }
-    const key_value_access_proxy &operator =(shstr_tmp value) const
-    {
-      ob.kv_set (key, value);
-      return *this;
-    }
-    operator const shstr_tmp () const { return ob.kv_get (key); }
-    operator const char     *() const { return ob.kv_get (key); }
-  private:
-    void operator =(int);
-  };
-  // operator [] is too annoying to use
-  const key_value_access_proxy kv (shstr_tmp key)
-  {
-    return key_value_access_proxy (*this, key);
-  }
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   MTH 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);
     return op1->value == op2->value
         && op1->name  == op2->name
         && can_merge_slow (op1, op2);
   }
-  MTH void set_owner (object *owner);
+  MTH void set_owner (object_ornull *owner);
   MTH void set_speed (float speed);
   MTH void set_glow_radius (sint8 rad);
   MTH void open_container (object *new_container);
   MTH void close_container ()
   MTH int number_of () const
   {
     return nrof ? nrof : 1;
   }
-  MTH sint32 total_weight () const
+  MTH weight_t total_weight () const
   {
-    return (weight + carrying) * number_of ();
+    return sint64 (weight + carrying) * number_of ();
   }
   MTH void update_weight ();
   // return the dominant material of this item, always return something
   {
     return material;
   }
   // return the volume of this object in cm³
-  MTH uint64 volume () const
+  MTH volume_t volume () const
   {
-    return (uint64)total_weight ()
+    return (volume_t)total_weight ()
            * 1024 // 1000 actually
            * (type == CONTAINER ? 128 : 1)
            / dominant_material ()->density; // ugh, division
   }
   MTH void activate   ();
   MTH void deactivate ();
   MTH void activate_recursive   ();
   MTH void deactivate_recursive ();
+  // prefetch and activate the surrounding area
+  MTH void prefetch_surrounding_maps ();
   // set the given flag on all objects in the inventory recursively
   MTH void set_flag_inv (int flag, int value = 1);
   void enter_exit (object *exit); // perl
   MTH bool enter_map (maptile *newmap, int x, int y);
   void player_goto (const_utf8_string path, int x, int y); // only for players
   MTH bool apply (object *ob, int aflags = AP_APPLY); // ob may be 0
   MTH object *mark () const;
+  MTH void splay_marked ();
   // returns the mapspace this object is in
   mapspace &ms () const;
   // fully recursive iterator

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.253 by root, Sun May 9 21:43:41 2010 UTC vs. Revision 1.264 by root, Mon Nov 12 03:14:32 2012 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.253 by root, Sun May 9 21:43:41 2010 UTC vs.
Revision 1.264 by root, Mon Nov 12 03:14:32 2012 UTC