--- deliantra/server/common/player.C 2008/09/09 10:51:59 1.44
+++ deliantra/server/common/player.C 2011/04/23 04:56:46 1.69
@@ -1,28 +1,31 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 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 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 GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
*/
#include
+//+GPL
+
/* Determine if the attacktype represented by the
* specified attack-number is enabled for dragon players.
* A dragon player (quetzal) can gain resistances for
@@ -39,23 +42,6 @@
}
/*
- * returns true if the adressed object 'ob' is a player
- * of the dragon race.
- */
-int
-is_dragon_pl (const object *op)
-{
- if (op
- && op->type == PLAYER
- && op->arch
- && op->arch->race
- && !strcmp (op->arch->race, "dragon"))
- return 1;
-
- return 0;
-}
-
-/*
* If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
*/
bool
@@ -66,14 +52,14 @@
int wiz = ob->flag [FLAG_WIZ];
/* Eneq(@csd.uu.se): If we have an open container hide it. */
- object *container = ob->container;
+ object *container = ob->container_ ();
ob->container = 0;
if (ob->map)
maplevel = ob->map->path;
-#define PL_OUT(k) freezer.put (KW_ ## k, k)
-#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
+#define PL_OUT(k) freezer.put (KW(k), k)
+#define PL_OUT2(k,v) freezer.put (KW(k), v)
PL_OUT (password);
PL_OUT2 (title, own_title);
@@ -90,8 +76,8 @@
PL_OUT (outputs_sync);
PL_OUT (outputs_count);
- freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers"));
- freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
+ freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
+ freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
PL_OUT2 (map, maplevel);
PL_OUT (savebed_map);
@@ -99,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);
@@ -117,14 +103,11 @@
}
freezer.put (ob->contr);
- freezer.put (KW_endplst);
+ freezer.put (KW(endplst));
- SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
- CLEAR_FLAG (ob, FLAG_WIZ);
+ ob->clr_flag (FLAG_WIZ);
ob->write (freezer);
- CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
-
/* Eneq(@csd.uu.se): Reveal the container if we have one. */
ob->container = container;
@@ -135,6 +118,8 @@
return true;
}
+//-GPL
+
bool
player::save_pl (const char *path)
{
@@ -189,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;
@@ -205,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;
@@ -244,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;
@@ -268,7 +260,7 @@
return 0;
}
-const char *
+const_utf8_string
player::killer_name () const
{
static char buf [2048];
@@ -340,6 +332,9 @@
case '\r':
buf << '\n';
+ /* \r\n+ becomes one or more newlines */
+ while (*cfpod == '\n')
+ buf << *cfpod++;
break;
case '\n':
@@ -358,7 +353,9 @@
buf << *cfpod++;
while (*cfpod == '\n');
}
- else if (*cfpod != ' ')
+ else if (*cfpod == ' ')
+ buf << '\n';
+ else
buf << ' ';
// verbatim block?
@@ -397,6 +394,7 @@
case 'I': pfx = "" ; sfx = "" ; break;
case 'U': pfx = "" ; sfx = "" ; break;
case 'T': pfx = ""; sfx = ""; break;
+ case 'Z': pfx = "" ; sfx = "" ; break;
case 'H': // hint
{
@@ -406,24 +404,24 @@
nest.clear ();
if (pl->hintmode == 1)
- buf << "[Hint suppressed, see hintmode]";
+ buf << "[Hint available]";
else
- while (*cfpod == ' ') // eat trailing whitespace
+ while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
++cfpod;
goto skip;
}
else
{
- pfx = "[";
- sfx = " (Use hintmode to suppress hints)]";
+ pfx = "[Hint: ";
+ sfx = "]";
}
}
break;
case 'G': // gender
{
- expand_cfpod (pl, nest, cfpod, end);
+ cfpod = expand_cfpod (pl, nest, cfpod, end);
nest << '\0'; // zero-terminate
const char *str = nest.linearise ();
@@ -431,7 +429,7 @@
if (sep)
{
- if (pl->gender || 1)
+ if (pl->gender)
buf.add (sep + 1, nest.size () - (sep - str) - 2);
else
buf.add (str, sep - str);
@@ -441,6 +439,11 @@
goto skip;
}
+
+ default:
+ pfx = "UNKNOWN_DIRECTIVE{";
+ sfx = "}";
+ break;
}
buf << pfx;
@@ -463,12 +466,12 @@
buf << "";
cfpod = expand_cfpod (pl, buf, cfpod, -2);
buf << "\n";
+
+ while (*cfpod == '\n')
+ buf << *cfpod++;
}
while (*cfpod == ' ');
- while (*cfpod == '\n')
- buf << *cfpod++;
-
break;
}
}