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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.218 by root, Mon Nov 9 03:08:24 2009 UTC vs.
Revision 1.235 by root, Tue Apr 6 21:11:48 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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.
  */
 #ifndef OBJECT_H
 #define OBJECT_H
-#include <bitset>
 #include "cfperl.h"
 #include "shstr.h"
 //+GPL
 typedef int tag_t;
+// also see common/item.C
-enum {
+enum
+{
   body_skill,
   body_combat,
   body_range,
   body_shield,
   body_arm,
   body_wrist,
   body_waist,
   NUM_BODY_LOCATIONS
 };
-enum slottype_t
-{
-  slot_none,
-  slot_combat,
-  slot_ranged,
-};
 /* See common/item.c */
 typedef struct Body_Locations
 {
   keyword     save_name;	/* Name used to load/save it to disk */
   flags_t flag;                 /* various flags */
 #if FOR_PERL
   bool ACC (RW, flag[NUM_FLAGS]);
 #endif
-  shstr ACC (RW, materialname);	/* specific material name */
+  materialtype_t *material;	// What material this object consists of //TODO, make perl-accessible
   shstr ACC (RW, skill);	/* Name of the skill this object uses/grants */
-//  materialtype_t *ACC (RW, material);	/* What material this object consists of */
   object_ptr ACC (RW, owner);	/* Pointer to the object which controls this one */
   object_ptr ACC (RW, enemy);	/* Monster/player to follow even if not closest */
   object_ptr ACC (RW, attacked_by);	/* This object start to attack us! only player & monster */
   object_ptr ACC (RW, chosen_skill);	/* the skill chosen to use */
   object_ptr ACC (RW, spellitem);	/* Spell ability monster is choosing to use */
   shstr ACC (RW, lore);		/* Obscure information about this object, */
 				/* To get put into books and the like. */
   shstr ACC (RW, custom_name);	/* Custom name assigned by player */
 };
-const char *query_weight (const object *op);
+const_utf8_string query_weight (const object *op);
-const char *query_short_name (const object *op);
+const_utf8_string query_short_name (const object *op);
-const char *query_name (const object *op);
+const_utf8_string query_name (const object *op);
-const char *query_base_name (const object *op, int plural);
+const_utf8_string query_base_name (const object *op, int plural);
+sint64 query_cost (const object *tmp, object *who, int flag);
+const char *query_cost_string (const object *tmp, object *who, int flag);
+int change_ability_duration (object *spell, object *caster);
+int min_casting_level (object *caster, object *spell);
+int casting_level (object *caster, object *spell);
+sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
+int SP_level_dam_adjust (object *caster, object *spob);
+int SP_level_duration_adjust (object *caster, object *spob);
+int SP_level_range_adjust (object *caster, object *spob);
 struct object : zero_initialised, object_copy
 {
   // These variables are not changed by ->copy_to
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
   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);
-  MTH int slottype () const;
   MTH static object *create ();
   const mapxy &operator =(const mapxy &pos);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to a single object
   MTH object *deep_clone (); // copy whole more chain and inventory
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
   MTH object *insert (object *item); // insert into inventory
   MTH void play_sound (faceidx sound) const;
-  MTH void say_msg (const char *msg) const;
+  MTH void say_msg (const_utf8_string msg) const;
   void do_remove ();
   MTH void remove ()
   {
     if (!flag [FLAG_REMOVED])
     remove ();
     *this = pos;
     insert_at (this, this);
   }
-  // high-level move functions, return true if successful
+  // high-level move method.
+  // 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)
   {
     return move (dir, this);
   }
+  // changes move_type to a new value - handles move_on/move_off effects
+  MTH void change_move_type (MoveType mt);
   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 void set_glow_radius (sint8 rad);
-  MTH bool change_weapon (object *ob);
-  MTH bool change_skill (object *ob);
+  MTH bool change_skill (object *ob); // deprecated?
   MTH void open_container (object *new_container);
   MTH void close_container ()
   {
     open_container (0);
   MTH void drain_stat ();
   MTH void drain_specific_stat (int deplete_stats);
   MTH void change_luck (int value);
   // info must hold 256 * 3 bytes currently
-  const char *debug_desc (char *info) const;
+  const_utf8_string debug_desc (char *info) const;
-  MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
+  MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
-  const char *flag_desc (char *desc, int len) const;
+  const_utf8_string flag_desc (char *desc, int len) const;
   MTH bool decrease (sint32 nr = 1); // returns true if anything is left
   MTH object *split (sint32 nr = 1); // return 0 on failure
   MTH int number_of () const
   }
   MTH void update_weight ();
   // return the dominant material of this item, always return something
-  const materialtype_t *dominant_material () const;
+  const materialtype_t *dominant_material () const
+  {
+    return material;
+  }
   // return the volume of this object in cm³
   MTH uint64 volume () const
   {
     return (uint64)total_weight ()
-           * 1000
+           * 1024 // 1000 actually
-           * (type == CONTAINER ? 1000 : 1)
+           * (type == CONTAINER ? 128 : 1)
-           / dominant_material ()->density;
+           / dominant_material ()->density; // ugh, division
   }
   MTH bool is_arch   () const { return this == (const object *)(const archetype *)arch; }
   MTH bool is_wiz    () const { return flag [FLAG_WIZ]; }
   MTH bool is_arrow  () const { return type == ARROW
                                        || (type == SPELL_EFFECT
                                            && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
   MTH bool is_range  () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
+  MTH bool is_dragon () const;
-  MTH bool has_active_speed () const { return fabs (speed) >= MIN_ACTIVE_SPEED; }
+  MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
   // temporary: wether the object can be saved in a map file
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
   MTH bool is_player () const
   {
     return !!contr;
   }
+  /* elmex: this method checks whether the object is in a shop */
+  MTH bool is_in_shop () const;
   MTH bool affects_los () const
   {
     return glow_radius || flag [FLAG_BLOCKSVIEW];
   }
   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); // long description, without name
-  MTH const char *query_weight     () { return ::query_weight     (this); }
+  MTH const_utf8_string query_weight     () { return ::query_weight     (this); }
-  MTH const char *query_name       () { return ::query_name       (this); }
+  MTH const_utf8_string query_name       () { return ::query_name       (this); }
-  MTH const char *query_short_name () { return ::query_short_name (this); }
+  MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
-  MTH const char *query_base_name  (bool plural) { return ::query_base_name (this, plural); }
+  MTH const_utf8_string query_base_name  (bool plural) { return ::query_base_name (this, plural); }
   // If this object has no extra parts but should have them,
   // add them, effectively expanding heads into multipart
   // objects. This method only works on objects not inserted
   // anywhere.
   // 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 void enter_map (maptile *newmap, int x, int y);
-  void player_goto (const char *path, int x, int y); // only for players
+  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
   // returns the mapspace this object is in
   mapspace &ms () const;
   // fully recursive iterator
     return weight + carrying;
   }
   MTH struct region *region () const;
-  void statusmsg (const char *msg, int color = NDI_BLACK);
+  void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
-  void failmsg (const char *msg, int color = NDI_RED);
+  void failmsg (const_utf8_string msg, int color = NDI_RED);
-  const char *query_inventory (object *who = 0, const char *indent = "");
+  const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
   MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
   static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
   // make some noise with given item into direction dir,
    * range from 0 through 7.
    */
   MTH int anim_frames  () const { return anim ().num_animations; }
   MTH int anim_facings () const { return anim ().facings; }
-  MTH char *as_string ();
+  MTH utf8_string as_string ();
 protected:
   void link   ();
   void unlink ();
   return ob;
 }
 //+GPL
