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.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.
… …
63 INVOKE_PLAYER (SAVE, ob->contr); 66 INVOKE_PLAYER (SAVE, ob->contr);
64 67
65 int wiz = ob->flag [FLAG_WIZ]; 68 int wiz = ob->flag [FLAG_WIZ];
66 69
67 /* 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. */
68 object *container = ob->container; 71 object *container = ob->container_ ();
69 ob->container = 0; 72 ob->container = 0;
70 73
71 if (ob->map) 74 if (ob->map)
72 maplevel = ob->map->path; 75 maplevel = ob->map->path;
73 76
… …
131 134
132 INVOKE_PLAYER (SAVE_DONE, ob->contr); 135 INVOKE_PLAYER (SAVE_DONE, ob->contr);
133 136
134 return true; 137 return true;
135} 138}
139
140//-GPL
136 141
137bool 142bool
138player::save_pl (const char *path) 143player::save_pl (const char *path)
139{ 144{
140 object_freezer freezer; 145 object_freezer freezer;
… …
337 buf << "&lt;"; 342 buf << "&lt;";
338 break; 343 break;
339 344
340 case '\r': 345 case '\r':
341 buf << '\n'; 346 buf << '\n';
347 /* \r\n+ becomes one or more newlines */
348 while (*cfpod == '\n')
349 buf << *cfpod++;
342 break; 350 break;
343 351
344 case '\n': 352 case '\n':
345 if (end == -2) 353 if (end == -2)
346 return cfpod; 354 return cfpod;
… …
396 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 404 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
397 case 'E': pfx = "&" ; sfx = ";" ; break; 405 case 'E': pfx = "&" ; sfx = ";" ; break;
398 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 406 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
399 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 407 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
400 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;
401 410
402 case 'H': // hint 411 case 'H': // hint
403 { 412 {
404 if (pl->hintmode) 413 if (pl->hintmode)
405 { 414 {
406 cfpod = expand_cfpod (pl, nest, cfpod, end); 415 cfpod = expand_cfpod (pl, nest, cfpod, end);
407 nest.clear (); 416 nest.clear ();
408 417
409 if (pl->hintmode == 1) 418 if (pl->hintmode == 1)
410 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 419 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
411 else 420 else
412 while (*cfpod == ' ') // eat trailing whitespace 421 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
413 ++cfpod; 422 ++cfpod;
414 423
415 goto skip; 424 goto skip;
416 } 425 }
417 else 426 else
418 { 427 {
419 pfx = "<fg name=\"lightblue\">["; 428 pfx = "<fg name=\"lightblue\">[Hint: ";
420 sfx = " (Use hintmode to suppress hints)]</fg>"; 429 sfx = "]</fg>";
421 } 430 }
422 } 431 }
423 break; 432 break;
424 433
425 case 'G': // gender 434 case 'G': // gender
… …
440 449
441 nest.clear (); 450 nest.clear ();
442 451
443 goto skip; 452 goto skip;
444 } 453 }
454
455 default:
456 pfx = "UNKNOWN_DIRECTIVE{";
457 sfx = "}";
458 break;
445 } 459 }
446 460
447 buf << pfx; 461 buf << pfx;
448 cfpod = expand_cfpod (pl, buf, cfpod, end); 462 cfpod = expand_cfpod (pl, buf, cfpod, end);
449 buf << sfx; 463 buf << sfx;

Diff Legend

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