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.61 by root, Sat Jan 16 12:33:46 2010 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
74#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW(k), k)
75#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW(k), v)
76 79
77 PL_OUT (password); 80 PL_OUT (password);
78 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
79 PL_OUT (gender); 82 PL_OUT (gender);
80 PL_OUT (hintmode); 83 PL_OUT (hintmode);
… …
87 PL_OUT (digestion); 90 PL_OUT (digestion);
88 PL_OUT2 (pickup, mode); 91 PL_OUT2 (pickup, mode);
89 PL_OUT (outputs_sync); 92 PL_OUT (outputs_sync);
90 PL_OUT (outputs_count); 93 PL_OUT (outputs_count);
91 94
92 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 95 freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
93 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 96 freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
94 97
95 PL_OUT2 (map, maplevel); 98 PL_OUT2 (map, maplevel);
96 PL_OUT (savebed_map); 99 PL_OUT (savebed_map);
97 PL_OUT (bed_x); 100 PL_OUT (bed_x);
98 PL_OUT (bed_y); 101 PL_OUT (bed_y);
… …
114 freezer.add (levsp [i]); freezer.add ('\n'); 117 freezer.add (levsp [i]); freezer.add ('\n');
115 freezer.add (levgrace[i]); freezer.add ('\n'); 118 freezer.add (levgrace[i]); freezer.add ('\n');
116 } 119 }
117 120
118 freezer.put (ob->contr); 121 freezer.put (ob->contr);
119 freezer.put (KW_endplst); 122 freezer.put (KW(endplst));
120 123
121 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
122 CLEAR_FLAG (ob, FLAG_WIZ); 124 CLEAR_FLAG (ob, FLAG_WIZ);
123 ob->write (freezer); 125 ob->write (freezer);
124 126
125 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
126
127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
128 ob->container = container; 128 ob->container = container;
129 129
130 ob->flag [FLAG_WIZ] = wiz; 130 ob->flag [FLAG_WIZ] = wiz;
131 131
132 INVOKE_PLAYER (SAVE_DONE, ob->contr); 132 INVOKE_PLAYER (SAVE_DONE, ob->contr);
133 133
134 return true; 134 return true;
135} 135}
136
137//-GPL
136 138
137bool 139bool
138player::save_pl (const char *path) 140player::save_pl (const char *path)
139{ 141{
140 object_freezer freezer; 142 object_freezer freezer;
… …
265 pl->destroy (); 267 pl->destroy ();
266 268
267 return 0; 269 return 0;
268} 270}
269 271
270const char * 272const_utf8_string
271player::killer_name () const 273player::killer_name () const
272{ 274{
273 static char buf [2048]; 275 static char buf [2048];
274 276
275 if (!killer) 277 if (!killer)
… …
337 buf << "&lt;"; 339 buf << "&lt;";
338 break; 340 break;
339 341
340 case '\r': 342 case '\r':
341 buf << '\n'; 343 buf << '\n';
344 /* \r\n+ becomes one or more newlines */
345 while (*cfpod == '\n')
346 buf << *cfpod++;
342 break; 347 break;
343 348
344 case '\n': 349 case '\n':
345 if (end == -2) 350 if (end == -2)
346 return cfpod; 351 return cfpod;
… …
396 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 401 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
397 case 'E': pfx = "&" ; sfx = ";" ; break; 402 case 'E': pfx = "&" ; sfx = ";" ; break;
398 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 403 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
399 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 404 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
400 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; 405 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
406 case 'Z': pfx = "" ; sfx = "" ; break;
401 407
402 case 'H': // hint 408 case 'H': // hint
403 { 409 {
404 if (pl->hintmode) 410 if (pl->hintmode)
405 { 411 {
406 cfpod = expand_cfpod (pl, nest, cfpod, end); 412 cfpod = expand_cfpod (pl, nest, cfpod, end);
407 nest.clear (); 413 nest.clear ();
408 414
409 if (pl->hintmode == 1) 415 if (pl->hintmode == 1)
410 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 416 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
411 else 417 else
412 while (*cfpod == ' ') // eat trailing whitespace 418 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
413 ++cfpod; 419 ++cfpod;
414 420
415 goto skip; 421 goto skip;
416 } 422 }
417 else 423 else
418 { 424 {
419 pfx = "<fg name=\"lightblue\">["; 425 pfx = "<fg name=\"lightblue\">[Hint: ";
420 sfx = " (Use hintmode to suppress hints)]</fg>"; 426 sfx = "]</fg>";
421 } 427 }
422 } 428 }
423 break; 429 break;
424 430
425 case 'G': // gender 431 case 'G': // gender
… …
440 446
441 nest.clear (); 447 nest.clear ();
442 448
443 goto skip; 449 goto skip;
444 } 450 }
451
452 default:
453 pfx = "UNKNOWN_DIRECTIVE{";
454 sfx = "}";
455 break;
445 } 456 }
446 457
447 buf << pfx; 458 buf << pfx;
448 cfpod = expand_cfpod (pl, buf, cfpod, end); 459 cfpod = expand_cfpod (pl, buf, cfpod, end);
449 buf << sfx; 460 buf << sfx;

Diff Legend

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