-object *find_skill_by_name_fuzzy (object *who, const char *name);
+object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
 object *find_skill_by_name (object *who, shstr_cmp sh);
 object *find_skill_by_number (object *who, int skillno);
 /*
  * The archetype structure is a set of rules on how to generate and manipulate
 struct archetype : object
 {
   static arch_ptr empty; // the empty_archetype
   MTH static void gc ();
-  archetype (const char *name);
+  archetype (const_utf8_string name);
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
   MTH static archetype *find (const_utf8_string name);
   MTH void link   ();
   MTH void unlink ();
-  MTH static object *get (const char *name); // (find() || singularity)->instance()
+  MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
   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" */
-  sint8 ACC (RW, min_x), ACC (RW, min_y);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
+  sint8 ACC (RW, max_x);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
-  sint8 ACC (RW, max_x), ACC (RW, max_y);
   // support for archetype loading
   static archetype *read (object_thawer &f);
   MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
   static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone  other_arch reference */
 };
-// compatbiility, remove once replaced by ->instance
+// returns whether the object is a dragon player, which are often specialcased
-inline object *
+inline bool
-arch_to_object (archetype *at)
+object::is_dragon () const
 {
-  return at->instance ();
+  return arch->race == shstr_dragon && is_player ();
 }
 inline void
-object_freezer::put (keyword k, archetype *v)
+object_freezer::put (const keyword_string k, archetype *v)
 {
-  put (k, v ? &v->archname : (const char *)0);
+  if (expect_true (v))
+    put (k, v->archname);
+  else
+    put (k);
 }
 typedef object_vector<object,    &object::index >    objectvec;
 typedef object_vector<object,    &object::active>    activevec;
 typedef object_vector<archetype, &archetype::archid> archvec;

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.218 by root, Mon Nov 9 03:08:24 2009 UTC vs. Revision 1.235 by root, Tue Apr 6 21:11:48 2010 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.218 by root, Mon Nov 9 03:08:24 2009 UTC vs.
Revision 1.235 by root, Tue Apr 6 21:11:48 2010 UTC