--- deliantra/server/common/player.C	2007/02/16 19:43:41	1.21
+++ deliantra/server/common/player.C	2007/05/18 19:46:22	1.28
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -47,7 +47,11 @@
 int
 is_dragon_pl (const object *op)
 {
-  if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0)
+  if (op
+      && op->type == PLAYER
+      && op->arch
+      && op->arch->clone.race
+      && !strcmp (op->arch->clone.race, "dragon"))
     return 1;
 
   return 0;
@@ -79,7 +83,6 @@
   PL_OUT  (gen_sp);
   PL_OUT  (gen_grace);
   PL_OUT  (listening);
-  PL_OUT  (shoottype);
   PL_OUT  (bowtype);
   PL_OUT  (petmode);
   PL_OUT  (peaceful);
@@ -96,6 +99,7 @@
   PL_OUT  (bed_x);
   PL_OUT  (bed_y);
   PL_OUT  (weapon_sp);
+  PL_OUT  (weapon_sp_left);
   PL_OUT2 (Str, orig_stats.Str);
   PL_OUT2 (Dex, orig_stats.Dex);
   PL_OUT2 (Con, orig_stats.Con);
@@ -186,7 +190,6 @@
           case KW_oid:           f.get (pl, f.get_sint32 ()); break;
           case KW_password:      assign (pl->password , f.get_str ()); break;
           case KW_title:         assign (pl->own_title, f.get_str ()); break;
-          case KW_shoottype:     pl->shoottype = (rangetype) f.get_sint32 (); break;
           case KW_bowtype:       pl->bowtype   = (bowtype_t) f.get_sint32 (); break;
           case KW_petmode:       pl->petmode   = (petmode_t) f.get_sint32 (); break;
           case KW_listening:     f.get (pl->listening); break;
@@ -200,6 +203,7 @@
           case KW_bed_x:         f.get (pl->bed_x); break;
           case KW_bed_y:         f.get (pl->bed_y); break;
           case KW_weapon_sp:     f.get (pl->weapon_sp); break;
+          case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
           case KW_Str:           f.get (pl->orig_stats.Str); break;
           case KW_Dex:           f.get (pl->orig_stats.Dex); break;
           case KW_Con:           f.get (pl->orig_stats.Con); break;
@@ -255,7 +259,9 @@
 failure:
   LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
 
-  pl->ob->destroy ();
+  if (pl->ob)
+    pl->ob->destroy ();
+
   pl->destroy ();
 
   return 0;