--- deliantra/server/common/player.C 2008/09/08 11:27:24 1.41
+++ deliantra/server/common/player.C 2010/03/24 16:44:38 1.64
@@ -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 (©) 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
*
- * 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->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)
{
@@ -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;
@@ -268,7 +262,7 @@
return 0;
}
-const char *
+const_utf8_string
player::killer_name () const
{
static char buf [2048];
@@ -289,11 +283,12 @@
}
// expand one level of cfpod
-// end == -1, till eos
-// end == 0, one level of '>'
-// end >= 1, this many levels of " >>>"
+// end == -2, till '\n'
+// end == -1, till '>'
+// end == 0, till eos
+// end >= 1, levels of " >>>"
static const char *
-expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end)
+expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
{
static dynbuf_text nest(128, 128);
@@ -304,7 +299,14 @@
return cfpod - 1;
case ' ':
- if (end <= 0)
+ // verbatim block?
+ if (!buf.size () && !end)
+ {
+ --cfpod;
+ goto verbatim;
+ }
+
+ if (end < 1)
goto passthrough;
for (int i = 0; i < end; ++i)
@@ -314,7 +316,7 @@
return cfpod + end;
case '>':
- if (end)
+ if (end != -1)
{
buf << ">";
break;
@@ -330,40 +332,59 @@
buf << "<";
break;
+ case '\r':
+ buf << '\n';
+ /* \r\n+ becomes one or more newlines */
+ while (*cfpod == '\n')
+ buf << *cfpod++;
+ break;
+
case '\n':
- if (*cfpod == ' ')
- goto passthrough;
- else if (*cfpod == '\n')
+ if (end == -2)
+ return cfpod;
+
+ // \n\ => newline, tt
+ // \n\n => \n\n
+ // \n => single space
+
+ // two or more newlines will be copied verbatim, one is replaced by space
+ if (*cfpod == '\n')
{
--cfpod;
- while (*cfpod == '\n')
+ do
buf << *cfpod++;
-
- goto skip;
+ while (*cfpod == '\n');
}
+ else if (*cfpod == ' ')
+ buf << '\n';
+ else
+ buf << ' ';
+
+ // verbatim block?
+ if (*cfpod == ' ')
+ goto verbatim;
- buf << ' ';
break;
case 'B': case 'C': case 'E': case 'G':
case 'H': case 'I': case 'T': case 'U':
case 'Z':
{
- int len = 0;
+ int end = 0;
- while (cfpod [len] == '<')
- ++len;
+ while (cfpod [end] == '<')
+ ++end;
- if (!len)
+ if (!end)
goto passthrough;
- if (len == 1 || cfpod [len] != ' ')
+ if (end == 1 || cfpod [end] != ' ')
{
- len = 0;
+ end = -1;
++cfpod;
}
else
- cfpod += len + 1;
+ cfpod += end + 1;
const char *pfx, *sfx;
@@ -375,33 +396,34 @@
case 'I': pfx = "" ; sfx = "" ; break;
case 'U': pfx = "" ; sfx = "" ; break;
case 'T': pfx = ""; sfx = ""; break;
+ case 'Z': pfx = "" ; sfx = "" ; break;
case 'H': // hint
{
if (pl->hintmode)
{
- cfpod = expand_cfpod (pl, nest, cfpod, len);
+ cfpod = expand_cfpod (pl, nest, cfpod, end);
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, len);
+ cfpod = expand_cfpod (pl, nest, cfpod, end);
nest << '\0'; // zero-terminate
const char *str = nest.linearise ();
@@ -409,7 +431,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);
@@ -419,10 +441,15 @@
goto skip;
}
+
+ default:
+ pfx = "UNKNOWN_DIRECTIVE{";
+ sfx = "}";
+ break;
}
buf << pfx;
- cfpod = expand_cfpod (pl, buf, cfpod, len);
+ cfpod = expand_cfpod (pl, buf, cfpod, end);
buf << sfx;
}
@@ -433,6 +460,21 @@
buf << ch;
skip:
break;
+
+ verbatim:
+ // elements cannot currently span multiple lines
+ do
+ {
+ buf << "";
+ cfpod = expand_cfpod (pl, buf, cfpod, -2);
+ buf << "\n";
+
+ while (*cfpod == '\n')
+ buf << *cfpod++;
+ }
+ while (*cfpod == ' ');
+
+ break;
}
}
@@ -442,7 +484,7 @@
static dynbuf_text buf(1024, 1024);
buf.clear ();
- ::expand_cfpod (this, buf, cfpod, -1);
+ ::expand_cfpod (this, buf, cfpod);
return &buf;
}