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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.202 by root, Sat Jun 27 08:25:36 2009 UTC vs.
Revision 1.211 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC

   MoveType ACC (RW, move_off);	/* Move types affected moving off this space */
   MoveType ACC (RW, move_slow);	/* Movement types this slows down */
   // 8 free bits
-  float ACC (RW, expmul);	/* needed experience = (calc_exp*expmul) - means some */
+  //float ACC (RW, expmul) = 1.0;	/* needed experience = (calc_exp*expmul) - means some */
-				/* races/classes can need less/more exp to gain levels */
+  //                                    /* races/classes can need less/more exp to gain levels */
+  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 */
   {
     open_container (0);
   }
   MTH object *force_find (shstr_tmp name);
+  MTH void force_set_timer (int duration);
   MTH object *force_add (shstr_tmp name, int duration = 0);
   oblinkpt *find_link () const;
   MTH void add_link (maptile *map, shstr_tmp id);
   MTH void remove_link ();
     return (uint64)total_weight ()
            * 1000
            * (type == CONTAINER ? 1000 : 1)
            / dominant_material ()->density;
   }
+  MTH bool is_arch   () const { return this == (const object *)(const archetype *)arch; }
   MTH bool is_wiz    () const { return flag [FLAG_WIZ]; }
   MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
   MTH bool is_armor  () const { return type == ARMOUR  || type == SHIELD || type == HELMET
                                     || type == CLOAK   || type == BOOTS  || type == GLOVES
   /* This return true if object has still randomitems which
    * could be expanded.
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
-  MTH bool has_dialogue () const { return *&msg == '@'; }
+  static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
+  MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
   // returns the outermost owner, never returns 0
   MTH object *outer_owner ()
   {
     object *op;
     return op;
   }
   // returns the outermost environment, never returns 0
-  MTH object *outer_env () const
+  MTH object *outer_env_or_self () const
   {
     const object *op;
     for (op = this; op->env; op = op->env)
       ;
     return const_cast<object *>(op);
+  }
+  // returns the outermost environment, may return 0
+  MTH object *outer_env () const
+  {
+    return env ? outer_env_or_self () : 0;
   }
   // returns the player that has this object in his inventory, or 0
   // we assume the player is always the outer env
   MTH object *in_player () const
   {
-    object *op = outer_env ();
+    object *op = outer_env_or_self ();
     return op->type == PLAYER ? op : 0;
   }
   // "temporary" helper function
   }
   // returns the player that cna see this object, if any
   MTH object *visible_to () const;
-  MTH std::string long_desc        (object *who = 0);
+  MTH std::string long_desc        (object *who = 0); // query_name . " " . describe
   MTH std::string describe_monster (object *who = 0);
   MTH std::string describe_item    (object *who = 0);
-  MTH std::string describe         (object *who = 0);
+  MTH std::string describe         (object *who = 0); // long description, without name
   MTH const char *query_weight     () { return ::query_weight     (this); }
   MTH const char *query_name       () { return ::query_name       (this); }
   MTH const char *query_short_name () { return ::query_short_name (this); }
   MTH const char *query_base_name  (bool plural) { return ::query_base_name (this, plural); }
   // currently only used for players to make them temporarily visible
   // when they are invisible.
   MTH void make_noise ();
   /* animation */
-  bool has_anim () { return animation_id; }
+  MTH bool has_anim () const { return animation_id; }
   const animation &anim () const { return animations [animation_id]; }
-  faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
+  MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
-  void set_anim_frame (int frame) { face = get_anim_frame (frame); }
+  MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
   /* anim_frames () returns the number of animations allocated.  The last
    * usuable animation will be anim_frames () - 1 (for example, if an object
    * has 8 animations, anim_frames () will return 8, but the values will
    * range from 0 through 7.
    */
-  int anim_frames  () const { return anim ().num_animations; }
+  MTH int anim_frames  () const { return anim ().num_animations; }
-  int anim_facings () const { return anim ().facings; }
+  MTH int anim_facings () const { return anim ().facings; }
+  MTH char *as_string ();
 protected:
   void link   ();
   void unlink ();
 // 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->env)
     {
       if (ob->above) ob->above->below = ob->below;
       if (ob->below) ob->below->above = ob->above;
       ob->above = 0;

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.202 by root, Sat Jun 27 08:25:36 2009 UTC vs. Revision 1.211 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.202 by root, Sat Jun 27 08:25:36 2009 UTC vs.
Revision 1.211 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC