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

Comparing deliantra/server/include/player.h (file contents):
Revision 1.48 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.75 by root, Fri Dec 28 12:44:45 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
-#define NUM_OUTPUT_BUFS	5
-struct Output_Buf
-{
-  shstr buf;                    /* Actual string pointer */
-  uint32 first_update;          /* First time this message was stored  */
-  uint16 count;                 /* How many times we got this message */
-};
-/* wand/rod/horn rolled into range_misc.  They all use the same body location
- * anyways.
- */
-enum rangetype
-{
-  range_bottom = -1,
-  range_none = 0,
-  range_bow = 1,
-  range_magic = 2,
-  range_misc = 3,
-  range_golem = 4,
-  range_skill = 5,
-  range_builder = 6,
-  range_size = 7
-};
 enum bowtype_t
 {
-  bow_normal = 0,
+  bow_normal     = 0,
-  bow_threewide = 1,
+  bow_threewide  = 1,
   bow_spreadshot = 2,
-  bow_n = 3,                    /* must stay at 3 */
+  bow_n  = 3,                    /* must stay at 3 */
   bow_ne = 4,
-  bow_e = 5,
+  bow_e  = 5,
   bow_se = 6,
-  bow_s = 7,
+  bow_s  = 7,
   bow_sw = 8,
-  bow_w = 9,
+  bow_w  = 9,
   bow_nw = 10,                  /* must stay at 10 */
   bow_bestarrow = 11
 };
 enum petmode_t
 {
   pet_normal = 0,
-  pet_sad = 1,
+  pet_sad    = 1,
   pet_defend = 2,
-  pet_arena = 3
+  pet_arena  = 3,
 };
 enum usekeytype
 {
   key_inventory = 0,
-  keyrings = 1,
+  keyrings      = 1,
-  containers = 2
+  containers    = 2,
 };
 /* This is used to control what to do when we need to unapply
  * an object before we can apply another one.
  */
   sint64 ACC (RW, total_exp);
   uint32 ACC (RW, kills);
 };
