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.42 by root, Mon Sep 8 11:30:53 2008 UTC vs.
Revision 1.60 by root, Wed Nov 11 23:27:56 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
75#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW(k), k)
76#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW(k), v)
77 79
78 PL_OUT (password); 80 PL_OUT (password);
79 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
80 PL_OUT (gender); 82 PL_OUT (gender);
81 PL_OUT (hintmode); 83 PL_OUT (hintmode);
… …
88 PL_OUT (digestion); 90 PL_OUT (digestion);
89 PL_OUT2 (pickup, mode); 91 PL_OUT2 (pickup, mode);
90 PL_OUT (outputs_sync); 92 PL_OUT (outputs_sync);
91 PL_OUT (outputs_count); 93 PL_OUT (outputs_count);
92 94
93 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)));
94 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)));
95 97
96 PL_OUT2 (map, maplevel); 98 PL_OUT2 (map, maplevel);
97 PL_OUT (savebed_map); 99 PL_OUT (savebed_map);
98 PL_OUT (bed_x); 100 PL_OUT (bed_x);
99 PL_OUT (bed_y); 101 PL_OUT (bed_y);
… …
115 freezer.add (levsp [i]); freezer.add ('\n'); 117 freezer.add (levsp [i]); freezer.add ('\n');
116 freezer.add (levgrace[i]); freezer.add ('\n'); 118 freezer.add (levgrace[i]); freezer.add ('\n');
117 } 119 }
118 120
119 freezer.put (ob->contr); 121 freezer.put (ob->contr);
120 freezer.put (KW_endplst); 122 freezer.put (KW(endplst));
121 123
122 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
123 CLEAR_FLAG (ob, FLAG_WIZ); 124 CLEAR_FLAG (ob, FLAG_WIZ);
124 ob->write (freezer); 125 ob->write (freezer);
125 126
126 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
127
128 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
129 ob->container = container; 128 ob->container = container;
130 129
131 ob->flag [FLAG_WIZ] = wiz; 130 ob->flag [FLAG_WIZ] = wiz;
132 131
133 INVOKE_PLAYER (SAVE_DONE, ob->contr); 132 INVOKE_PLAYER (SAVE_DONE, ob->contr);
134 133
135 return true; 134 return true;
136} 135}
136
137//-GPL
137 138
138bool 139bool
139player::save_pl (const char *path) 140player::save_pl (const char *path)
140{ 141{
141 object_freezer freezer; 142 object_freezer freezer;
… …
287 288
288 return buf; 289 return buf;
289} 290}
290 291
291// expand one level of cfpod 292// expand one level of cfpod
293// end == -2, till '\n'
294// end == -1, till '>'
292// end == -1, till eos 295// end == 0, till eos
293// end == 0, one level of '>'
294// end >= 1, this many levels of " >>>" 296// end >= 1, levels of " >>>"
295static const char * 297static const char *
296expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end) 298expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
297{ 299{
298 static dynbuf_text nest(128, 128); 300 static dynbuf_text nest(128, 128);
299 301
300 for (;;) 302 for (;;)
301 switch (char ch = *cfpod++) 303 switch (char ch = *cfpod++)
302 { 304 {
303 case 0: 305 case 0:
304 return cfpod - 1; 306 return cfpod - 1;
305 307
306 case ' ': 308 case ' ':
309 // verbatim block?
310 if (!buf.size () && !end)
311 {
312 --cfpod;
313 goto verbatim;
314 }
315
307 if (end <= 0) 316 if (end < 1)
308 goto passthrough; 317 goto passthrough;
309 318
310 for (int i = 0; i < end; ++i) 319 for (int i = 0; i < end; ++i)
311 if (cfpod [i] != '>') 320 if (cfpod [i] != '>')
312 goto passthrough; 321 goto passthrough;
313 322
314 return cfpod + end; 323 return cfpod + end;
315 324
316 case '>': 325 case '>':
317 if (end) 326 if (end != -1)
318 { 327 {
319 buf << "&gt;"; 328 buf << "&gt;";
320 break; 329 break;
321 } 330 }
322 331
… …
330 buf << "&lt;"; 339 buf << "&lt;";
331 break; 340 break;
332 341
333 case '\r': 342 case '\r':
334 buf << '\n'; 343 buf << '\n';
344 /* \r\n+ becomes one or more newlines */
345 while (*cfpod == '\n')
346 buf << *cfpod++;
335 break; 347 break;
336 348
337 case '\n': 349 case '\n':
350 if (end == -2)
351 return cfpod;
352
353 // \n\ => newline, tt
354 // \n\n => \n\n
355 // \n => single space
356
357 // two or more newlines will be copied verbatim, one is replaced by space
338 if (*cfpod == ' ') 358 if (*cfpod == '\n')
339 goto passthrough;
340 else if (*cfpod == '\n')
341 { 359 {
342 --cfpod; 360 --cfpod;
343 do 361 do
344 buf << *cfpod++; 362 buf << *cfpod++;
345 while (*cfpod == '\n'); 363 while (*cfpod == '\n');
346 } 364 }
365 else if (*cfpod == ' ')
366 buf << '\n';
347 else 367 else
348 buf << ' '; 368 buf << ' ';
369
370 // verbatim block?
371 if (*cfpod == ' ')
372 goto verbatim;
349 373
350 break; 374 break;
351 375
352 case 'B': case 'C': case 'E': case 'G': 376 case 'B': case 'C': case 'E': case 'G':
353 case 'H': case 'I': case 'T': case 'U': 377 case 'H': case 'I': case 'T': case 'U':
354 case 'Z': 378 case 'Z':
355 { 379 {
356 int len = 0; 380 int end = 0;
357 381
358 while (cfpod [len] == '<') 382 while (cfpod [end] == '<')
359 ++len; 383 ++end;
360 384
361 if (!len) 385 if (!end)
362 goto passthrough; 386 goto passthrough;
363 387
364 if (len == 1 || cfpod [len] != ' ') 388 if (end == 1 || cfpod [end] != ' ')
365 { 389 {
366 len = 0; 390 end = -1;
367 ++cfpod; 391 ++cfpod;
368 } 392 }
369 else 393 else
370 cfpod += len + 1; 394 cfpod += end + 1;
371 395
372 const char *pfx, *sfx; 396 const char *pfx, *sfx;
373 397
374 switch (ch) 398 switch (ch)
375 { 399 {
… …
377 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; 401 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
378 case 'E': pfx = "&" ; sfx = ";" ; break; 402 case 'E': pfx = "&" ; sfx = ";" ; break;
379 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 403 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
380 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 404 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
381 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;
382 407
383 case 'H': // hint 408 case 'H': // hint
384 { 409 {
385 if (pl->hintmode) 410 if (pl->hintmode)
386 { 411 {
387 cfpod = expand_cfpod (pl, nest, cfpod, len); 412 cfpod = expand_cfpod (pl, nest, cfpod, end);
388 nest.clear (); 413 nest.clear ();
389 414
390 if (pl->hintmode == 1) 415 if (pl->hintmode == 1)
391 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; 416 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
392 else 417 else
393 while (*cfpod == ' ') // eat trailing whitespace 418 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
394 ++cfpod; 419 ++cfpod;
395 420
396 goto skip; 421 goto skip;
397 } 422 }
398 else 423 else
399 { 424 {
400 pfx = "<fg name=\"lightblue\">["; 425 pfx = "<fg name=\"lightblue\">[Hint: ";
401 sfx = " (Use hintmode to suppress hints)]</fg>"; 426 sfx = "]</fg>";
402 } 427 }
403 } 428 }
404 break; 429 break;
405 430
406 case 'G': // gender 431 case 'G': // gender
407 { 432 {
408 expand_cfpod (pl, nest, cfpod, len); 433 cfpod = expand_cfpod (pl, nest, cfpod, end);
409 nest << '\0'; // zero-terminate 434 nest << '\0'; // zero-terminate
410 435
411 const char *str = nest.linearise (); 436 const char *str = nest.linearise ();
412 const char *sep = strchr (str, '|'); 437 const char *sep = strchr (str, '|');
413 438
414 if (sep) 439 if (sep)
415 { 440 {
416 if (pl->gender || 1) 441 if (pl->gender)
417 buf.add (sep + 1, nest.size () - (sep - str) - 2); 442 buf.add (sep + 1, nest.size () - (sep - str) - 2);
418 else 443 else
419 buf.add (str, sep - str); 444 buf.add (str, sep - str);
420 } 445 }
421 446
422 nest.clear (); 447 nest.clear ();
423 448
424 goto skip; 449 goto skip;
425 } 450 }
451
452 default:
453 pfx = "UNKNOWN_DIRECTIVE{";
454 sfx = "}";
455 break;
426 } 456 }
427 457
428 buf << pfx; 458 buf << pfx;
429 cfpod = expand_cfpod (pl, buf, cfpod, len); 459 cfpod = expand_cfpod (pl, buf, cfpod, end);
430 buf << sfx; 460 buf << sfx;
431 } 461 }
432 462
433 break; 463 break;
434 464
435 default: 465 default:
436 passthrough: 466 passthrough:
437 buf << ch; 467 buf << ch;
438 skip: 468 skip:
439 break; 469 break;
470
471 verbatim:
472 // elements cannot currently span multiple lines
473 do
474 {
475 buf << "<tt>";
476 cfpod = expand_cfpod (pl, buf, cfpod, -2);
477 buf << "</tt>\n";
478
479 while (*cfpod == '\n')
480 buf << *cfpod++;
481 }
482 while (*cfpod == ' ');
483
484 break;
440 } 485 }
441} 486}
442 487
443dynbuf_text * 488dynbuf_text *
444player::expand_cfpod (const char *cfpod) const 489player::expand_cfpod (const char *cfpod) const
445{ 490{
446 static dynbuf_text buf(1024, 1024); 491 static dynbuf_text buf(1024, 1024);
447 buf.clear (); 492 buf.clear ();
448 493
449 ::expand_cfpod (this, buf, cfpod, -1); 494 ::expand_cfpod (this, buf, cfpod);
450 495
451 return &buf; 496 return &buf;
452} 497}
453 498

Diff Legend

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