--- deliantra/server/common/player.C 2008/09/08 11:30:53 1.42
+++ deliantra/server/common/player.C 2009/11/07 18:30:05 1.58
@@ -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 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
@@ -48,8 +51,7 @@
if (op
&& op->type == PLAYER
&& op->arch
- && op->arch->race
- && !strcmp (op->arch->race, "dragon"))
+ && op->arch->race == shstr_dragon)
return 1;
return 0;
@@ -66,7 +68,7 @@
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)
@@ -135,6 +137,8 @@
return true;
}
+//-GPL
+
bool
player::save_pl (const char *path)
{
@@ -289,11 +293,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 +309,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 +326,7 @@
return cfpod + end;
case '>':
- if (end)
+ if (end != -1)
{
buf << ">";
break;
@@ -332,42 +344,57 @@
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;
do
buf << *cfpod++;
while (*cfpod == '\n');
}
+ else if (*cfpod == ' ')
+ buf << '\n';
else
buf << ' ';
+ // verbatim block?
+ if (*cfpod == ' ')
+ goto verbatim;
+
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;
@@ -379,33 +406,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 ();
@@ -413,7 +441,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);
@@ -423,10 +451,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;
}
@@ -437,6 +470,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;
}
}
@@ -446,7 +494,7 @@
static dynbuf_text buf(1024, 1024);
buf.clear ();
- ::expand_cfpod (this, buf, cfpod, -1);
+ ::expand_cfpod (this, buf, cfpod);
return &buf;
}