+// used for pet monster logic etc.
+static bool
+same_party (partylist *a, partylist *b)
+{
+  return a == b && a;
+}
 INTERFACE_CLASS (player)
 struct player : zero_initialised, attachable
 {
-  client *ACC (RO, ns);                /* Socket information for this player */
+  client *ACC (RO, ns);               /* Socket information for this player, ALWAYS valid when a player is on a map */
-  object *ACC (RW, ob);                /* The object representing the player */
+  object *ACC (RW, ob);               /* The object representing the player, ALWAYS valid */
-  int ACC (RO, active);
+  object_vector_index ACC (RO, active);
-  rangetype ACC (RW, shoottype);       /* Which range-attack is being used by player */
-  bowtype_t ACC (RW, bowtype);         /* which firemode? */
+  bowtype_t ACC (RW, bowtype);        /* which firemode? */
-  petmode_t ACC (RW, petmode);         /* which petmode? */
+  petmode_t ACC (RW, petmode);        /* which petmode? */
-  object_ptr ACC (RW, ranges[range_size]);   /* object for each range.  Set up in fix player.  Note */
-                                             /* That not all are used, it is just nice to map this 1:1 */
-                                             /* With the range names */
-  usekeytype ACC (RW, usekeys);           /* Method for finding keys for doors */
+  usekeytype ACC (RW, usekeys);       /* Method for finding keys for doors */
-  unapplymode ACC (RW, unapply);          /* Method for auto unapply */
+  unapplymode ACC (RW, unapply);      /* Method for auto unapply */
-  uint32 ACC (RW, count);                 /* Any numbers typed before a command */
+  uint32 ACC (RW, count);             /* Any numbers typed before a command */
-  uint32 ACC (RW, mode);                  /* Mode of player for pickup. */
+  uint32 ACC (RW, mode);              /* Mode of player for pickup. */
-  sint8 ACC (RW, digestion);              /* Any bonuses/penalties to digestion */
+  int ACC (RW, digestion);          /* Any bonuses/penalties to digestion */
-  sint8 ACC (RW, gen_hp);                 /* Bonuses to regeneration speed of hp */
+  int ACC (RW, gen_hp);             /* Bonuses to regeneration speed of hp */
-  sint8 ACC (RW, gen_sp);                 /* Bonuses to regeneration speed of sp */
+  int ACC (RW, gen_sp);             /* Bonuses to regeneration speed of sp */
-  sint8 ACC (RW, gen_sp_armour);          /* Penalty to sp regen from armour */
+  int ACC (RW, gen_sp_armour);      /* Penalty to sp regen from armour */
-  sint8 ACC (RW, gen_grace);              /* Bonuses to regeneration speed of grace */
+  int ACC (RW, gen_grace);          /* Bonuses to regeneration speed of grace */
-  sint16 ACC (RW, item_power);            /* Total item power of objects equipped */
+  int ACC (RW, item_power);        /* Total item power of objects equipped */
-  uint8 ACC (RW, listening);              /* Which priority will be used in info_all */
+  uint8 ACC (RW, listening);          /* Which priority will be used in info_all */
+  uint8 ACC (RW, gender);             /* 0 male, 1 female, others not yte defined */
   /* Try to put all the bitfields together - saves some small amount of memory */
   bool ACC (RW, braced);              /* Will not move if braced, only attack */
   bool ACC (RW, tmp_invis);           /* Will invis go away when we attack ? */
   bool ACC (RW, do_los);              /* If true, need to call update_los() in draw(), and clear */
   bool ACC (RW, fire_on);             /* Player should fire object, not move */
   bool ACC (RW, run_on);              /* Player should keep moving in dir until run is off */
-  bool ACC (RW, has_hit);             /* If set, weapon_sp instead of speed will count */
   bool ACC (RW, peaceful);            /* If set, won't attack friendly creatures */
   bool ACC (RW, hidden);              /* If True, player (DM) is hidden from view */
   float ACC (RW, weapon_sp);              /* Penalties to speed when fighting w speed >ws/10 */
+  float ACC (RW, weapon_sp_left);         // same as speed_left, but for attacks
   living ACC (RO, orig_stats);            /* Permanent real stats of player */
   object_ptr last_skill_ob[NUM_SKILLS];   /* the exp object */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */
+  object_ptr ACC (RW, combat_ob);     // which weapon/bow/skill to use for direct attacks
+  object_ptr ACC (RW, ranged_ob);     // which skill/item/spell to use for ranged attacks
+  object_ptr ACC (RW, golem);         // the currently controlled golem
+  object_ptr ACC (RW, observe);       // the object that is being observed (or 0)
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
   shstr ACC (RW, savebed_map);    /* map where player will respawn after death */
   shstr ACC (RW, maplevel);       /* On which level is the player? */
   char ACC (RW, spellparam)[MAX_BUF];     /* What param to add to spells */
   sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
                                                         /* the player can see.  For maps smaller than */
                                                         /* MAP_CLIENT_.., the upper left is used */
   shstr ACC (RW, invis_race);             /* What race invisible to? */
-  Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
   MTH static player *create ();
+  static player *find (const_utf8_string name);
   static player *load_pl (object_thawer &thawer);
-  MTH static player *load_pl (const char *path);
+  MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
   bool save_pl (object_freezer &freezer);
   MTH bool save_pl (const char *path);
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
+  MTH void play_sound (faceidx sound, int dx = 0, int dy = 0) const
+  {
+    if (ns)
+      ns->play_sound (sound, dx, dy);
+  }
   // wether the player can "see" this mapspace or not, decided by los
   // 0 - nothing see, 100 - fully visible
   MTH sint8 visibility_at (maptile *map, int x, int y) const;
   MTH void disconnect ();
   MTH void activate ();
   MTH void deactivate ();
-  // enters the initial map, after login or creation
-  MTH void enter_map ();
   MTH void chargen_race_done ();
   MTH void chargen_race_next ();
+  MTH void set_observe (object *ob);
+  void send_msg (int color, const char *type, const char *msg)
+  {
+    ns->send_msg (color, type, msg);
+  }
+  // a prominent box that can easily be escaped away or so
+  // should be used for informative output such as who, maps etc.
+  // will stay on-screen
+  MTH void infobox (const char *title, const char *msg, int color = NDI_BLACK);
+  // a prominent msg that signifies some important event,
+  // an improvement potion effect potion. should not be long.
+  // might time out after a while
+  MTH void statusmsg (const char *msg, int color = NDI_BLACK);
+  // a prominent box that signifies some error such as a failed
+  // improvement potion. should not be long.
+  MTH void failmsg (const char *msg, int color = NDI_RED);
   ~player ();
 private:
   void set_object (object *op);
 typedef object_vector<player, &player::active> playervec;
 extern playervec players;
 #define for_all_players(var)			\
-  for (unsigned _i = 0; _i < players.size (); ++_i)	\
+  for (unsigned _i = 0; _i < ::players.size (); ++_i)	\
-    declvar (player *, var, players [_i])
+    statementvar (player *, var, ::players [_i])
+inline void
+object::statusmsg (const char *msg, int color)
+{
+  if (expect_true (contr)) contr->statusmsg (msg, color);
+}
+inline void
+object::failmsg (const char *msg, int color)
+{
+  if (expect_true (contr)) contr->failmsg (msg, color);
+}

Diff Legend

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

Comparing deliantra/server/include/player.h (file contents): Revision 1.48 by root, Tue Apr 24 00:42:02 2007 UTC vs. Revision 1.75 by root, Fri Dec 28 12:44:45 2007 UTC

Diff Legend

Comparing deliantra/server/include/player.h (file contents):
Revision 1.48 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.75 by root, Fri Dec 28 12:44:45 2007 UTC