--- deliantra/server/common/player.C 2007/03/01 20:25:06 1.22 +++ deliantra/server/common/player.C 2007/05/09 11:32:29 1.27 @@ -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); @@ -186,7 +189,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;