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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.262 by root, Mon Oct 1 01:43:39 2012 UTC vs.
Revision 1.276 by root, Wed Dec 5 19:03:26 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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
   // 8 free bits
   //float ACC (RW, expmul) = 1.0;	/* needed experience = (calc_exp*expmul) - means some */
   //                                    /* races/classes can need less/more exp to gain levels */
-  static const float expmul = 1.0;//D
+  constexpr static const float expmul = 1.0;//D
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
   /* Following are values used by any object */
   /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
   // object op is trying to move in direction dir.
   // originator is typically the same as op, but
   // can be different if originator is causing op to
   // move (originator is pushing op)
   // returns 0 if the object is not able to move to the
   // desired space, 1 otherwise (in which case we also
   // move the object accordingly.  This function is
   // very similiar to move_object.
   int move (int dir, object *originator);
   int move (int dir)
     // strangely enough, using ?: here causes code to inflate
     return type == CONTAINER
         && ((env && env->container_ () == this)
             || (!env && flag [FLAG_APPLIED]));
   }
+  MTH object *find_spell (const_utf8_string prefix) 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
   }
   static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
   MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
   /* need_identify returns true if the item should be identified.  This
    * function really should not exist - by default, any item not identified
    * should need it.
    */
   MTH bool need_identify () const;
    * range from 0 through 7.
    */
   MTH int anim_frames  () const { return anim ().num_animations; }
   MTH int anim_facings () const { return anim ().facings; }
+  // sets a new animation frame, if the object has animation frames,
+  // and updates the face
+  MTH void update_anim_frame (int frame);
   MTH utf8_string as_string ();
   // low-level management, statistics, ...
   static uint32_t ACC (RW, object_count);
   static uint32_t ACC (RW, free_count);
   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);
 }
 inline void
 object_freezer::put (const keyword_string k, archetype *v)
 {
-  if (expect_true (v))
+  if (ecb_expect_true (v))
     put (k, v->archname);
   else
     put (k);
 }
 // "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
  * being added or removed.
  */
-#define UP_OBJ_INSERT   1
+#define UP_OBJ_INSERT   1	// object was inserted
-#define UP_OBJ_REMOVE   2
+#define UP_OBJ_REMOVE   2	// object was removed
-#define UP_OBJ_CHANGE   3
+#define UP_OBJ_CHANGE   3	// object has changed in some unspecified way
-#define UP_OBJ_FACE     4	/* Only thing that changed was the face */
+#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.
  * INS_ABOVE_FLOOR_ONLY: Put object immediatly above the floor.
  * INS_NO_WALK_ON: Don't call check_walk_on against the
  *    originator - saves cpu time if you know the inserted object
  *    is not meaningful in terms of having an effect.
  * INS_ON_TOP: Always put object on top.  Generally only needed when loading
  *     files from disk and ordering needs to be preserved.
  * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
  *     Use for treasure chests so the new object is the highest thing
  *     beneath the player, but not actually above it.  Note - the
  *     map and x,y coordinates for the object to be inserted must
  *     match the originator.

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.262 by root, Mon Oct 1 01:43:39 2012 UTC vs. Revision 1.276 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.262 by root, Mon Oct 1 01:43:39 2012 UTC vs.
Revision 1.276 by root, Wed Dec 5 19:03:26 2018 UTC