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

Comparing deliantra/server/include/player.h (file contents):
Revision 1.103 by root, Fri Mar 26 00:59:21 2010 UTC vs.
Revision 1.116 by root, Wed Dec 5 19:03:26 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 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
  * 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * 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_
   bool ACC (RW, dirty);               // set if player is dirty (not reliable yet!)
   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 last_skill_ob[CS_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
   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]
+  float speed_left_save;                  // speed optimisation, see process_players[12]
   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 */
+  char ACC (RW, password)[256];           /* 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 */
   {
     if (delayed_update)
       ob->update_stats ();
   }
+#if 0
+  enum {
+    SA_SPELLS = 1<<0,
+    SA_EXP    = 1<<1,
+  };
+  uint8 ACxC (RW, stat_update_flags);
+  void need_stat_update (int flags)
+  {
+    stat_update_flags |= flags;
+  }
+#endif
   // return the los value for the given coordinate
   MTH sint8 blocked_los (int dx, int dy) const
   {
     dx += LOS_X0;
     dy += LOS_Y0;
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
   MTH dynbuf_text *expand_cfpod (const_utf8_string cfpod) const;
+  static dynbuf_text *expand_cfpod (int hintmode, int gender, const_utf8_string cfpod);
   MTH void touch () { dirty = true; } // need to touch when logged out and changed
   MTH void play_sound (faceidx sound, int dx = 0, int dy = 0) const
   {
   MTH void statusmsg (const_utf8_string 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_utf8_string msg, int color = NDI_RED);
+  void failmsgf (const_utf8_string format, ...); // always NDI_RED
   MTH void update_spells () const
   {
     if (ns)
       ns->update_spells = true;
     if ((var)->ob->map == (mapp))
 inline void
 object::statusmsg (const_utf8_string msg, int color)
 {
-  if (expect_true (contr)) contr->statusmsg (msg, color);
+  if (ecb_expect_true (contr)) contr->statusmsg (msg, color);
 }
 inline void
 object::failmsg (const_utf8_string msg, int color)
 {
-  if (expect_true (contr)) contr->failmsg (msg, color);
+  if (ecb_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.103 by root, Fri Mar 26 00:59:21 2010 UTC vs. Revision 1.116 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/include/player.h (file contents):
Revision 1.103 by root, Fri Mar 26 00:59:21 2010 UTC vs.
Revision 1.116 by root, Wed Dec 5 19:03:26 2018 UTC