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

Comparing deliantra/server/include/network.h (file contents):
Revision 1.22 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.36 by root, Wed Nov 14 23:24:27 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008 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,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 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
+ * 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>
  */
 /* This file defines various flags that both the new client and
  * newserver uses.  These should never be changed, only expanded.
  * or server area.  But keeping one common file should make things
  * more reliable, as both the client and server will definately be
  * talking about the same values.
  */
 #ifndef NETWORK_H
 #define NETWORK_H
+//+GPL
 #include <cstdarg>
+#include "compiler.h"
 /* Maximum size of any packet we expect.
  *
  * The size must be the same in the server and the client (stupid).
  * TODO: make the actual network configurable per client and use 2**16.
 #define CS_QUERY_YESNO	0x1	/* Yes/no question */
 #define CS_QUERY_SINGLECHAR 0x2	/* Single character response expected */
 #define CS_QUERY_HIDEINPUT 0x4	/* Hide input being entered */
 /* These are multiplication values that should be used when changing
  * floats to ints, and vice version.  MULTI is integer representatin
  * (float to int), MULTF is float, for going from int to float.
  */
 #define FLOAT_MULTI	100000
 #define FLOAT_MULTF	100000.0
 #define CS_STAT_RES_DEPLETE	114
 #define CS_STAT_RES_DEATH	115
 #define CS_STAT_RES_HOLYWORD	116
 #define CS_STAT_RES_BLIND	117
-/* Start & end of skill experience + skill level, inclusive. */
-#define CS_STAT_SKILLEXP_START 118
-#define CS_STAT_SKILLEXP_END 129
-#define CS_STAT_SKILLEXP_AGILITY 118
-#define CS_STAT_SKILLEXP_AGLEVEL 119
-#define CS_STAT_SKILLEXP_PERSONAL 120
-#define CS_STAT_SKILLEXP_PELEVEL 121
-#define CS_STAT_SKILLEXP_MENTAL 122
-#define CS_STAT_SKILLEXP_MELEVEL 123
-#define CS_STAT_SKILLEXP_PHYSIQUE 124
-#define CS_STAT_SKILLEXP_PHLEVEL 125
-#define CS_STAT_SKILLEXP_MAGIC 126
-#define CS_STAT_SKILLEXP_MALEVEL 127
-#define CS_STAT_SKILLEXP_WISDOM 128
-#define CS_STAT_SKILLEXP_WILEVEL 129
 /* CS_STAT_SKILLINFO is used as the starting index point.  Skill number->name
  * map is generated dynamically for the client, so a bunch of entries will
  * be used here.  CS_NUM_SKILLS does not match how many skills there really
  * are - instead, it is used as a range of values so that the client
  * can have some idea how many skill categories there may be.
 #define SF_FIREON   0x01
 #define SF_RUNON    0x02
 /* Flags for the item command */
 enum {a_none, a_readied, a_wielded, a_worn, a_active, a_applied};
 #define F_APPLIED       0x000F
 #define F_LOCATION      0x00F0
 #define F_UNPAID        0x0200
 #define F_MAGIC         0x0400
 #define F_CURSED        0x0800
 #define UPD_NROF	0x80
 /* The flag values sent by the updspell command */
 #define UPD_SP_MANA	0x01
 #define UPD_SP_GRACE	0x02
-#define UPD_SP_DAMAGE	0x04
+#define UPD_SP_LEVEL	0x04 // was UPD_SP_DAMAGE in <= server 2.93, client 2.10
 #define SOUND_NORMAL	0
 #define SOUND_SPELL	1
+//-GPL
+template<int unique>
-struct data
+struct databuf
 {
   unsigned int len;
   const void *ptr;
-  data   (const void *ptr, int len) : len (len), ptr (ptr) { }
+  databuf (const void *ptr, int len) : len (len), ptr (ptr) { }
-  data   (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
+  databuf (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data   (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  databuf (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
-  data   (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
+  databuf (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
-struct data8
+using data_n = databuf<0>;
-{
+using data8  = databuf<1>;
-  unsigned int len;
+using data16 = databuf<2>;
-  const void *ptr;
-  data8  (const void *ptr, int len) : len (len), ptr (ptr) { }
-  data8  (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data8  (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
-  data8  (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
-};
-struct data16
-{
-  unsigned int len;
-  const void *ptr;
-  data16 (const void *ptr, int len) : len (len), ptr (ptr) { }
-  data16 (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data16 (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
-  data16 (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
-};
 struct ber32
 {
   enum { size = 5 }; // maximum length of an encoded ber32
   uint32 val;
   packet &operator <<(sint64 v) { return *this << (uint64)v; }
   // checked
   packet &operator <<(const ber32 v);
-  packet &operator <<(const data   &v);
+  packet &operator <<(const data_n &v);
   packet &operator <<(const data8  &v);
   packet &operator <<(const data16 &v);
   packet &operator <<(const char *v);
-  packet &operator <<(const shstr &sh) { return *this << data (&sh, sh.length ()); }
+  packet &operator <<(shstr_tmp sh) { return *this << data_n (sh); }
-  packet &operator <<(const std::string &s) { return *this << data (s.data (), s.size ()); }
+  packet &operator <<(const std::string &s) { return *this << data_n (s.data (), s.size ()); }
   void vprintf (const char *format, va_list ap);
-  void printf (const char *format, ...)
+  void printf (const char *format, ...) attribute ((format (printf, 2, 3)))
   {
     va_list ap;
     va_start (ap, format);
     vprintf (format, ap);
     va_end (ap);

Diff Legend

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

Comparing deliantra/server/include/network.h (file contents): Revision 1.22 by root, Mon Sep 8 11:27:25 2008 UTC vs. Revision 1.36 by root, Wed Nov 14 23:24:27 2018 UTC

Diff Legend

Comparing deliantra/server/include/network.h (file contents):
Revision 1.22 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.36 by root, Wed Nov 14 23:24:27 2018 UTC