--- deliantra/server/common/player.C 2010/01/30 23:30:26 1.63
+++ deliantra/server/common/player.C 2012/10/29 23:55:52 1.71
@@ -1,24 +1,24 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 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,2011,2012 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
* Free Software Foundation, either version 3 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.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -85,13 +85,13 @@
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);
- PL_OUT2 (Int, orig_stats.Int);
- PL_OUT2 (Pow, orig_stats.Pow);
- PL_OUT2 (Wis, orig_stats.Wis);
- PL_OUT2 (Cha, orig_stats.Cha);
+ PL_OUT2 (str, orig_stats.Str);
+ PL_OUT2 (dex, orig_stats.Dex);
+ PL_OUT2 (con, orig_stats.Con);
+ PL_OUT2 (int, orig_stats.Int);
+ PL_OUT2 (pow, orig_stats.Pow);
+ PL_OUT2 (wis, orig_stats.Wis);
+ PL_OUT2 (cha, orig_stats.Cha);
PL_OUT2 (lev_array, 10);
@@ -105,7 +105,7 @@
freezer.put (ob->contr);
freezer.put (KW(endplst));
- CLEAR_FLAG (ob, FLAG_WIZ);
+ ob->clr_flag (FLAG_WIZ);
ob->write (freezer);
/* Eneq(@csd.uu.se): Reveal the container if we have one. */
@@ -174,8 +174,8 @@
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_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
- case KW_petmode: pl->petmode = (petmode_t) 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_gender: f.get (pl->gender); break;
case KW_hintmode: f.get (pl->hintmode); break;
case KW_listening: /*TODO*/; break;
@@ -190,13 +190,22 @@
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;
- case KW_Int: f.get (pl->orig_stats.Int); break;
- case KW_Pow: f.get (pl->orig_stats.Pow); break;
- case KW_Wis: f.get (pl->orig_stats.Wis); break;
- case KW_Cha: f.get (pl->orig_stats.Cha); break;
+
+ case KW_Str: // uppercase alias
+ case KW_str: f.get (pl->orig_stats.Str); break;
+ case KW_Dex: // uppercase alias
+ case KW_dex: f.get (pl->orig_stats.Dex); break;
+ case KW_Con: // uppercase alias
+ case KW_con: f.get (pl->orig_stats.Con); break;
+ case KW_Int: // uppercase alias
+ case KW_int: f.get (pl->orig_stats.Int); break;
+ case KW_Pow: // uppercase alias
+ case KW_pow: f.get (pl->orig_stats.Pow); break;
+ case KW_Wis: // uppercase alias
+ case KW_wis: f.get (pl->orig_stats.Wis); break;
+ case KW_Cha: // uppercase alias
+ case KW_cha: f.get (pl->orig_stats.Cha); break;
+
case KW_gen_hp: f.get (pl->gen_hp); break;
case KW_gen_sp: f.get (pl->gen_sp); break;
case KW_gen_grace: f.get (pl->gen_grace); break;
@@ -229,11 +238,9 @@
for (int i = 1; i <= count; i++)
{
- char line [32];
-
- fgets (line, 32, f); pl->levhp [i] = atoi (line);
- fgets (line, 32, f); pl->levsp [i] = atoi (line);
- fgets (line, 32, f); pl->levgrace[i] = atoi (line);
+ f.next_line (); f.get (pl->levhp [i]);
+ f.next_line (); f.get (pl->levsp [i]);
+ f.next_line (); f.get (pl->levgrace[i]);
}
}
break;