ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/player.C
(Generate patch)

Comparing deliantra/server/common/player.C (file contents):
Revision 1.21 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.26 by root, Tue May 1 05:48:20 2007 UTC

… …
45 * of the dragon race. 45 * of the dragon race.
46 */ 46 */
47int 47int
48is_dragon_pl (const object *op) 48is_dragon_pl (const object *op)
49{ 49{
50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0) 50 if (op
51 && op->type == PLAYER
52 && op->arch
53 && op->arch->clone.race
54 && !strcmp (op->arch->clone.race, "dragon"))
51 return 1; 55 return 1;
52 56
53 return 0; 57 return 0;
54} 58}
55 59
… …
77 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
78 PL_OUT (gen_hp); 82 PL_OUT (gen_hp);
79 PL_OUT (gen_sp); 83 PL_OUT (gen_sp);
80 PL_OUT (gen_grace); 84 PL_OUT (gen_grace);
81 PL_OUT (listening); 85 PL_OUT (listening);
82 PL_OUT (shoottype);
83 PL_OUT (bowtype); 86 PL_OUT (bowtype);
84 PL_OUT (petmode); 87 PL_OUT (petmode);
85 PL_OUT (peaceful); 88 PL_OUT (peaceful);
86 PL_OUT (digestion); 89 PL_OUT (digestion);
87 PL_OUT2 (pickup, mode); 90 PL_OUT2 (pickup, mode);
… …
184 return pl; 187 return pl;
185 188
186 case KW_oid: f.get (pl, f.get_sint32 ()); break; 189 case KW_oid: f.get (pl, f.get_sint32 ()); break;
187 case KW_password: assign (pl->password , f.get_str ()); break; 190 case KW_password: assign (pl->password , f.get_str ()); break;
188 case KW_title: assign (pl->own_title, f.get_str ()); break; 191 case KW_title: assign (pl->own_title, f.get_str ()); break;
189 case KW_shoottype: pl->shoottype = (rangetype) f.get_sint32 (); break;
190 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; 192 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
191 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; 193 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
192 case KW_listening: f.get (pl->listening); break; 194 case KW_listening: f.get (pl->listening); break;
193 case KW_peaceful: f.get (pl->peaceful); break; 195 case KW_peaceful: f.get (pl->peaceful); break;
194 case KW_digestion: f.get (pl->digestion); break; 196 case KW_digestion: f.get (pl->digestion); break;
… …
253 } 255 }
254 256
255failure: 257failure:
256 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); 258 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
257 259
260 if (pl->ob)
258 pl->ob->destroy (); 261 pl->ob->destroy ();
262
259 pl->destroy (); 263 pl->destroy ();
260 264
261 return 0; 265 return 0;
262} 266}
263 267

Diff Legend

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