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.47 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.58 by root, Sat Nov 7 18:30:05 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>
26
27//+GPL
25 28
26/* Determine if the attacktype represented by the 29/* Determine if the attacktype represented by the
27 * specified attack-number is enabled for dragon players. 30 * specified attack-number is enabled for dragon players.
28 * A dragon player (quetzal) can gain resistances for 31 * A dragon player (quetzal) can gain resistances for
29 * all enabled attacktypes. 32 * all enabled attacktypes.
… …
46is_dragon_pl (const object *op) 49is_dragon_pl (const object *op)
47{ 50{
48 if (op 51 if (op
49 && op->type == PLAYER 52 && op->type == PLAYER
50 && op->arch 53 && op->arch
51 && op->arch->race 54 && op->arch->race == shstr_dragon)
52 && !strcmp (op->arch->race, "dragon"))
53 return 1; 55 return 1;
54 56
55 return 0; 57 return 0;
56} 58}
57 59
… …
64 INVOKE_PLAYER (SAVE, ob->contr); 66 INVOKE_PLAYER (SAVE, ob->contr);
65 67
66 int wiz = ob->flag [FLAG_WIZ]; 68 int wiz = ob->flag [FLAG_WIZ];
67 69
68 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 70 /* Eneq(@csd.uu.se): If we have an open container hide it. */
69 object *container = ob->container; 71 object *container = ob->container_ ();
70 ob->container = 0; 72 ob->container = 0;
71 73
72 if (ob->map) 74 if (ob->map)
73 maplevel = ob->map->path; 75 maplevel = ob->map->path;
74 76
… …
132 134
133 INVOKE_PLAYER (SAVE_DONE, ob->contr); 135 INVOKE_PLAYER (SAVE_DONE, ob->contr);
134 136
135 return true; 137 return true;
136} 138}
139
140//-GPL
137 141
138bool 142bool
139player::save_pl (const char *path) 143player::save_pl (const char *path)
140{ 144{
141 object_freezer freezer; 145 object_freezer freezer;
… …
338 buf << "&lt;"; 342 buf << "&lt;";
339 break; 343 break;
340 344
341 case '\r': 345 case '\r':
342 buf << '\n'; 346 buf << '\n';
347 /* \r\n+ becomes one or more newlines */
348 while (*cfpod == '\n')
349 buf << *cfpod++;
343 break; 350 break;
344 351
345 case '\n': 352 case '\n':
346 if (end == -2) 353 if (end == -2)
347 return cfpod; 354 return cfpod;
… …
356 --cfpod; 363 --cfpod;
357 do 364 do
358 buf << *cfpod++; 365 buf << *cfpod++;
359 while (*cfpod == '\n'); 366 while (*cfpod == '\n');
360 } 367 }
361 else if (*cfpod != ' ') 368 else if (*cfpod == ' ')
369 buf << '\n';
370 else
362 buf << ' '; 371 buf << ' ';
363 372
364 // verbatim block? 373 // verbatim block?
365 if (*cfpod == ' ') 374 if (*cfpod == ' ')
366 goto verbatim; 375 goto verbatim;
… …
395 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 404 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
396 case 'E': pfx = "&" ; sfx = ";" ; break; 405 case 'E': pfx = "&" ; sfx = ";" ; break;
397 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 406 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
398 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 407 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
399 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; 408 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
409 case 'Z': pfx = "" ; sfx = "" ; break;
400 410
401 case 'H': // hint 411 case 'H': // hint
402 { 412 {
403 if (pl->hintmode) 413 if (pl->hintmode)
404 { 414 {
405 cfpod = expand_cfpod (pl, nest, cfpod, end); 415 cfpod = expand_cfpod (pl, nest, cfpod, end);
406 nest.clear (); 416 nest.clear ();
407 417
408 if (pl->hintmode == 1) 418 if (pl->hintmode == 1)
409 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 419 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
410 else 420 else
411 while (*cfpod == ' ') // eat trailing whitespace 421 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
412 ++cfpod; 422 ++cfpod;
413 423
414 goto skip; 424 goto skip;
415 } 425 }
416 else 426 else
417 { 427 {
418 pfx = "<fg name=\"lightblue\">["; 428 pfx = "<fg name=\"lightblue\">[Hint: ";
419 sfx = " (Use hintmode to suppress hints)]</fg>"; 429 sfx = "]</fg>";
420 } 430 }
421 } 431 }
422 break; 432 break;
423 433
424 case 'G': // gender 434 case 'G': // gender
… …
439 449
440 nest.clear (); 450 nest.clear ();
441 451
442 goto skip; 452 goto skip;
443 } 453 }
454
455 default:
456 pfx = "UNKNOWN_DIRECTIVE{";
457 sfx = "}";
458 break;
444 } 459 }
445 460
446 buf << pfx; 461 buf << pfx;
447 cfpod = expand_cfpod (pl, buf, cfpod, end); 462 cfpod = expand_cfpod (pl, buf, cfpod, end);
448 buf << sfx; 463 buf << sfx;
… …
461 do 476 do
462 { 477 {
463 buf << "<tt>"; 478 buf << "<tt>";
464 cfpod = expand_cfpod (pl, buf, cfpod, -2); 479 cfpod = expand_cfpod (pl, buf, cfpod, -2);
465 buf << "</tt>\n"; 480 buf << "</tt>\n";
481
482 while (*cfpod == '\n')
483 buf << *cfpod++;
466 } 484 }
467 while (*cfpod == ' '); 485 while (*cfpod == ' ');
468 486
469 while (*cfpod == '\n')
470 buf << *cfpod++;
471
472 break; 487 break;
473 } 488 }
474} 489}
475 490
476dynbuf_text * 491dynbuf_text *

Diff Legend

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