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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.259 by root, Sun May 1 13:18:23 2011 UTC vs.
Revision 1.267 by root, Wed Nov 21 12:12:03 2012 UTC

 /*
  * 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 (©) 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
     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 ()
     // strangely enough, using ?: here causes code to inflate
     return type == CONTAINER
         && ((env && env->container_ () == this)
             || (!env && flag [FLAG_APPLIED]));
   }
+  MTH object *find_spell (shstr_cmp name) const;
   MTH object *force_find (shstr_tmp name);
   MTH void force_set_timer (int duration);
   MTH object *force_add (shstr_tmp name, int duration = 0);
   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);
   MTH object *instance ();
   MTH void post_load_check ();          // do some adjustments after parsing
   object_vector_index ACC (RW, archid);         // index in archvector
-  shstr ACC (RW, archname);		   	/* More definite name, like "generate_kobold" */
+  shstr ACC (RW, archname);			/* More definite name, like "generate_kobold" */
   sint8 ACC (RW, max_x);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
   // support for archetype loading
   static archetype *read (object_thawer &f);
 // "safely" iterate over inv in a way such that the current item is removable
 // quite horrible, that's why its hidden in some macro
 #define for_inv_removable(op,var)			\
   for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
-#define for_all_objects(var)                    	\
+#define for_all_objects(var)				\
-  for (unsigned _i = 0; _i < objects.size (); ++_i)     \
+  for (unsigned _i = 0; _i < objects.size (); ++_i)	\
     statementvar (object *, var, objects [_i])
-#define for_all_actives(var)                    	\
+#define for_all_actives(var)				\
-  for (unsigned _i = 0; _i < actives.size (); ++_i)     \
+  for (unsigned _i = 0; _i < actives.size (); ++_i)	\
     statementvar (object *, var, actives [_i])
-#define for_all_archetypes(var)                 	\
+#define for_all_archetypes(var)				\
-  for (unsigned _i = 0; _i < archetypes.size (); ++_i)  \
+  for (unsigned _i = 0; _i < archetypes.size (); ++_i)	\
     statementvar (archetype *, var, archetypes [_i])
 //+GPL
 /* Used by update_object to know if the object being passed is
 #define UP_OBJ_INSERT   1
 #define UP_OBJ_REMOVE   2
 #define UP_OBJ_CHANGE   3
 #define UP_OBJ_FACE     4	/* Only thing that changed was the face */
 /* These are flags passed to insert_ob_in_map and
  * insert_ob_in_ob.  Note that all flags may not be meaningful
  * for both functions.
  * Most are fairly explanatory:
  * INS_NO_MERGE: don't try to merge inserted object with ones alrady
  *    on space.

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.259 by root, Sun May 1 13:18:23 2011 UTC vs. Revision 1.267 by root, Wed Nov 21 12:12:03 2012 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.259 by root, Sun May 1 13:18:23 2011 UTC vs.
Revision 1.267 by root, Wed Nov 21 12:12:03 2012 UTC