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.63 by root, Sat Jan 30 23:30:26 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,2010 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.
… …
37 40
38 return 0; 41 return 0;
39} 42}
40 43
41/* 44/*
42 * returns true if the adressed object 'ob' is a player
43 * of the dragon race.
44 */
45int
46is_dragon_pl (const object *op)
47{
48 if (op
49 && op->type == PLAYER
50 && op->arch
51 && op->arch->race
52 && !strcmp (op->arch->race, "dragon"))
53 return 1;
54
55 return 0;
56}
57
58/*
59 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 45 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
60 */ 46 */
61bool 47bool
62player::save_pl (object_freezer &freezer) 48player::save_pl (object_freezer &freezer)
63{ 49{
64 INVOKE_PLAYER (SAVE, ob->contr); 50 INVOKE_PLAYER (SAVE, ob->contr);
65 51
66 int wiz = ob->flag [FLAG_WIZ]; 52 int wiz = ob->flag [FLAG_WIZ];
67 53
68 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 54 /* Eneq(@csd.uu.se): If we have an open container hide it. */
69 object *container = ob->container; 55 object *container = ob->container_ ();
70 ob->container = 0; 56 ob->container = 0;
71 57
72 if (ob->map) 58 if (ob->map)
73 maplevel = ob->map->path; 59 maplevel = ob->map->path;
74 60
75#define PL_OUT(k) freezer.put (KW_ ## k, k) 61#define PL_OUT(k) freezer.put (KW(k), k)
76#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 62#define PL_OUT2(k,v) freezer.put (KW(k), v)
77 63
78 PL_OUT (password); 64 PL_OUT (password);
79 PL_OUT2 (title, own_title); 65 PL_OUT2 (title, own_title);
80 PL_OUT (gender); 66 PL_OUT (gender);
81 PL_OUT (hintmode); 67 PL_OUT (hintmode);
… …
88 PL_OUT (digestion); 74 PL_OUT (digestion);
89 PL_OUT2 (pickup, mode); 75 PL_OUT2 (pickup, mode);
90 PL_OUT (outputs_sync); 76 PL_OUT (outputs_sync);
91 PL_OUT (outputs_count); 77 PL_OUT (outputs_count);
92 78
93 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 79 freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
94 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 80 freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
95 81
96 PL_OUT2 (map, maplevel); 82 PL_OUT2 (map, maplevel);
97 PL_OUT (savebed_map); 83 PL_OUT (savebed_map);
98 PL_OUT (bed_x); 84 PL_OUT (bed_x);
99 PL_OUT (bed_y); 85 PL_OUT (bed_y);
… …
115 freezer.add (levsp [i]); freezer.add ('\n'); 101 freezer.add (levsp [i]); freezer.add ('\n');
116 freezer.add (levgrace[i]); freezer.add ('\n'); 102 freezer.add (levgrace[i]); freezer.add ('\n');
117 } 103 }
118 104
119 freezer.put (ob->contr); 105 freezer.put (ob->contr);
120 freezer.put (KW_endplst); 106 freezer.put (KW(endplst));
121 107
122 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
123 CLEAR_FLAG (ob, FLAG_WIZ); 108 CLEAR_FLAG (ob, FLAG_WIZ);
124 ob->write (freezer); 109 ob->write (freezer);
125 110
126 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
127
128 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 111 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
129 ob->container = container; 112 ob->container = container;
130 113
131 ob->flag [FLAG_WIZ] = wiz; 114 ob->flag [FLAG_WIZ] = wiz;
132 115
133 INVOKE_PLAYER (SAVE_DONE, ob->contr); 116 INVOKE_PLAYER (SAVE_DONE, ob->contr);
134 117
135 return true; 118 return true;
136} 119}
120
121//-GPL
137 122
138bool 123bool
139player::save_pl (const char *path) 124player::save_pl (const char *path)
140{ 125{
141 object_freezer freezer; 126 object_freezer freezer;
… …
266 pl->destroy (); 251 pl->destroy ();
267 252
268 return 0; 253 return 0;
269} 254}
270 255
271const char * 256const_utf8_string
272player::killer_name () const 257player::killer_name () const
273{ 258{
274 static char buf [2048]; 259 static char buf [2048];
275 260
276 if (!killer) 261 if (!killer)
… …
338 buf << "&lt;"; 323 buf << "&lt;";
339 break; 324 break;
340 325
341 case '\r': 326 case '\r':
342 buf << '\n'; 327 buf << '\n';
328 /* \r\n+ becomes one or more newlines */
329 while (*cfpod == '\n')
330 buf << *cfpod++;
343 break; 331 break;
344 332
345 case '\n': 333 case '\n':
346 if (end == -2) 334 if (end == -2)
347 return cfpod; 335 return cfpod;
… …
356 --cfpod; 344 --cfpod;
357 do 345 do
358 buf << *cfpod++; 346 buf << *cfpod++;
359 while (*cfpod == '\n'); 347 while (*cfpod == '\n');
360 } 348 }
361 else if (*cfpod != ' ') 349 else if (*cfpod == ' ')
350 buf << '\n';
351 else
362 buf << ' '; 352 buf << ' ';
363 353
364 // verbatim block? 354 // verbatim block?
365 if (*cfpod == ' ') 355 if (*cfpod == ' ')
366 goto verbatim; 356 goto verbatim;
… …
395 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 385 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
396 case 'E': pfx = "&" ; sfx = ";" ; break; 386 case 'E': pfx = "&" ; sfx = ";" ; break;
397 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 387 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
398 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 388 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
399 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; 389 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
390 case 'Z': pfx = "" ; sfx = "" ; break;
400 391
401 case 'H': // hint 392 case 'H': // hint
402 { 393 {
403 if (pl->hintmode) 394 if (pl->hintmode)
404 { 395 {
405 cfpod = expand_cfpod (pl, nest, cfpod, end); 396 cfpod = expand_cfpod (pl, nest, cfpod, end);
406 nest.clear (); 397 nest.clear ();
407 398
408 if (pl->hintmode == 1) 399 if (pl->hintmode == 1)
409 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 400 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
410 else 401 else
411 while (*cfpod == ' ') // eat trailing whitespace 402 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
412 ++cfpod; 403 ++cfpod;
413 404
414 goto skip; 405 goto skip;
415 } 406 }
416 else 407 else
417 { 408 {
418 pfx = "<fg name=\"lightblue\">["; 409 pfx = "<fg name=\"lightblue\">[Hint: ";
419 sfx = " (Use hintmode to suppress hints)]</fg>"; 410 sfx = "]</fg>";
420 } 411 }
421 } 412 }
422 break; 413 break;
423 414
424 case 'G': // gender 415 case 'G': // gender
425 { 416 {
426 expand_cfpod (pl, nest, cfpod, end); 417 cfpod = expand_cfpod (pl, nest, cfpod, end);
427 nest << '\0'; // zero-terminate 418 nest << '\0'; // zero-terminate
428 419
429 const char *str = nest.linearise (); 420 const char *str = nest.linearise ();
430 const char *sep = strchr (str, '|'); 421 const char *sep = strchr (str, '|');
431 422
432 if (sep) 423 if (sep)
433 { 424 {
434 if (pl->gender || 1) 425 if (pl->gender)
435 buf.add (sep + 1, nest.size () - (sep - str) - 2); 426 buf.add (sep + 1, nest.size () - (sep - str) - 2);
436 else 427 else
437 buf.add (str, sep - str); 428 buf.add (str, sep - str);
438 } 429 }
439 430
440 nest.clear (); 431 nest.clear ();
441 432
442 goto skip; 433 goto skip;
443 } 434 }
435
436 default:
437 pfx = "UNKNOWN_DIRECTIVE{";
438 sfx = "}";
439 break;
444 } 440 }
445 441
446 buf << pfx; 442 buf << pfx;
447 cfpod = expand_cfpod (pl, buf, cfpod, end); 443 cfpod = expand_cfpod (pl, buf, cfpod, end);
448 buf << sfx; 444 buf << sfx;
… …
461 do 457 do
462 { 458 {
463 buf << "<tt>"; 459 buf << "<tt>";
464 cfpod = expand_cfpod (pl, buf, cfpod, -2); 460 cfpod = expand_cfpod (pl, buf, cfpod, -2);
465 buf << "</tt>\n"; 461 buf << "</tt>\n";
462
463 while (*cfpod == '\n')
464 buf << *cfpod++;
466 } 465 }
467 while (*cfpod == ' '); 466 while (*cfpod == ' ');
468 467
469 while (*cfpod == '\n')
470 buf << *cfpod++;
471
472 break; 468 break;
473 } 469 }
474} 470}
475 471
476dynbuf_text * 472dynbuf_text *

Diff Legend

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