--- deliantra/server/include/object.h	2009/11/29 17:41:07	1.223
+++ deliantra/server/include/object.h	2010/04/17 02:50:21	1.247
@@ -1,9 +1,9 @@
 /*
  * 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 (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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
@@ -25,8 +25,6 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include <bitset>
-
 #include "cfperl.h"
 #include "shstr.h"
 
@@ -34,7 +32,9 @@
 
 typedef int tag_t;
 
-enum {
+// also see common/item.C
+enum
+{
   body_skill,
   body_combat,
   body_range,
@@ -52,13 +52,6 @@
   NUM_BODY_LOCATIONS
 };
 
-enum slottype_t
-{
-  slot_none,
-  slot_combat,
-  slot_ranged,
-};
-
 /* See common/item.c */
 
 typedef struct Body_Locations
@@ -73,6 +66,9 @@
 #define NUM_COINS 4             /* number of coin types */
 extern const char *const coins[NUM_COINS + 1];
 
+// restart server when object_count reaches this value
+#define RESTART_COUNT 0xe0000000
+
 /*
  * Each object (this also means archetypes!) could have a few of these
  * "dangling" from it; this could also end up containing 'parse errors'.
@@ -287,18 +283,34 @@
   shstr ACC (RW, custom_name);	/* Custom name assigned by player */
 };
 
-const char *query_weight (const object *op);
-const char *query_short_name (const object *op);
-const char *query_name (const object *op);
-const char *query_base_name (const object *op, int plural);
+const_utf8_string query_weight (const object *op);
+const_utf8_string query_short_name (const object *op);
+const_utf8_string query_name (const object *op);
+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
+struct freelist_item
+{
+  freelist_item *next;
+  uint32_t count;
+};
+
+struct object : object_copy
 {
   // These variables are not changed by ->copy_to
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
 
   UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
-  int ACC (RO, count);
+  uint32_t ACC (RO, count);
   object_vector_index ACC (RO, index);	// index into objects
   object_vector_index ACC (RO, active); // index into actives
 
@@ -320,6 +332,16 @@
   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
   shstr_tmp kv_get (shstr_tmp key) const;
   void kv_del (shstr_tmp key);
@@ -362,7 +384,6 @@
   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);
@@ -379,9 +400,10 @@
 
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
+  MTH void destroy_inv_fast (); // like destroy_inv (false), but only works when *this is destroyed, too
   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 ()
@@ -399,7 +421,15 @@
     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)
@@ -407,6 +437,9 @@
     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
@@ -420,8 +453,6 @@
   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 void open_container (object *new_container);
   MTH void close_container ()
@@ -470,9 +501,9 @@
   MTH void change_luck (int value);
 
   // info must hold 256 * 3 bytes currently
-  const char *debug_desc (char *info) const;
-  MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
-  const char *flag_desc (char *desc, int len) const;
+  const_utf8_string debug_desc (char *info) const;
+  MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
+  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
@@ -520,6 +551,10 @@
                                            && (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 is_immunity () const { return invisible && type == SIGN; }
+
   MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
 
   // temporary: wether the object can be saved in a map file
@@ -537,6 +572,12 @@
 
   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;
+
   // returns the outermost owner, never returns 0
   MTH object *outer_owner ()
   {
@@ -600,6 +641,9 @@
     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];
@@ -610,7 +654,7 @@
     return glow_radius;
   }
 
-  // returns the player that cna see this object, if any
+  // returns the player that can see this object, if any
   MTH object *visible_to () const;
 
   MTH std::string long_desc        (object *who = 0); // query_name . " " . describe
@@ -618,10 +662,10 @@
   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 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); }
+  MTH const_utf8_string query_weight     () { return ::query_weight     (this); }
+  MTH const_utf8_string query_name       () { return ::query_name       (this); }
+  MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
+  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
@@ -631,6 +675,12 @@
 
   MTH void create_treasure (treasurelist *tl, int flags = 0);
 
+  // makes sure the player has the named skill,
+  // and also makes it innate if can_use is true.
+  // returns the new skill or 0 if no such skill exists.
+  MTH object *give_skill (shstr_cmp name, bool can_use = false);
+  MTH void become_follower (object *new_god);
+
   // insert object at same map position as 'where'
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
@@ -648,7 +698,10 @@
 
   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
+
+  MTH object *mark () const;
 
   // returns the mapspace this object is in
   mapspace &ms () const;
@@ -709,13 +762,14 @@
 
   MTH struct region *region () const;
 
-  void statusmsg (const char *msg, int color = NDI_BLACK);
-  void failmsg (const char *msg, int color = NDI_RED);
+  MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
+  MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
+  void failmsgf (const_utf8_string format, ...); // always NDI_RED...
 
-  const char *query_inventory (object *who = 0, const char *indent = "");
+  MTH 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
+  static object *deref (const_octet_string ref); // returns the object from the generated reference, if possible
 
   // make some noise with given item into direction dir,
   // currently only used for players to make them temporarily visible
@@ -735,12 +789,22 @@
   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 ();
+
+  // low-level management, statistics, ...
+  static uint32_t ACC (RW, object_count);
+  static uint32_t ACC (RW, free_count);
+  static uint32_t ACC (RW, create_count);
+  static uint32_t ACC (RW, destroy_count);
+  static freelist_item *freelist;
+  MTH static void freelist_free (int count);
 
 protected:
   void link   ();
   void unlink ();
 
+  void do_delete ();
+
   object ();
   ~object ();
 
@@ -770,7 +834,7 @@
 
 //+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);
 
@@ -786,12 +850,12 @@
 //-GPL
 
 INTERFACE_CLASS (archetype)
-struct archetype : object
+struct archetype : object, zero_initialised
 {
   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;
 
@@ -800,7 +864,7 @@
   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
@@ -808,15 +872,24 @@
   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), ACC (RW, max_y);       
+  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);
   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 */
+
+protected:
+  void do_delete ();
 };
 
+// returns whether the object is a dragon player, which are often specialcased
+inline bool
+object::is_dragon () const
+{
+  return arch->race == shstr_dragon && is_player ();
+}
+
 inline void
 object_freezer::put (const keyword_string k, archetype *v)
 {