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.44 by root, Tue Sep 9 10:51:59 2008 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>
… …
46is_dragon_pl (const object *op) 47is_dragon_pl (const object *op)
47{ 48{
48 if (op 49 if (op
49 && op->type == PLAYER 50 && op->type == PLAYER
50 && op->arch 51 && op->arch
51 && op->arch->race 52 && op->arch->race == shstr_dragon)
52 && !strcmp (op->arch->race, "dragon"))
53 return 1; 53 return 1;
54 54
55 return 0; 55 return 0;
56} 56}
57 57
… …
338 buf << "&lt;"; 338 buf << "&lt;";
339 break; 339 break;
340 340
341 case '\r': 341 case '\r':
342 buf << '\n'; 342 buf << '\n';
343 /* \r\n+ becomes one or more newlines */
344 while (*cfpod == '\n')
345 buf << *cfpod++;
343 break; 346 break;
344 347
345 case '\n': 348 case '\n':
346 if (end == -2) 349 if (end == -2)
347 return cfpod; 350 return cfpod;
… …
356 --cfpod; 359 --cfpod;
357 do 360 do
358 buf << *cfpod++; 361 buf << *cfpod++;
359 while (*cfpod == '\n'); 362 while (*cfpod == '\n');
360 } 363 }
361 else if (*cfpod != ' ') 364 else if (*cfpod == ' ')
365 buf << '\n';
366 else
362 buf << ' '; 367 buf << ' ';
363 368
364 // verbatim block? 369 // verbatim block?
365 if (*cfpod == ' ') 370 if (*cfpod == ' ')
366 goto verbatim; 371 goto verbatim;
… …
395 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 400 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
396 case 'E': pfx = "&" ; sfx = ";" ; break; 401 case 'E': pfx = "&" ; sfx = ";" ; break;
397 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 402 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
398 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 403 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
399 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;
400 406
401 case 'H': // hint 407 case 'H': // hint
402 { 408 {
403 if (pl->hintmode) 409 if (pl->hintmode)
404 { 410 {
405 cfpod = expand_cfpod (pl, nest, cfpod, end); 411 cfpod = expand_cfpod (pl, nest, cfpod, end);
406 nest.clear (); 412 nest.clear ();
407 413
408 if (pl->hintmode == 1) 414 if (pl->hintmode == 1)
409 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 415 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
410 else 416 else
411 while (*cfpod == ' ') // eat trailing whitespace 417 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
412 ++cfpod; 418 ++cfpod;
413 419
414 goto skip; 420 goto skip;
415 } 421 }
416 else 422 else
417 { 423 {
418 pfx = "<fg name=\"lightblue\">["; 424 pfx = "<fg name=\"lightblue\">[Hint: ";
419 sfx = " (Use hintmode to suppress hints)]</fg>"; 425 sfx = "]</fg>";
420 } 426 }
421 } 427 }
422 break; 428 break;
423 429
424 case 'G': // gender 430 case 'G': // gender
425 { 431 {
426 expand_cfpod (pl, nest, cfpod, end); 432 cfpod = expand_cfpod (pl, nest, cfpod, end);
427 nest << '\0'; // zero-terminate 433 nest << '\0'; // zero-terminate
428 434
429 const char *str = nest.linearise (); 435 const char *str = nest.linearise ();
430 const char *sep = strchr (str, '|'); 436 const char *sep = strchr (str, '|');
431 437
432 if (sep) 438 if (sep)
433 { 439 {
434 if (pl->gender || 1) 440 if (pl->gender)
435 buf.add (sep + 1, nest.size () - (sep - str) - 2); 441 buf.add (sep + 1, nest.size () - (sep - str) - 2);
436 else 442 else
437 buf.add (str, sep - str); 443 buf.add (str, sep - str);
438 } 444 }
439 445
… …
461 do 467 do
462 { 468 {
463 buf << "<tt>"; 469 buf << "<tt>";
464 cfpod = expand_cfpod (pl, buf, cfpod, -2); 470 cfpod = expand_cfpod (pl, buf, cfpod, -2);
465 buf << "</tt>\n"; 471 buf << "</tt>\n";
472
473 while (*cfpod == '\n')
474 buf << *cfpod++;
466 } 475 }
467 while (*cfpod == ' '); 476 while (*cfpod == ' ');
468 477
469 while (*cfpod == '\n')
470 buf << *cfpod++;
471
472 break; 478 break;
473 } 479 }
474} 480}
475 481
476dynbuf_text * 482dynbuf_text *

Diff Legend

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