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.40 by root, Fri Aug 29 02:07:09 2008 UTC vs.
Revision 1.49 by root, Thu Jan 1 11:41:17 2009 UTC

… …
46is_dragon_pl (const object *op) 46is_dragon_pl (const object *op)
47{ 47{
48 if (op 48 if (op
49 && op->type == PLAYER 49 && op->type == PLAYER
50 && op->arch 50 && op->arch
51 && op->arch->race 51 && op->arch->race == shstr_dragon)
52 && !strcmp (op->arch->race, "dragon"))
53 return 1; 52 return 1;
54 53
55 return 0; 54 return 0;
56} 55}
57 56
… …
76#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 75#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
77 76
78 PL_OUT (password); 77 PL_OUT (password);
79 PL_OUT2 (title, own_title); 78 PL_OUT2 (title, own_title);
80 PL_OUT (gender); 79 PL_OUT (gender);
80 PL_OUT (hintmode);
81 PL_OUT (gen_hp); 81 PL_OUT (gen_hp);
82 PL_OUT (gen_sp); 82 PL_OUT (gen_sp);
83 PL_OUT (gen_grace); 83 PL_OUT (gen_grace);
84 PL_OUT (bowtype); 84 PL_OUT (bowtype);
85 PL_OUT (petmode); 85 PL_OUT (petmode);
… …
189 case KW_password: assign (pl->password , f.get_str ()); break; 189 case KW_password: assign (pl->password , f.get_str ()); break;
190 case KW_title: assign (pl->own_title, f.get_str ()); break; 190 case KW_title: assign (pl->own_title, f.get_str ()); break;
191 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; 191 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
192 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; 192 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
193 case KW_gender: f.get (pl->gender); break; 193 case KW_gender: f.get (pl->gender); break;
194 case KW_hintmode: f.get (pl->hintmode); break;
194 case KW_listening: /*TODO*/; break; 195 case KW_listening: /*TODO*/; break;
195 case KW_peaceful: f.get (pl->peaceful); break; 196 case KW_peaceful: f.get (pl->peaceful); break;
196 case KW_digestion: f.get (pl->digestion); break; 197 case KW_digestion: f.get (pl->digestion); break;
197 case KW_pickup: f.get (pl->mode); break; 198 case KW_pickup: f.get (pl->mode); break;
198 case KW_outputs_sync: f.get (pl->outputs_sync); break; 199 case KW_outputs_sync: f.get (pl->outputs_sync); break;
… …
284 return &killer->name; 285 return &killer->name;
285 286
286 return buf; 287 return buf;
287} 288}
288 289
290// expand one level of cfpod
291// end == -2, till '\n'
292// end == -1, till '>'
293// end == 0, till eos
294// end >= 1, levels of " >>>"
295static const char *
296expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0)
297{
298 static dynbuf_text nest(128, 128);
299
300 for (;;)
301 switch (char ch = *cfpod++)
302 {
303 case 0:
304 return cfpod - 1;
305
306 case ' ':
307 // verbatim block?
308 if (!buf.size () && !end)
309 {
310 --cfpod;
311 goto verbatim;
312 }
313
314 if (end < 1)
315 goto passthrough;
316
317 for (int i = 0; i < end; ++i)
318 if (cfpod [i] != '>')
319 goto passthrough;
320
321 return cfpod + end;
322
323 case '>':
324 if (end != -1)
325 {
326 buf << "&gt;";
327 break;
328 }
329
330 return cfpod;
331
332 case '&':
333 buf << "&amp;";
334 break;
335
336 case '<':
337 buf << "&lt;";
338 break;
339
340 case '\r':
341 buf << '\n';
342 break;
343
344 case '\n':
345 if (end == -2)
346 return cfpod;
347
348 // \n\ => newline, tt
349 // \n\n => \n\n
350 // \n => single space
351
352 // two or more newlines will be copied verbatim, one is replaced by space
353 if (*cfpod == '\n')
354 {
355 --cfpod;
356 do
357 buf << *cfpod++;
358 while (*cfpod == '\n');
359 }
360 else if (*cfpod != ' ')
361 buf << ' ';
362
363 // verbatim block?
364 if (*cfpod == ' ')
365 goto verbatim;
366
367 break;
368
369 case 'B': case 'C': case 'E': case 'G':
370 case 'H': case 'I': case 'T': case 'U':
371 case 'Z':
372 {
373 int end = 0;
374
375 while (cfpod [end] == '<')
376 ++end;
377
378 if (!end)
379 goto passthrough;
380
381 if (end == 1 || cfpod [end] != ' ')
382 {
383 end = -1;
384 ++cfpod;
385 }
386 else
387 cfpod += end + 1;
388
389 const char *pfx, *sfx;
390
391 switch (ch)
392 {
393 case 'B': pfx = "<b>" ; sfx = "</b>" ; break;
394 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
395 case 'E': pfx = "&" ; sfx = ";" ; break;
396 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
397 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
398 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
399
400 case 'H': // hint
401 {
402 if (pl->hintmode)
403 {
404 cfpod = expand_cfpod (pl, nest, cfpod, end);
405 nest.clear ();
406
407 if (pl->hintmode == 1)
408 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>";
409 else
410 while (*cfpod == ' ') // eat trailing whitespace
411 ++cfpod;
412
413 goto skip;
414 }
415 else
416 {
417 pfx = "<fg name=\"lightblue\">[";
418 sfx = " (Use hintmode to suppress hints)]</fg>";
419 }
420 }
421 break;
422
423 case 'G': // gender
424 {
425 cfpod = expand_cfpod (pl, nest, cfpod, end);
426 nest << '\0'; // zero-terminate
427
428 const char *str = nest.linearise ();
429 const char *sep = strchr (str, '|');
430
431 if (sep)
432 {
433 if (pl->gender)
434 buf.add (sep + 1, nest.size () - (sep - str) - 2);
435 else
436 buf.add (str, sep - str);
437 }
438
439 nest.clear ();
440
441 goto skip;
442 }
443 }
444
445 buf << pfx;
446 cfpod = expand_cfpod (pl, buf, cfpod, end);
447 buf << sfx;
448 }
449
450 break;
451
452 default:
453 passthrough:
454 buf << ch;
455 skip:
456 break;
457
458 verbatim:
459 // elements cannot currently span multiple lines
460 do
461 {
462 buf << "<tt>";
463 cfpod = expand_cfpod (pl, buf, cfpod, -2);
464 buf << "</tt>\n";
465
466 while (*cfpod == '\n')
467 buf << *cfpod++;
468 }
469 while (*cfpod == ' ');
470
471 break;
472 }
473}
474
475dynbuf_text *
476player::expand_cfpod (const char *cfpod) const
477{
478 static dynbuf_text buf(1024, 1024);
479 buf.clear ();
480
481 ::expand_cfpod (this, buf, cfpod);
482
483 return &buf;
484}
485

Diff Legend

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