ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/player.C
(Generate patch)

Comparing deliantra/server/common/player.C (file contents):
Revision 1.50 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.55 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
337 buf << "&lt;"; 338 buf << "&lt;";
338 break; 339 break;
339 340
340 case '\r': 341 case '\r':
341 buf << '\n'; 342 buf << '\n';
343 /* \r\n+ becomes one or more newlines */
344 while (*cfpod == '\n')
345 buf << *cfpod++;
342 break; 346 break;
343 347
344 case '\n': 348 case '\n':
345 if (end == -2) 349 if (end == -2)
346 return cfpod; 350 return cfpod;
… …
396 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 400 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
397 case 'E': pfx = "&" ; sfx = ";" ; break; 401 case 'E': pfx = "&" ; sfx = ";" ; break;
398 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 402 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
399 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 403 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
400 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; 404 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
405 case 'Z': pfx = "" ; sfx = "" ; break;
401 406
402 case 'H': // hint 407 case 'H': // hint
403 { 408 {
404 if (pl->hintmode) 409 if (pl->hintmode)
405 { 410 {
406 cfpod = expand_cfpod (pl, nest, cfpod, end); 411 cfpod = expand_cfpod (pl, nest, cfpod, end);
407 nest.clear (); 412 nest.clear ();
408 413
409 if (pl->hintmode == 1) 414 if (pl->hintmode == 1)
410 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 415 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
411 else 416 else
412 while (*cfpod == ' ') // eat trailing whitespace 417 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
413 ++cfpod; 418 ++cfpod;
414 419
415 goto skip; 420 goto skip;
416 } 421 }
417 else 422 else
418 { 423 {
419 pfx = "<fg name=\"lightblue\">["; 424 pfx = "<fg name=\"lightblue\">[Hint: ";
420 sfx = " (Use hintmode to suppress hints)]</fg>"; 425 sfx = "]</fg>";
421 } 426 }
422 } 427 }
423 break; 428 break;
424 429
425 case 'G': // gender 430 case 'G': // gender

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines