| … | |
… | |
| 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 (listening); |
|
|
| 85 | PL_OUT (bowtype); |
85 | PL_OUT (bowtype); |
| 86 | PL_OUT (petmode); |
86 | PL_OUT (petmode); |
| 87 | PL_OUT (peaceful); |
87 | PL_OUT (peaceful); |
| 88 | PL_OUT (digestion); |
88 | PL_OUT (digestion); |
| 89 | PL_OUT2 (pickup, mode); |
89 | PL_OUT2 (pickup, mode); |
| … | |
… | |
| 190 | case KW_password: assign (pl->password , f.get_str ()); break; |
190 | case KW_password: assign (pl->password , f.get_str ()); break; |
| 191 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
191 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
| 192 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
192 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
| 193 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
193 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
| 194 | case KW_gender: f.get (pl->gender); break; |
194 | case KW_gender: f.get (pl->gender); break; |
| 195 | case KW_listening: f.get (pl->listening); break; |
195 | case KW_hintmode: f.get (pl->hintmode); break; |
|
|
196 | case KW_listening: /*TODO*/; break; |
| 196 | case KW_peaceful: f.get (pl->peaceful); break; |
197 | case KW_peaceful: f.get (pl->peaceful); break; |
| 197 | case KW_digestion: f.get (pl->digestion); break; |
198 | case KW_digestion: f.get (pl->digestion); break; |
| 198 | case KW_pickup: f.get (pl->mode); break; |
199 | case KW_pickup: f.get (pl->mode); break; |
| 199 | case KW_outputs_sync: f.get (pl->outputs_sync); break; |
200 | case KW_outputs_sync: f.get (pl->outputs_sync); break; |
| 200 | case KW_outputs_count: f.get (pl->outputs_count); break; |
201 | case KW_outputs_count: f.get (pl->outputs_count); break; |
| … | |
… | |
| 258 | |
259 | |
| 259 | failure: |
260 | failure: |
| 260 | LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); |
261 | LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); |
| 261 | |
262 | |
| 262 | if (pl->ob) |
263 | if (pl->ob) |
| 263 | pl->ob->destroy (); |
264 | pl->ob->destroy (true); |
| 264 | |
265 | |
| 265 | pl->destroy (); |
266 | pl->destroy (); |
| 266 | |
267 | |
| 267 | return 0; |
268 | return 0; |
| 268 | } |
269 | } |
| … | |
… | |
| 285 | return &killer->name; |
286 | return &killer->name; |
| 286 | |
287 | |
| 287 | return buf; |
288 | return buf; |
| 288 | } |
289 | } |
| 289 | |
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 " >>>" |
|
|
296 | static const char * |
|
|
297 | expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0) |
|
|
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 | // verbatim block? |
|
|
309 | if (!buf.size () && !end) |
|
|
310 | { |
|
|
311 | --cfpod; |
|
|
312 | goto verbatim; |
|
|
313 | } |
|
|
314 | |
|
|
315 | if (end < 1) |
|
|
316 | goto passthrough; |
|
|
317 | |
|
|
318 | for (int i = 0; i < end; ++i) |
|
|
319 | if (cfpod [i] != '>') |
|
|
320 | goto passthrough; |
|
|
321 | |
|
|
322 | return cfpod + end; |
|
|
323 | |
|
|
324 | case '>': |
|
|
325 | if (end != -1) |
|
|
326 | { |
|
|
327 | buf << ">"; |
|
|
328 | break; |
|
|
329 | } |
|
|
330 | |
|
|
331 | return cfpod; |
|
|
332 | |
|
|
333 | case '&': |
|
|
334 | buf << "&"; |
|
|
335 | break; |
|
|
336 | |
|
|
337 | case '<': |
|
|
338 | buf << "<"; |
|
|
339 | break; |
|
|
340 | |
|
|
341 | case '\r': |
|
|
342 | buf << '\n'; |
|
|
343 | break; |
|
|
344 | |
|
|
345 | case '\n': |
|
|
346 | if (end == -2) |
|
|
347 | return cfpod; |
|
|
348 | |
|
|
349 | // \n\ => newline, tt |
|
|
350 | // \n\n => \n\n |
|
|
351 | // \n => single space |
|
|
352 | |
|
|
353 | // two or more newlines will be copied verbatim, one is replaced by space |
|
|
354 | if (*cfpod == '\n') |
|
|
355 | { |
|
|
356 | --cfpod; |
|
|
357 | do |
|
|
358 | buf << *cfpod++; |
|
|
359 | while (*cfpod == '\n'); |
|
|
360 | } |
|
|
361 | else if (*cfpod != ' ') |
|
|
362 | buf << ' '; |
|
|
363 | |
|
|
364 | // verbatim block? |
|
|
365 | if (*cfpod == ' ') |
|
|
366 | goto verbatim; |
|
|
367 | |
|
|
368 | break; |
|
|
369 | |
|
|
370 | case 'B': case 'C': case 'E': case 'G': |
|
|
371 | case 'H': case 'I': case 'T': case 'U': |
|
|
372 | case 'Z': |
|
|
373 | { |
|
|
374 | int end = 0; |
|
|
375 | |
|
|
376 | while (cfpod [end] == '<') |
|
|
377 | ++end; |
|
|
378 | |
|
|
379 | if (!end) |
|
|
380 | goto passthrough; |
|
|
381 | |
|
|
382 | if (end == 1 || cfpod [end] != ' ') |
|
|
383 | { |
|
|
384 | end = -1; |
|
|
385 | ++cfpod; |
|
|
386 | } |
|
|
387 | else |
|
|
388 | cfpod += end + 1; |
|
|
389 | |
|
|
390 | const char *pfx, *sfx; |
|
|
391 | |
|
|
392 | switch (ch) |
|
|
393 | { |
|
|
394 | case 'B': pfx = "<b>" ; sfx = "</b>" ; break; |
|
|
395 | case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break; |
|
|
396 | case 'E': pfx = "&" ; sfx = ";" ; break; |
|
|
397 | case 'I': pfx = "<i>" ; sfx = "</i>" ; break; |
|
|
398 | case 'U': pfx = "<u>" ; sfx = "</u>" ; break; |
|
|
399 | case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; |
|
|
400 | |
|
|
401 | case 'H': // hint |
|
|
402 | { |
|
|
403 | if (pl->hintmode) |
|
|
404 | { |
|
|
405 | cfpod = expand_cfpod (pl, nest, cfpod, end); |
|
|
406 | nest.clear (); |
|
|
407 | |
|
|
408 | if (pl->hintmode == 1) |
|
|
409 | buf << "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>"; |
|
|
410 | else |
|
|
411 | while (*cfpod == ' ') // eat trailing whitespace |
|
|
412 | ++cfpod; |
|
|
413 | |
|
|
414 | goto skip; |
|
|
415 | } |
|
|
416 | else |
|
|
417 | { |
|
|
418 | pfx = "<fg name=\"lightblue\">["; |
|
|
419 | sfx = " (Use hintmode to suppress hints)]</fg>"; |
|
|
420 | } |
|
|
421 | } |
|
|
422 | break; |
|
|
423 | |
|
|
424 | case 'G': // gender |
|
|
425 | { |
|
|
426 | cfpod = expand_cfpod (pl, nest, cfpod, end); |
|
|
427 | nest << '\0'; // zero-terminate |
|
|
428 | |
|
|
429 | const char *str = nest.linearise (); |
|
|
430 | const char *sep = strchr (str, '|'); |
|
|
431 | |
|
|
432 | if (sep) |
|
|
433 | { |
|
|
434 | if (pl->gender) |
|
|
435 | buf.add (sep + 1, nest.size () - (sep - str) - 2); |
|
|
436 | else |
|
|
437 | buf.add (str, sep - str); |
|
|
438 | } |
|
|
439 | |
|
|
440 | nest.clear (); |
|
|
441 | |
|
|
442 | goto skip; |
|
|
443 | } |
|
|
444 | } |
|
|
445 | |
|
|
446 | buf << pfx; |
|
|
447 | cfpod = expand_cfpod (pl, buf, cfpod, end); |
|
|
448 | buf << sfx; |
|
|
449 | } |
|
|
450 | |
|
|
451 | break; |
|
|
452 | |
|
|
453 | default: |
|
|
454 | passthrough: |
|
|
455 | buf << ch; |
|
|
456 | skip: |
|
|
457 | break; |
|
|
458 | |
|
|
459 | verbatim: |
|
|
460 | // elements cannot currently span multiple lines |
|
|
461 | do |
|
|
462 | { |
|
|
463 | buf << "<tt>"; |
|
|
464 | cfpod = expand_cfpod (pl, buf, cfpod, -2); |
|
|
465 | buf << "</tt>\n"; |
|
|
466 | } |
|
|
467 | while (*cfpod == ' '); |
|
|
468 | |
|
|
469 | while (*cfpod == '\n') |
|
|
470 | buf << *cfpod++; |
|
|
471 | |
|
|
472 | break; |
|
|
473 | } |
|
|
474 | } |
|
|
475 | |
|
|
476 | dynbuf_text * |
|
|
477 | player::expand_cfpod (const char *cfpod) const |
|
|
478 | { |
|
|
479 | static dynbuf_text buf(1024, 1024); |
|
|
480 | buf.clear (); |
|
|
481 | |
|
|
482 | ::expand_cfpod (this, buf, cfpod); |
|
|
483 | |
|
|
484 | return &buf; |
|
|
485 | } |
|
|
486 | |
