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.43 by root, Mon Sep 8 18:34:35 2008 UTC

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

Diff Legend

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