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.41 by root, Mon Sep 8 11:27:24 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 == -1, till eos
293// end == 0, one level of '>'
294// end >= 1, this many levels of " >>>"
295static const char *
296expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end)
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 if (end <= 0)
308 goto passthrough;
309
310 for (int i = 0; i < end; ++i)
311 if (cfpod [i] != '>')
312 goto passthrough;
313
314 return cfpod + end;
315
316 case '>':
317 if (end)
318 {
319 buf << "&gt;";
320 break;
321 }
322
323 return cfpod;
324
325 case '&':
326 buf << "&amp;";
327 break;
328
329 case '<':
330 buf << "&lt;";
331 break;
332
333 case '\n':
334 if (*cfpod == ' ')
335 goto passthrough;
336 else if (*cfpod == '\n')
337 {
338 --cfpod;
339 while (*cfpod == '\n')
340 buf << *cfpod++;
341
342 goto skip;
343 }
344
345 buf << ' ';
346 break;
347
348 case 'B': case 'C': case 'E': case 'G':
349 case 'H': case 'I': case 'T': case 'U':
350 case 'Z':
351 {
352 int len = 0;
353
354 while (cfpod [len] == '<')
355 ++len;
356
357 if (!len)
358 goto passthrough;
359
360 if (len == 1 || cfpod [len] != ' ')
361 {
362 len = 0;
363 ++cfpod;
364 }
365 else
366 cfpod += len + 1;
367
368 const char *pfx, *sfx;
369
370 switch (ch)
371 {
372 case 'B': pfx = "<b>" ; sfx = "</b>" ; break;
373 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
374 case 'E': pfx = "&" ; sfx = ";" ; break;
375 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
376 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
377 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
378
379 case 'H': // hint
380 {
381 if (pl->hintmode)
382 {
383 cfpod = expand_cfpod (pl, nest, cfpod, len);
384 nest.clear ();
385
386 if (pl->hintmode == 1)
387 buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>";
388 else
389 while (*cfpod == ' ') // eat trailing whitespace
390 ++cfpod;
391
392 goto skip;
393 }
394 else
395 {
396 pfx = "<fg name=\"lightblue\">[";
397 sfx = " (Use hintmode to suppress hints)]</fg>";
398 }
399 }
400 break;
401
402 case 'G': // gender
403 {
404 expand_cfpod (pl, nest, cfpod, len);
405 nest << '\0'; // zero-terminate
406
407 const char *str = nest.linearise ();
408 const char *sep = strchr (str, '|');
409
410 if (sep)
411 {
412 if (pl->gender || 1)
413 buf.add (sep + 1, nest.size () - (sep - str) - 2);
414 else
415 buf.add (str, sep - str);
416 }
417
418 nest.clear ();
419
420 goto skip;
421 }
422 }
423
424 buf << pfx;
425 cfpod = expand_cfpod (pl, buf, cfpod, len);
426 buf << sfx;
427 }
428
429 break;
430
431 default:
432 passthrough:
433 buf << ch;
434 skip:
435 break;
436 }
437}
438
439dynbuf_text *
440player::expand_cfpod (const char *cfpod) const
441{
442 static dynbuf_text buf(1024, 1024);
443 buf.clear ();
444
445 ::expand_cfpod (this, buf, cfpod, -1);
446
447 return &buf;
448}
449

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines