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

Comparing deliantra/server/include/player.h (file contents):
Revision 1.86 by root, Sat Dec 20 02:32:31 2008 UTC vs.
Revision 1.99 by root, Thu Nov 19 04:30:46 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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 PLAYER_H_
+#define PLAYER_H_
+//+GPL
 enum bowtype_t
 {
   bow_normal     = 0,
   bow_threewide  = 1,
   sint64 ACC (RW, total_exp);
   uint32 ACC (RW, kills);
 };
 // used for pet monster logic etc.
-static bool
+static inline bool
 same_party (partylist *a, partylist *b)
 {
   return a == b && a;
 }
   usekeytype ACC (RW, usekeys);       /* Method for finding keys for doors */
   unapplymode ACC (RW, unapply);      /* Method for auto unapply */
   uint32 ACC (RW, count);             /* Any numbers typed before a command */
   uint32 ACC (RW, mode);              /* Mode of player for pickup. */
-  int ACC (RW, digestion);          /* Any bonuses/penalties to digestion */
+  int ACC (RW, digestion);            /* Any bonuses/penalties to digestion */
-  int ACC (RW, gen_hp);             /* Bonuses to regeneration speed of hp */
+  int ACC (RW, gen_hp);               /* Bonuses to regeneration speed of hp */
-  int ACC (RW, gen_sp);             /* Bonuses to regeneration speed of sp */
+  int ACC (RW, gen_sp);               /* Bonuses to regeneration speed of sp */
-  int ACC (RW, gen_sp_armour);      /* Penalty to sp regen from armour */
+  int ACC (RW, gen_sp_armour);        /* Penalty to sp regen from armour */
-  int ACC (RW, gen_grace);          /* Bonuses to regeneration speed of grace */
+  int ACC (RW, gen_grace);            /* Bonuses to regeneration speed of grace */
-  int ACC (RW, item_power);        /* Total item power of objects equipped */
+  int ACC (RW, item_power);           /* Total item power of objects equipped */
   uint8 ACC (RW, gender);             /* 0 male, 1 female, others not yet defined */
   uint8 ACC (RW, hintmode);           /* 0 full, 1 hint, 2 disable */
   /* Try to put all the bitfields together - saves some small amount of memory */
   bool ACC (RW, braced);              /* Will not move if braced, only attack */
   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)
+  object_ptr ACC (RW, observe);       // the object that is being observed (never 0)
+  object_ptr ACC (RW, viewpoint);     // the object that is being viewed in the map (never 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 ACC (RW, levsp[11]);              /* Same for sp */
   sint8 ACC (RW, levgrace[11]);           /* And same for grace */
   object_ptr ACC (RW, killer);            /* Who last tried to kill this player (this object is usually destroyed) */
+  float speed_left_save;                  // spee doptimisation, see process_players[12]
-  char write_buf[MAX_BUF];      /* Holds arbitrary input from client */ /* should go */
+  char write_buf[MAX_BUF];                /* Holds arbitrary input from client */ /* should go */
   char ACC (RW, password)[16];            /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
   partylist *ACC (RW, party);             /* Party this player is part of */
   partylist *ACC (RW, party_to_join);     /* used when player wants to join a party */
   /* but we will have to get password first */
   /* so we have to remember which party to */
   /* join */
-  char ACC (RW, search_str)[MAX_BUF];     /* Item we are looking for */
+  char ACC (RW, search_str)[256];         /* Item we are looking for */
   sint16 ACC (RW, encumbrance);           /* How much our player is encumbered  */
   uint16 ACC (RW, outputs_sync);          /* How often to print, no matter what */
   uint16 ACC (RW, outputs_count);         /* Print if this count is exceeded */
   object_ptr ACC (RW, mark);                 /* marked object */
   /* Special DM fields */
   int ACC (RW, stack_position);           /* Current stack position, 0 for no item */
   sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
                                                 /* the player can see.  For maps smaller than */
                                                 /* MAP_CLIENT_.., the center is used */
+//-GPL
+  // stats updates are very costly, so delay them if at all possible
+  bool ACC (RW, delayed_update);
+  void queue_stats_update ()
+  {
+    delayed_update = true;
+  }
+  void need_updated_stats ()
+  {
+    if (delayed_update)
+      ob->update_stats ();
+  }
   // return the los value for the given coordinate
   MTH sint8 blocked_los (int dx, int dy) const
   {
     dx += LOS_X0;
     dy += LOS_Y0;
   {
     return los[dx + LOS_X0][dy + LOS_Y0];
   }
   MTH void clear_los (sint8 value = LOS_BLOCKED);
+  MTH void update_los ();
   shstr ACC (RW, invis_race);             /* What race invisible to? */
   MTH const char *killer_name () const; // makes a string out of ->killer
   static player *load_pl (object_thawer &thawer);
   MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
   MTH void link_skills ();
-  MTH object *find_skill (const char *name) const;
+  MTH object *find_skill (shstr_cmp name) const;
-  object *find_skill (const shstr &name) const;
   bool save_pl (object_freezer &freezer);
   MTH bool save_pl (const char *path);
   void do_destroy ();
     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
+  // 0 - bright, 3 dark, 4 too dark, 100 blocked or out of range
-  MTH sint8 visibility_at (maptile *map, int x, int y) const;
+  MTH sint8 darkness_at (maptile *map, int x, int y) const;
   MTH void connect (client *ns);
   MTH void disconnect ();
   MTH void activate ();
   MTH void chargen_race_done ();
   MTH void chargen_race_next ();
   MTH void set_observe (object_ornull *ob);
+  MTH void set_viewpoint (object_ornull *ob);
   void send_msg (int color, const char *type, const char *msg)
   {
     ns->send_msg (color, type, msg);
   }
   // 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);
+  MTH void update_spells () const
+  {
+    if (ns)
+      ns->update_spells = true;
+  }
   ~player ();
 private:
   void set_object (object *op);
   player ();
 #define for_all_players(var)			\
   for (unsigned _i = 0; _i < ::players.size (); ++_i)	\
     statementvar (player *, var, ::players [_i])
+#define for_all_players_on_map(var,mapp)		\
+  for_all_players(var)					\
+    if ((var)->ob->map == (mapp))
 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);
 }
+#endif

Diff Legend

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

Comparing deliantra/server/include/player.h (file contents): Revision 1.86 by root, Sat Dec 20 02:32:31 2008 UTC vs. Revision 1.99 by root, Thu Nov 19 04:30:46 2009 UTC

Diff Legend

Comparing deliantra/server/include/player.h (file contents):
Revision 1.86 by root, Sat Dec 20 02:32:31 2008 UTC vs.
Revision 1.99 by root, Thu Nov 19 04:30:46 2009 UTC