--- deliantra/server/common/player.C 2007/05/18 19:46:22 1.28 +++ deliantra/server/common/player.C 2008/09/29 10:32:50 1.47 @@ -1,29 +1,27 @@ /* - * CrossFire, A Multiplayer game - * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen - * - * This program is free software; you can redistribute it and/or modify + * 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 + * + * 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 2 of the License, or + * 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 + * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include -#include /* Determine if the attacktype represented by the * specified attack-number is enabled for dragon players. @@ -50,8 +48,8 @@ if (op && op->type == PLAYER && op->arch - && op->arch->clone.race - && !strcmp (op->arch->clone.race, "dragon")) + && op->arch->race + && !strcmp (op->arch->race, "dragon")) return 1; return 0; @@ -79,10 +77,11 @@ PL_OUT (password); PL_OUT2 (title, own_title); + PL_OUT (gender); + PL_OUT (hintmode); PL_OUT (gen_hp); PL_OUT (gen_sp); PL_OUT (gen_grace); - PL_OUT (listening); PL_OUT (bowtype); PL_OUT (petmode); PL_OUT (peaceful); @@ -112,9 +111,9 @@ for (int i = 1; i <= 10; i++) { - fprintf (freezer, "%d\n", levhp [i]); - fprintf (freezer, "%d\n", levsp [i]); - fprintf (freezer, "%d\n", levgrace[i]); + freezer.add (levhp [i]); freezer.add ('\n'); + freezer.add (levsp [i]); freezer.add ('\n'); + freezer.add (levgrace[i]); freezer.add ('\n'); } freezer.put (ob->contr); @@ -192,7 +191,9 @@ 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_listening: f.get (pl->listening); break; + case KW_gender: f.get (pl->gender); break; + case KW_hintmode: f.get (pl->hintmode); break; + case KW_listening: /*TODO*/; break; case KW_peaceful: f.get (pl->peaceful); break; case KW_digestion: f.get (pl->digestion); break; case KW_pickup: f.get (pl->mode); break; @@ -267,16 +268,219 @@ return 0; } -player * -player::load_pl (const char *path) +const char * +player::killer_name () const { - object_thawer f (path); + static char buf [2048]; + + if (!killer) + return "a dungeon collapse"; + else if (killer->contr) + snprintf (buf, sizeof (buf), "%s the %s", &killer->name, + *killer->contr->own_title ? killer->contr->own_title : killer->contr->title); + else if (killer->type == DEEP_SWAMP) + snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name); + else if (killer->owner) + snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name); + else + return &killer->name; + + return buf; +} + +// expand one level of cfpod +// 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 = 0) +{ + static dynbuf_text nest(128, 128); + + for (;;) + switch (char ch = *cfpod++) + { + case 0: + return cfpod - 1; + + case ' ': + // verbatim block? + if (!buf.size () && !end) + { + --cfpod; + goto verbatim; + } + + if (end < 1) + goto passthrough; + + for (int i = 0; i < end; ++i) + if (cfpod [i] != '>') + goto passthrough; + + return cfpod + end; + + case '>': + if (end != -1) + { + buf << ">"; + break; + } + + return cfpod; - if (!f) - return 0; + case '&': + buf << "&"; + break; + + case '<': + buf << "<"; + break; + + case '\r': + buf << '\n'; + break; + + case '\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 << ' '; + + // 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 end = 0; + + while (cfpod [end] == '<') + ++end; + + if (!end) + goto passthrough; + + if (end == 1 || cfpod [end] != ' ') + { + end = -1; + ++cfpod; + } + else + cfpod += end + 1; + + const char *pfx, *sfx; + + switch (ch) + { + case 'B': pfx = "" ; sfx = "" ; break; + case 'C': pfx = "" ; sfx = "" ; break; + case 'E': pfx = "&" ; sfx = ";" ; break; + case 'I': pfx = "" ; sfx = "" ; break; + case 'U': pfx = "" ; sfx = "" ; break; + case 'T': pfx = ""; sfx = ""; break; + + case 'H': // hint + { + if (pl->hintmode) + { + cfpod = expand_cfpod (pl, nest, cfpod, end); + nest.clear (); + + if (pl->hintmode == 1) + buf << "[Hint suppressed, see hintmode]"; + else + while (*cfpod == ' ') // eat trailing whitespace + ++cfpod; + + goto skip; + } + else + { + pfx = "["; + sfx = " (Use hintmode to suppress hints)]"; + } + } + break; + + case 'G': // gender + { + cfpod = expand_cfpod (pl, nest, cfpod, end); + nest << '\0'; // zero-terminate + + const char *str = nest.linearise (); + const char *sep = strchr (str, '|'); + + if (sep) + { + if (pl->gender) + buf.add (sep + 1, nest.size () - (sep - str) - 2); + else + buf.add (str, sep - str); + } + + nest.clear (); + + goto skip; + } + } + + buf << pfx; + cfpod = expand_cfpod (pl, buf, cfpod, end); + buf << sfx; + } + + break; + + default: + passthrough: + buf << ch; + skip: + break; + + verbatim: + // elements cannot currently span multiple lines + do + { + buf << ""; + cfpod = expand_cfpod (pl, buf, cfpod, -2); + buf << "\n"; + } + while (*cfpod == ' '); + + while (*cfpod == '\n') + buf << *cfpod++; + + break; + } +} + +dynbuf_text * +player::expand_cfpod (const char *cfpod) const +{ + static dynbuf_text buf(1024, 1024); + buf.clear (); - f.next (); + ::expand_cfpod (this, buf, cfpod); - return load_pl (f); + return &buf; }