--- deliantra/server/socket/request.C	2007/05/12 19:30:18	1.96
+++ deliantra/server/socket/request.C	2007/05/28 21:22:26	1.100
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program 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
- * (at your option) any later version.
+ * Crossfire TRT 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 (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.
+ * 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
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /**
@@ -742,6 +742,10 @@
   if (pl->combat_ob)
     buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
 
+  //TODO: remove this when slot system is working, this is only for debugging
+  if (pl->ob->chosen_skill)
+    buf << " Skill*: "  << pl->ob->chosen_skill->name;
+
   //TODO: maybe golem should become the current_weapon, quite simply?
   if (pl->golem)
     buf << " Golem*: "  << pl->golem->name;
@@ -765,9 +769,9 @@
                         sl << uint8 (Type) << uint16 (New); \
                        }
 
-#define AddIfFloat(Old,New,Type) if (Old != New) {\
+#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
                         Old = New; \
-                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
+                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
                         }
 
 #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
@@ -830,9 +834,9 @@
   AddIfShort (ns->last_stats.wc,   ob->stats.wc, CS_STAT_WC);
   AddIfShort (ns->last_stats.ac,   ob->stats.ac, CS_STAT_AC);
   AddIfShort (ns->last_stats.dam,  ob->stats.dam, CS_STAT_DAM);
-  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED);
+  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f/TICK);
   AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
-  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP);
+  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
   AddIfInt   (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
 
   flags = 0;