--- deliantra/server/include/network.h	2009/10/12 14:00:58	1.24
+++ deliantra/server/include/network.h	2010/04/15 00:36:51	1.30
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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
@@ -40,12 +40,15 @@
  * 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).
@@ -119,22 +122,6 @@
 #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
@@ -152,6 +139,7 @@
 
 /* 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
@@ -190,11 +178,13 @@
 /* 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
+
 struct data
 {
   unsigned int len;
@@ -298,7 +288,7 @@
 
   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);