--- deliantra/server/common/player.C 2008/09/09 10:51:59 1.44
+++ 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)
{
@@ -340,6 +344,9 @@
case '\r':
buf << '\n';
+ /* \r\n+ becomes one or more newlines */
+ while (*cfpod == '\n')
+ buf << *cfpod++;
break;
case '\n':
@@ -358,7 +365,9 @@
buf << *cfpod++;
while (*cfpod == '\n');
}
- else if (*cfpod != ' ')
+ else if (*cfpod == ' ')
+ buf << '\n';
+ else
buf << ' ';
// verbatim block?
@@ -397,6 +406,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 +416,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 +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);
@@ -441,6 +451,11 @@
goto skip;
}
+
+ default:
+ pfx = "UNKNOWN_DIRECTIVE{";
+ sfx = "}";
+ break;
}
buf << pfx;
@@ -463,12 +478,12 @@
buf << "";
cfpod = expand_cfpod (pl, buf, cfpod, -2);
buf << "\n";
+
+ while (*cfpod == '\n')
+ buf << *cfpod++;
}
while (*cfpod == ' ');
- while (*cfpod == '\n')
- buf << *cfpod++;
-
break;
}
}