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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 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> |
25 | #include <loader.h> |
|
|
26 | #include <sproto.h> |
26 | #include <sproto.h> |
27 | |
27 | |
28 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
29 | |
29 | |
30 | extern archetype *loading_arch; |
30 | extern archetype *loading_arch; |
|
|
31 | |
|
|
32 | //+GPL |
31 | |
33 | |
32 | /* This table is only necessary to convert objects that existed before the |
34 | /* This table is only necessary to convert objects that existed before the |
33 | * spell object conversion to the new object. It was not practical |
35 | * spell object conversion to the new object. It was not practical |
34 | * to go through every mapping looking for every potion, rod, wand, etc |
36 | * to go through every mapping looking for every potion, rod, wand, etc |
35 | * that had a sp set and update to the new value. So this maps the |
37 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
248 | "spell_glyph", /* 205 */ |
250 | "spell_glyph", /* 205 */ |
249 | NULL |
251 | NULL |
250 | }; |
252 | }; |
251 | |
253 | |
252 | /* This function checks the object after it has been loaded (when we |
254 | /* This function checks the object after it has been loaded (when we |
253 | * get the 'end' in the input stream). This function can be used to |
255 | * get the 'end' in the input stream). This function can be used to |
254 | * deal with legacy objects where fields may have changed. It can also be used |
256 | * deal with legacy objects where fields may have changed. It can also be used |
255 | * to check for objects to make sure there are no common errors. |
257 | * to check for objects to make sure there are no common errors. |
256 | */ |
258 | */ |
257 | void |
259 | void |
258 | object::post_load_check () |
260 | object::post_load_check () |
… | |
… | |
263 | type = 0; |
265 | type = 0; |
264 | } |
266 | } |
265 | |
267 | |
266 | switch (type) |
268 | switch (type) |
267 | { |
269 | { |
|
|
270 | case RANGED: |
268 | case BOW: |
271 | case BOW: |
269 | case WAND: |
272 | case WAND: |
270 | case ROD: |
273 | case ROD: |
271 | case HORN: |
274 | case HORN: |
272 | if (slot [body_range].info != -1) |
275 | if (slot [body_range].info != -1) |
… | |
… | |
290 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
293 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
291 | slot [body_shield].info = -1; |
294 | slot [body_shield].info = -1; |
292 | } |
295 | } |
293 | break; |
296 | break; |
294 | |
297 | |
|
|
298 | case CONTAINER: |
|
|
299 | if (nrof) |
|
|
300 | { |
|
|
301 | LOG (llevError, "ITEMBUG: %s: stackable container\n", debug_desc ()); |
|
|
302 | nrof = 0; |
|
|
303 | } |
|
|
304 | break; |
|
|
305 | |
295 | case PLAYER: |
306 | case PLAYER: |
296 | if (slot [body_shield].info != 1) |
307 | if (slot [body_shield].info != 1) |
297 | { |
308 | { |
298 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
309 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
299 | slot [body_shield].info = 1; |
310 | slot [body_shield].info = 1; |
… | |
… | |
318 | * this isn't perfect (things won't be properly pluralised), but works to |
329 | * this isn't perfect (things won't be properly pluralised), but works to |
319 | * that degree (5 heart is still quite understandable). But the case we |
330 | * that degree (5 heart is still quite understandable). But the case we |
320 | * also have to catch is if this object is not using the normal name for |
331 | * also have to catch is if this object is not using the normal name for |
321 | * the object. In that case, we also want to use the loaded name. |
332 | * the object. In that case, we also want to use the loaded name. |
322 | * Otherwise, what happens is that the the plural name will lose |
333 | * Otherwise, what happens is that the the plural name will lose |
323 | * information (appear as just 'hearts' and not 'goblins heart') |
334 | * information (appear as just 'hearts' and not 'goblins heart') |
324 | */ |
335 | */ |
325 | if (arch && name != arch->object::name && name_pl == arch->object::name_pl) |
336 | if (arch && name != arch->object::name && name_pl == arch->object::name_pl) |
326 | name_pl = 0; |
337 | name_pl = 0; |
327 | |
338 | |
328 | if (!name_pl) |
339 | if (!name_pl) |
329 | name_pl = name; |
340 | name_pl = name; |
330 | |
341 | |
331 | /* objects now have a materialname. try to patch it in */ |
342 | /* objects now have a materialname. try to patch it in */ |
332 | if (!(is_weapon () && level > 0)) |
343 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
333 | set_materialname (this, map ? map->difficulty : 5, 0); |
344 | select_material (this, map ? map->difficulty : 5); |
|
|
345 | |
|
|
346 | if (speed < 0.) |
|
|
347 | { |
|
|
348 | flag [FLAG_RANDOM_SPEED] = true; |
|
|
349 | speed = -speed; |
|
|
350 | // speed_left will be randomised in instantiate () and copy_to () |
|
|
351 | } |
334 | |
352 | |
335 | /* only do these when program is first run - a bit |
353 | /* only do these when program is first run - a bit |
336 | * excessive to do this at every run - most of this is |
354 | * excessive to do this at every run - most of this is |
337 | * really just to catch any errors - program will still run, but |
355 | * really just to catch any errors - program will still run, but |
338 | * not in the ideal fashion. |
356 | * not in the ideal fashion. |
… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
403 | if (ip > 2 * item_power && ip > (item_power + 3)) |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
404 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
387 | #endif |
405 | #endif |
388 | } |
406 | } |
389 | |
407 | |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
408 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
409 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
392 | if ((type == ROD |
410 | if ((type == ROD |
393 | || type == WAND |
411 | || type == WAND |
394 | || type == SCROLL |
412 | || type == SCROLL |
395 | || type == HORN |
413 | || type == HORN |
… | |
… | |
404 | // TODO: fix firewall object on map |
422 | // TODO: fix firewall object on map |
405 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
423 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
406 | * in that spell was stored in sp. |
424 | * in that spell was stored in sp. |
407 | */ |
425 | */ |
408 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
426 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
409 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
427 | object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
410 | insert_ob_in_ob (tmp, this); |
428 | insert_ob_in_ob (tmp, this); |
411 | randomitems = 0; |
429 | randomitems = 0; |
412 | } |
430 | } |
413 | |
431 | |
414 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
432 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
… | |
… | |
420 | randomitems = 0; /* So another spell isn't created for this object */ |
438 | randomitems = 0; /* So another spell isn't created for this object */ |
421 | /* without this, value is all screwed up */ |
439 | /* without this, value is all screwed up */ |
422 | value = arch->value * inv->value; |
440 | value = arch->value * inv->value; |
423 | } |
441 | } |
424 | |
442 | |
425 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
443 | if (this->flag [FLAG_MONSTER]) |
426 | { |
444 | { |
427 | if (stats.hp > stats.maxhp) |
445 | if (stats.hp > stats.maxhp) |
428 | { |
446 | { |
429 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
447 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
430 | stats.maxhp = stats.hp; |
448 | stats.maxhp = stats.hp; |
… | |
… | |
433 | /* The archs just need to be updated for this */ |
451 | /* The archs just need to be updated for this */ |
434 | if (move_type == 0) |
452 | if (move_type == 0) |
435 | move_type = MOVE_WALK; |
453 | move_type = MOVE_WALK; |
436 | } |
454 | } |
437 | |
455 | |
438 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
456 | if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) |
439 | /* Object will duplicate it's content as part of the |
457 | /* Object will duplicate it's content as part of the |
440 | * generation process. To do this, we must flag inventory |
458 | * generation process. To do this, we must flag inventory |
441 | * so it remains unevaluated concerning the randomitems and |
459 | * so it remains unevaluated concerning the randomitems and |
442 | * the living (a demonlord shouldn't cast from inside generator!) |
460 | * the living (a demonlord shouldn't cast from inside generator!) |
443 | */ |
461 | */ |
… | |
… | |
465 | } |
483 | } |
466 | |
484 | |
467 | // if the object has an animation, try to provide a default face |
485 | // if the object has an animation, try to provide a default face |
468 | if (has_anim ()) |
486 | if (has_anim ()) |
469 | { |
487 | { |
470 | const animation &anim_ob = anim (); |
|
|
471 | |
|
|
472 | if (anim_speed) |
488 | if (anim_speed) |
473 | // if this item is time-animated, force the last frame |
489 | // if this item is time-animated, force the last frame |
474 | animate_object (this, 0); |
490 | animate_object (this, 0); |
475 | else if (flag [FLAG_MONSTER]) |
491 | else if (flag [FLAG_MONSTER]) |
476 | // if it is a monster, set appropriate facing |
492 | // if it is a monster, set appropriate facing |
477 | animate_object (this, direction); |
493 | animate_object (this, direction); |
478 | } |
494 | } |
479 | } |
495 | } |
480 | |
496 | |
481 | static void |
497 | static void |
482 | set_move (MoveType &mt, const char *str) |
498 | set_move (MoveType &mt, object_thawer &f) |
483 | { |
499 | { |
484 | static const struct flagstr { |
500 | static const struct flagstr { |
485 | const char *name; |
501 | const char *name; |
486 | MoveType flags; |
502 | MoveType flags; |
487 | } move_flags[] = { |
503 | } move_flags[] = { |
… | |
… | |
493 | { "boat" , MOVE_BOAT }, |
509 | { "boat" , MOVE_BOAT }, |
494 | { "ship" , MOVE_SHIP }, |
510 | { "ship" , MOVE_SHIP }, |
495 | { "all" , MOVE_ALL }, |
511 | { "all" , MOVE_ALL }, |
496 | }; |
512 | }; |
497 | |
513 | |
498 | if (!str) |
514 | const char *str = f.get_str (); |
499 | { |
|
|
500 | mt = 0; |
|
|
501 | return; |
|
|
502 | } |
|
|
503 | |
515 | |
504 | if (isdigit (*str)) |
516 | if (!*str || isdigit (*str)) |
505 | { |
517 | { |
506 | mt = atoi (str); |
518 | mt = atoi (str); |
507 | return; |
519 | return; |
508 | } |
520 | } |
509 | |
521 | |
510 | mt = 0; |
522 | mt = 0; |
511 | |
523 | |
512 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
524 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
513 | { |
525 | { |
514 | bool negate = 0; |
526 | bool negate = 0; |
515 | |
527 | |
516 | if (*str == '-') |
528 | if (*str == '-') |
517 | { |
529 | { |
518 | negate = 1; |
530 | negate = 1; |
519 | str++; |
531 | str++; |
520 | } |
532 | } |
521 | |
533 | |
522 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
534 | for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) |
523 | { |
535 | { |
524 | if (!strcmp (f->name, str)) |
536 | if (!strcmp (f->name, str)) |
525 | { |
537 | { |
526 | if (negate) |
538 | if (negate) |
527 | mt &= ~f->flags; |
539 | mt &= ~f->flags; |
… | |
… | |
536 | |
548 | |
537 | next: ; |
549 | next: ; |
538 | } |
550 | } |
539 | } |
551 | } |
540 | |
552 | |
|
|
553 | //-GPL |
|
|
554 | |
541 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
555 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
542 | |
556 | |
543 | bool |
557 | bool |
544 | object::parse_kv (object_thawer &f) |
558 | object::parse_kv (object_thawer &f) |
545 | { |
559 | { |
546 | object *op_inv = inv; |
560 | object *op_inv = inv; |
547 | key_value *last_kv = key_values; |
|
|
548 | |
561 | |
549 | for (;;) |
562 | for (;;) |
550 | { |
563 | { |
551 | switch (f.kw) |
564 | switch (f.kw) |
552 | { |
565 | { |
553 | case KW_uuid: |
566 | case KW_uuid: |
554 | if (const char *s = f.get_str ()) |
|
|
555 | if (!uuid.parse (s)) |
567 | if (!uuid.parse (f.get_str ())) |
556 | { |
568 | { |
557 | f.parse_warn ("unparseable uuid"); |
569 | f.parse_warn ("unparseable uuid"); |
558 | uuid = UUID::gen (); |
570 | uuid = UUID::gen (); |
559 | } |
571 | } |
560 | break; |
572 | break; |
561 | |
573 | |
562 | case KW_oid: |
574 | case KW_oid: |
563 | f.get (this, f.get_sint32 ()); |
575 | f.get (this, f.get_sint32 ()); |
564 | break; |
576 | break; |
… | |
… | |
582 | // was: insert_ob_in_ob (tmp, op); |
594 | // was: insert_ob_in_ob (tmp, op); |
583 | // but manually adding it can improve map loading times a lot |
595 | // but manually adding it can improve map loading times a lot |
584 | // also, appending instead of prepending keeps the |
596 | // also, appending instead of prepending keeps the |
585 | // save ordering the same between repeated load/saves. |
597 | // save ordering the same between repeated load/saves. |
586 | // and finally we do not want any funny effects |
598 | // and finally we do not want any funny effects |
587 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
599 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
588 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
600 | tmp->clr_flag (FLAG_REMOVED); |
589 | |
601 | |
590 | if (!op_inv) |
602 | if (!op_inv) |
591 | { |
603 | { |
592 | inv = tmp; |
604 | inv = tmp; |
593 | tmp->above = 0; |
605 | tmp->above = 0; |
… | |
… | |
626 | f.delayed_deref (this, owner, f.get_str ()); |
638 | f.delayed_deref (this, owner, f.get_str ()); |
627 | break; |
639 | break; |
628 | |
640 | |
629 | case KW_animation: |
641 | case KW_animation: |
630 | { |
642 | { |
631 | CLEAR_FLAG (this, FLAG_ANIMATE); |
643 | clr_flag (FLAG_ANIMATE); |
632 | animation_id = 0; |
644 | animation_id = 0; |
633 | |
645 | |
634 | const char *str = f.get_str (); |
646 | if (f.has_value () && (animation_id = animation::find (f.get_str ()).number)) |
635 | if (str && (animation_id = find_animation (str))) |
|
|
636 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
647 | set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
637 | } |
648 | } |
638 | break; |
649 | break; |
639 | |
650 | |
640 | case KW_last_heal: f.get (last_heal); break; |
651 | case KW_last_heal: f.get (last_heal); break; |
641 | case KW_last_sp: f.get (last_sp); break; |
652 | case KW_last_sp: f.get (last_sp); break; |
642 | case KW_last_grace: f.get (last_grace); break; |
653 | case KW_last_grace: f.get (last_grace); break; |
643 | case KW_last_eat: f.get (last_eat); break; |
654 | case KW_last_eat: f.get (last_eat); break; |
|
|
655 | case KW_sl: |
644 | case KW_speed_left: f.get (speed_left); break; |
656 | case KW_speed_left: f.get (speed_left); break; |
645 | |
657 | |
646 | case KW_speed: |
658 | case KW_speed: |
647 | f.get (speed); |
659 | f.get (speed); |
648 | |
660 | |
… | |
… | |
657 | move_slow |= MOVE_WALK; |
669 | move_slow |= MOVE_WALK; |
658 | f.get (move_slow_penalty); |
670 | f.get (move_slow_penalty); |
659 | break; |
671 | break; |
660 | |
672 | |
661 | case KW_face: |
673 | case KW_face: |
662 | face = face_find (f.get_str ()); |
674 | face = f.has_value () ? face_find (f.get_str ()) : blank_face; |
663 | break; |
675 | break; |
664 | |
676 | |
665 | case KW_sound: |
677 | case KW_sound: |
|
|
678 | if (f.has_value ()) |
|
|
679 | { |
666 | sound = sound_find (f.get_str ()); |
680 | sound = sound_find (f.get_str ()); |
667 | if (!sound) |
681 | if (!sound) |
668 | f.parse_warn ("sound not found"); |
682 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
683 | } |
|
|
684 | else |
|
|
685 | sound = 0; |
669 | break; |
686 | break; |
670 | |
687 | |
671 | case KW_sound_destroy: |
688 | case KW_sound_destroy: |
|
|
689 | if (f.has_value ()) |
|
|
690 | { |
672 | sound_destroy = sound_find (f.get_str ()); |
691 | sound_destroy = sound_find (f.get_str ()); |
673 | if (!sound_destroy) |
692 | if (!sound_destroy) |
674 | f.parse_warn ("sound not found"); |
693 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
694 | } |
|
|
695 | else |
|
|
696 | sound_destroy = 0; |
675 | break; |
697 | break; |
676 | |
698 | |
677 | case KW_x: f.get (x); break; |
699 | case KW_x: f.get (x); break; |
678 | case KW_y: f.get (y); break; |
700 | case KW_y: f.get (y); break; |
679 | |
701 | |
… | |
… | |
720 | case KW_invisible: f.get (invisible); break; |
742 | case KW_invisible: f.get (invisible); break; |
721 | case KW_magic: f.get (magic); break; |
743 | case KW_magic: f.get (magic); break; |
722 | case KW_state: f.get (state); break; |
744 | case KW_state: f.get (state); break; |
723 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
745 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
724 | case KW_material: f.get (materials); break; //TODO: nuke |
746 | case KW_material: f.get (materials); break; //TODO: nuke |
725 | case KW_materialname: f.get (materialname); break; |
747 | case KW_materialname: f.get (material); break; |
726 | |
748 | |
727 | /* These are the new values */ |
749 | /* These are the new values */ |
728 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
750 | case KW_move_block: set_move (move_block, f); break; |
729 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
751 | case KW_move_allow: set_move (move_allow, f); break; |
730 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
752 | case KW_move_type: set_move (move_type , f); break; |
731 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
753 | case KW_move_on: set_move (move_on , f); break; |
732 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
754 | case KW_move_off: set_move (move_off , f); break; |
733 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
755 | case KW_move_slow: set_move (move_slow , f); break; |
734 | |
|
|
735 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
736 | case KW_no_pass: |
|
|
737 | { |
|
|
738 | if (f.get_sint32 ()) |
|
|
739 | move_block = MOVE_ALL; |
|
|
740 | else |
|
|
741 | move_block = 0; |
|
|
742 | } |
|
|
743 | |
|
|
744 | break; |
|
|
745 | |
|
|
746 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
747 | case KW_walk_on: |
|
|
748 | { |
|
|
749 | if (f.get_sint32 ()) |
|
|
750 | move_on |= MOVE_WALK; |
|
|
751 | else |
|
|
752 | move_on &= ~MOVE_WALK; |
|
|
753 | } |
|
|
754 | |
|
|
755 | break; |
|
|
756 | |
|
|
757 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
758 | case KW_walk_off: |
|
|
759 | { |
|
|
760 | if (f.get_sint32 ()) |
|
|
761 | move_off |= MOVE_WALK; |
|
|
762 | else |
|
|
763 | move_off &= ~MOVE_WALK; |
|
|
764 | } |
|
|
765 | break; |
|
|
766 | |
|
|
767 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
768 | case KW_fly_on: |
|
|
769 | { |
|
|
770 | if (f.get_sint32 ()) |
|
|
771 | move_on |= MOVE_FLY_LOW; |
|
|
772 | else |
|
|
773 | move_on &= ~MOVE_FLY_LOW; |
|
|
774 | } |
|
|
775 | break; |
|
|
776 | |
|
|
777 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
778 | case KW_fly_off: |
|
|
779 | { |
|
|
780 | if (f.get_sint32 ()) |
|
|
781 | move_off |= MOVE_FLY_LOW; |
|
|
782 | else |
|
|
783 | move_off &= ~MOVE_FLY_LOW; |
|
|
784 | } |
|
|
785 | break; |
|
|
786 | |
756 | |
787 | //TODO: remove these after converting archetypes |
757 | //TODO: remove these after converting archetypes |
788 | case KW_can_use_wand: |
758 | case KW_can_use_wand: |
789 | GET_FLAG (this, FLAG_USE_RANGE); |
759 | GET_FLAG (this, FLAG_USE_RANGE); |
790 | break; |
760 | break; |
791 | |
761 | |
792 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
793 | case KW_flying: |
|
|
794 | { |
|
|
795 | if (f.get_sint32 ()) |
|
|
796 | move_type |= MOVE_FLY_LOW; |
|
|
797 | else |
|
|
798 | move_type &= ~MOVE_FLY_LOW; |
|
|
799 | } |
|
|
800 | break; |
|
|
801 | |
|
|
802 | |
|
|
803 | case KW_identified: |
762 | case KW_identified: |
804 | GET_FLAG (this, FLAG_IDENTIFIED); |
763 | GET_FLAG (this, FLAG_IDENTIFIED); |
805 | //TODO: move to check_object or so |
764 | //TODO: move to check_object or so |
806 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
765 | if (this->flag [FLAG_IDENTIFIED]) |
807 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
766 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
808 | |
767 | |
809 | break; |
768 | break; |
810 | |
769 | |
811 | case KW_friendly: |
770 | case KW_friendly: |
812 | if (f.get_bool ()) |
771 | if (f.get_bool ()) |
… | |
… | |
839 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
798 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
840 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
799 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
841 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
800 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
842 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
801 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
843 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
802 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
|
|
803 | case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break; |
844 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
804 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
845 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
805 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
846 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
806 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
847 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
807 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
848 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
808 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
849 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
809 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
850 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
810 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
851 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
811 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
852 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
|
|
853 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
812 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
854 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
813 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
855 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
814 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
856 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
815 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
857 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
816 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
… | |
… | |
901 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
860 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
902 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
861 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
903 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
862 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
904 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
863 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
905 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
864 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
865 | case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; |
|
|
866 | case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break; |
906 | |
867 | |
907 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
868 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
908 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
869 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
909 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
870 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
910 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
871 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
985 | add_link (map, connected); |
946 | add_link (map, connected); |
986 | } |
947 | } |
987 | break; |
948 | break; |
988 | |
949 | |
989 | case KW_randomitems: |
950 | case KW_randomitems: |
990 | if (f.get_str ()) |
951 | if (f.has_value ()) |
991 | { |
952 | { |
992 | randomitems = |
953 | randomitems = |
993 | loading_arch |
954 | loading_arch |
994 | ? treasurelist::get (f.get_str ()) |
955 | ? treasurelist::get (f.get_str ()) |
995 | : treasurelist::find (f.get_str ()); |
956 | : treasurelist::find (f.get_str ()); |
996 | |
957 | |
997 | if (!randomitems) |
958 | if (!randomitems) |
|
|
959 | { |
998 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
960 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
961 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
962 | } |
999 | } |
963 | } |
1000 | else |
964 | else |
1001 | randomitems = 0; |
965 | randomitems = 0; |
1002 | break; |
966 | break; |
1003 | |
967 | |
… | |
… | |
1019 | |
983 | |
1020 | f.next (); |
984 | f.next (); |
1021 | return true; |
985 | return true; |
1022 | |
986 | |
1023 | case KW_ERROR: |
987 | case KW_ERROR: |
1024 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1025 | // we also do not even try to find old values, duplicate keys stay duplicate |
988 | // we do not even try to find old values, duplicate keys stay duplicate |
1026 | { |
989 | // the list gets reversed after loading |
1027 | key_value *kv = new key_value; |
990 | kv.add (shstr (f.kw_str), shstr (f.value)); |
1028 | |
|
|
1029 | kv->next = 0; |
|
|
1030 | kv->key = shstr (f.kw_str); |
|
|
1031 | kv->value = shstr (f.value); |
|
|
1032 | |
|
|
1033 | if (!last_kv) |
|
|
1034 | key_values = last_kv = kv; |
|
|
1035 | else |
|
|
1036 | { |
|
|
1037 | while (last_kv->next) |
|
|
1038 | last_kv = last_kv->next; |
|
|
1039 | |
|
|
1040 | last_kv->next = kv; |
|
|
1041 | last_kv = kv; |
|
|
1042 | } |
|
|
1043 | } |
|
|
1044 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
|
|
1045 | break; |
991 | break; |
1046 | |
992 | |
1047 | default: |
993 | default: |
1048 | if (!f.parse_error ("object", name)) |
994 | if (!f.parse_error ("object", name)) |
1049 | return false; |
995 | return false; |
… | |
… | |
1061 | |
1007 | |
1062 | archetype *arch = archetype::find (f.get_str ()); |
1008 | archetype *arch = archetype::find (f.get_str ()); |
1063 | |
1009 | |
1064 | if (!arch) |
1010 | if (!arch) |
1065 | { |
1011 | { |
1066 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1012 | LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); |
1067 | arch = archetype::find ("earthwall"); |
1013 | arch = archetype::find (shstr_earthwall); |
1068 | } |
1014 | } |
1069 | |
1015 | |
1070 | assert (arch); //D maybe use exception handling of sorts? |
1016 | assert (arch); //D maybe use exception handling of sorts? |
1071 | |
1017 | |
1072 | f.next (); |
1018 | f.next (); |
… | |
… | |
1079 | if (!op->parse_kv (f)) |
1025 | if (!op->parse_kv (f)) |
1080 | { |
1026 | { |
1081 | op->destroy (); |
1027 | op->destroy (); |
1082 | return 0; |
1028 | return 0; |
1083 | } |
1029 | } |
|
|
1030 | |
|
|
1031 | // the loader reverses the ordering of kv-pairs, so we reverse it again after loading |
|
|
1032 | // that greatly simplifies the loading code. |
|
|
1033 | op->kv.reverse (); |
1084 | |
1034 | |
1085 | op->post_load_check (); |
1035 | op->post_load_check (); |
1086 | return op; |
1036 | return op; |
1087 | } |
1037 | } |
1088 | |
1038 | |
… | |
… | |
1093 | * override values and in c_wiz to mutate values. |
1043 | * override values and in c_wiz to mutate values. |
1094 | */ |
1044 | */ |
1095 | int |
1045 | int |
1096 | set_variable (object *op, char *buf) |
1046 | set_variable (object *op, char *buf) |
1097 | { |
1047 | { |
1098 | object_thawer f (buf, (AV *)0); |
1048 | object_thawer f (format ("%s\nend", buf), (AV *)0); |
1099 | |
1049 | |
1100 | return op->parse_kv (f); |
1050 | return op->parse_kv (f); |
1101 | } |
1051 | } |
1102 | |
1052 | |
1103 | /* This returns a string of the integer movement type */ |
|
|
1104 | #if 0 |
|
|
1105 | // unused function |
|
|
1106 | static char * |
|
|
1107 | get_string_move_type (MoveType mt) |
|
|
1108 | { |
|
|
1109 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1110 | int i, all_count = 0, count; |
|
|
1111 | |
|
|
1112 | strcpy (retbuf, ""); |
|
|
1113 | strcpy (retbuf_all, " all"); |
|
|
1114 | |
|
|
1115 | /* Quick check, and probably fairly common */ |
|
|
1116 | if (mt == MOVE_ALL) |
|
|
1117 | return retbuf_all + 1; |
|
|
1118 | if (mt == 0) |
|
|
1119 | { |
|
|
1120 | strcpy (retbuf, "0"); |
|
|
1121 | return retbuf; |
|
|
1122 | } |
|
|
1123 | |
|
|
1124 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1125 | * because we may want to return a string like 'all -swim', |
|
|
1126 | * and if we just looked at mt, we couldn't get that. |
|
|
1127 | */ |
|
|
1128 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1129 | { |
|
|
1130 | if (mt & (1 << count)) |
|
|
1131 | { |
|
|
1132 | strcat (retbuf, " "); |
|
|
1133 | strcat (retbuf, move_name[count]); |
|
|
1134 | } |
|
|
1135 | else |
|
|
1136 | { |
|
|
1137 | strcat (retbuf_all, " -"); |
|
|
1138 | strcat (retbuf_all, move_name[count]); |
|
|
1139 | all_count++; |
|
|
1140 | } |
|
|
1141 | } |
|
|
1142 | /* Basically, if there is a single negation, return it, eg |
|
|
1143 | * 'all -swim'. But more than that, just return the |
|
|
1144 | * enumerated values. It doesn't make sense to return |
|
|
1145 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1146 | */ |
|
|
1147 | if (all_count <= 1) |
|
|
1148 | return retbuf_all + 1; |
|
|
1149 | else |
|
|
1150 | return retbuf + 1; |
|
|
1151 | } |
|
|
1152 | #endif |
|
|
1153 | |
|
|
1154 | // compare *op against *tmp and output differences |
1053 | // compare *op against *arch and output differences |
1155 | static void |
1054 | static void |
1156 | write_diff (object_freezer &f, object *op, object *tmp) |
1055 | write_diff (object_freezer &f, object *op, object *arch) |
1157 | { |
1056 | { |
1158 | static const keyword resist_save[NROFATTACKS] = { |
1057 | static const keyword resist_save[NROFATTACKS] = { |
1159 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1058 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1160 | # include "attackinc.h" |
1059 | # include "attackinc.h" |
1161 | # undef def |
1060 | # undef def |
… | |
… | |
1174 | KW_NULL, |
1073 | KW_NULL, |
1175 | KW_applied, |
1074 | KW_applied, |
1176 | KW_unpaid, |
1075 | KW_unpaid, |
1177 | KW_can_use_shield, |
1076 | KW_can_use_shield, |
1178 | KW_no_pick, |
1077 | KW_no_pick, |
1179 | KW_NULL, // walk_on |
1078 | KW_is_transparent_floor, |
|
|
1079 | /* 10 */ |
1180 | KW_NULL, // no_pass |
1080 | KW_NULL, // no_pass |
1181 | /* 10 */ |
|
|
1182 | KW_is_animated, |
1081 | KW_is_animated, |
1183 | KW_NULL, // slow_move |
1082 | KW_NULL, // slow_move |
1184 | KW_NULL, // flying |
1083 | KW_NULL, // flying |
1185 | KW_monster, |
1084 | KW_monster, |
1186 | KW_friendly, |
1085 | KW_friendly, |
1187 | KW_generator, |
1086 | KW_generator, |
1188 | KW_is_thrown, |
1087 | KW_is_thrown, |
1189 | KW_auto_apply, |
1088 | KW_auto_apply, |
1190 | KW_treasure_env, |
1089 | KW_treasure_env, |
|
|
1090 | /* 20 */ |
1191 | KW_player_sold, |
1091 | KW_player_sold, |
1192 | /* 20 */ |
|
|
1193 | KW_see_invisible, |
1092 | KW_see_invisible, |
1194 | KW_can_roll, |
1093 | KW_can_roll, |
1195 | KW_overlay_floor, |
1094 | KW_overlay_floor, |
1196 | KW_is_turnable, |
1095 | KW_is_turnable, |
1197 | KW_NULL, // walk_off |
1096 | KW_NULL, // walk_off |
1198 | KW_NULL, // fly_on |
1097 | KW_NULL, // fly_on |
1199 | KW_NULL, // fly_off |
1098 | KW_NULL, // fly_off |
1200 | KW_is_used_up, |
1099 | KW_is_used_up, |
1201 | KW_identified, |
1100 | KW_identified, |
|
|
1101 | /* 30 */ |
1202 | KW_reflecting, |
1102 | KW_reflecting, |
1203 | /* 30 */ |
|
|
1204 | KW_changing, |
1103 | KW_changing, |
1205 | KW_splitting, |
1104 | KW_splitting, |
1206 | KW_hitback, |
1105 | KW_hitback, |
1207 | KW_startequip, |
1106 | KW_startequip, |
1208 | KW_blocksview, |
1107 | KW_blocksview, |
1209 | KW_undead, |
1108 | KW_undead, |
1210 | KW_scared, |
1109 | KW_scared, |
1211 | KW_unaggressive, |
1110 | KW_unaggressive, |
1212 | KW_reflect_missile, |
1111 | KW_reflect_missile, |
|
|
1112 | /* 40 */ |
1213 | KW_reflect_spell, |
1113 | KW_reflect_spell, |
1214 | /* 40 */ |
|
|
1215 | KW_no_magic, |
1114 | KW_no_magic, |
1216 | KW_no_fix_player, |
1115 | KW_NULL, |
1217 | KW_is_lightable, |
1116 | KW_is_lightable, |
1218 | KW_tear_down, |
1117 | KW_tear_down, |
1219 | KW_run_away, |
1118 | KW_run_away, |
1220 | KW_NULL, // pass_thru |
1119 | KW_NULL, // pass_thru |
1221 | KW_NULL, // an_pass_thru |
1120 | KW_NULL, // an_pass_thru |
1222 | KW_pick_up, |
1121 | KW_pick_up, |
1223 | KW_unique, |
1122 | KW_unique, |
|
|
1123 | /* 50 */ |
1224 | KW_no_drop, |
1124 | KW_no_drop, |
1225 | /* 50 */ |
|
|
1226 | KW_NULL, // wizcast |
1125 | KW_NULL, // wizcast |
1227 | KW_can_cast_spell, |
1126 | KW_can_cast_spell, |
1228 | KW_can_use_scroll, |
1127 | KW_can_use_scroll, |
1229 | KW_can_use_range, |
1128 | KW_can_use_range, |
1230 | KW_can_use_bow, |
1129 | KW_can_use_bow, |
1231 | KW_can_use_armour, |
1130 | KW_can_use_armour, |
1232 | KW_can_use_weapon, |
1131 | KW_can_use_weapon, |
1233 | KW_can_use_ring, |
1132 | KW_can_use_ring, |
1234 | KW_has_ready_range, |
1133 | KW_has_ready_range, |
|
|
1134 | /* 60 */ |
1235 | KW_has_ready_bow, |
1135 | KW_has_ready_bow, |
1236 | /* 60 */ |
|
|
1237 | KW_xrays, |
1136 | KW_xrays, |
1238 | KW_NULL, |
1137 | KW_NULL, |
1239 | KW_is_floor, |
1138 | KW_is_floor, |
1240 | KW_lifesave, |
1139 | KW_lifesave, |
1241 | KW_no_strength, |
1140 | KW_no_strength, |
1242 | KW_sleep, |
1141 | KW_sleep, |
1243 | KW_stand_still, |
1142 | KW_stand_still, |
1244 | KW_random_move, |
1143 | KW_random_move, |
1245 | KW_only_attack, |
1144 | KW_only_attack, |
|
|
1145 | /* 70 */ |
1246 | KW_confused, |
1146 | KW_confused, |
1247 | /* 70 */ |
|
|
1248 | KW_stealth, |
1147 | KW_stealth, |
1249 | KW_NULL, |
1148 | KW_NULL, |
1250 | KW_NULL, |
1149 | KW_NULL, |
1251 | KW_cursed, |
1150 | KW_cursed, |
1252 | KW_damned, |
1151 | KW_damned, |
1253 | KW_see_anywhere, |
1152 | KW_see_anywhere, |
1254 | KW_known_magical, |
1153 | KW_known_magical, |
1255 | KW_known_cursed, |
1154 | KW_known_cursed, |
1256 | KW_can_use_skill, |
1155 | KW_can_use_skill, |
|
|
1156 | /* 80 */ |
1257 | KW_been_applied, |
1157 | KW_been_applied, |
1258 | /* 80 */ |
|
|
1259 | KW_has_ready_scroll, |
1158 | KW_has_ready_scroll, |
1260 | KW_can_use_rod, |
1159 | KW_can_use_rod, |
1261 | KW_precious, |
1160 | KW_precious, |
1262 | KW_can_use_horn, |
1161 | KW_can_use_horn, |
1263 | KW_make_invisible, |
1162 | KW_make_invisible, |
1264 | KW_inv_locked, |
1163 | KW_inv_locked, |
1265 | KW_is_wooded, |
1164 | KW_is_wooded, |
1266 | KW_is_hilly, |
1165 | KW_is_hilly, |
1267 | KW_has_ready_skill, |
1166 | KW_has_ready_skill, |
|
|
1167 | /* 90 */ |
1268 | KW_has_ready_weapon, |
1168 | KW_has_ready_weapon, |
1269 | /* 90 */ |
|
|
1270 | KW_no_skill_ident, |
1169 | KW_no_skill_ident, |
1271 | KW_is_blind, |
1170 | KW_is_blind, |
1272 | KW_can_see_in_dark, |
1171 | KW_can_see_in_dark, |
1273 | KW_is_cauldron, |
1172 | KW_is_cauldron, |
1274 | KW_NULL, |
1173 | KW_NULL, |
1275 | KW_no_steal, |
1174 | KW_no_steal, |
1276 | KW_one_hit, |
1175 | KW_one_hit, |
1277 | KW_NULL, |
1176 | KW_NULL, |
1278 | KW_berserk, |
1177 | KW_berserk, |
|
|
1178 | /* 100 */ |
1279 | KW_neutral, |
1179 | KW_neutral, |
1280 | /* 100 */ |
|
|
1281 | KW_no_attack, |
1180 | KW_no_attack, |
1282 | KW_no_damage, |
1181 | KW_no_damage, |
1283 | KW_obj_original, |
1182 | KW_obj_original, |
1284 | KW_NULL, |
1183 | KW_random_speed, |
1285 | KW_activate_on_push, |
1184 | KW_activate_on_push, |
1286 | KW_activate_on_release, |
1185 | KW_activate_on_release, |
1287 | KW_is_water, |
1186 | KW_is_water, |
1288 | KW_use_content_on_gen, |
1187 | KW_use_content_on_gen, |
1289 | KW_NULL, |
1188 | KW_NULL, |
|
|
1189 | /* 110 */ |
1290 | KW_is_buildable, |
1190 | KW_is_buildable, |
1291 | /* 110 */ |
|
|
1292 | KW_destroy_on_death, |
1191 | KW_destroy_on_death, |
1293 | KW_NULL, |
1192 | KW_NULL, |
1294 | }; |
1193 | }; |
1295 | |
1194 | |
|
|
1195 | // obj_original is the only commonly differing flag between archetype |
|
|
1196 | // and object, so special-case it here to be able to skip the loop |
|
|
1197 | static const struct flagmask : object::flags_t |
|
|
1198 | { |
|
|
1199 | flagmask () |
|
|
1200 | { |
|
|
1201 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1202 | if (flag_names [i]) |
|
|
1203 | set (i); |
|
|
1204 | } |
|
|
1205 | } flagmask; |
|
|
1206 | |
1296 | /* This saves the key/value lists. We do it first so that any |
1207 | /* This saves the key/value lists. We do it first so that any |
1297 | * keys that match field names will be overwritten by the loader. |
1208 | * keys that match field names will be overwritten by the loader. |
1298 | */ |
1209 | */ |
1299 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1210 | for (key_value *kv = op->kv.first; kv; kv = kv->next) |
1300 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1211 | if (arch->kv.empty () || arch->kv [kv->key] != kv->value) |
1301 | f.put (kv->key, kv->value); |
1212 | f.put (kv->key, kv->value); |
1302 | |
1213 | |
1303 | /* We don't need to worry about the arch's extra fields - they |
1214 | if (op->uuid) |
1304 | * will get taken care of the copy_to method. |
1215 | { |
1305 | */ |
1216 | // highly optimised - this is often 25% of all data written |
|
|
1217 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1218 | char *ptr = cur; |
1306 | |
1219 | |
1307 | f.put (KW_uuid, op->uuid.c_str ()); |
1220 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
|
|
1221 | ptr += sizeof ("uuid ") - 1; |
|
|
1222 | ptr = op->uuid.append (ptr); |
|
|
1223 | *ptr++ = '\n'; |
1308 | |
1224 | |
|
|
1225 | f.alloc (ptr - cur); |
|
|
1226 | } |
|
|
1227 | |
1309 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1228 | #define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v) |
1310 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
1229 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) |
1311 | |
1230 | |
1312 | if (object *owner = op->owner) |
1231 | CMP_OUT (x); |
1313 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1232 | CMP_OUT (y); |
|
|
1233 | |
|
|
1234 | CMP_OUT (type); |
|
|
1235 | CMP_OUT (subtype); |
|
|
1236 | CMP_OUT (direction); |
1314 | |
1237 | |
1315 | CMP_OUT (name); |
1238 | CMP_OUT (name); |
1316 | CMP_OUT (name_pl); |
1239 | CMP_OUT (name_pl); |
1317 | CMP_OUT (custom_name); |
1240 | CMP_OUT (speed); |
|
|
1241 | |
|
|
1242 | // speed_left is a major time-burner, and has good locality, so |
|
|
1243 | // we use a simple lookup-cache to avoid the very slow printf. |
|
|
1244 | if (op->speed_left != arch->speed_left) |
|
|
1245 | { |
|
|
1246 | static double last_speed_left = 0.; |
|
|
1247 | static char last_speed_left_str [256] = "sl 0\n"; |
|
|
1248 | static int last_speed_left_len = sizeof ("sl 0\n") - 1; |
|
|
1249 | |
|
|
1250 | if (last_speed_left != op->speed_left) |
|
|
1251 | { |
|
|
1252 | last_speed_left = op->speed_left; |
|
|
1253 | // .7g loses precision even for float, but gives nice round numbers and smaller files |
|
|
1254 | // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster? |
|
|
1255 | // (printf is typically very slow) |
|
|
1256 | last_speed_left_len = sizeof ("sl ") - 1 |
|
|
1257 | + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); |
|
|
1258 | } |
|
|
1259 | |
|
|
1260 | f.add (last_speed_left_str, last_speed_left_len); |
|
|
1261 | } |
|
|
1262 | |
1318 | CMP_OUT (title); |
1263 | CMP_OUT (title); |
1319 | CMP_OUT (race); |
1264 | CMP_OUT (race); |
|
|
1265 | CMP_OUT (slaying); |
1320 | CMP_OUT (skill); |
1266 | CMP_OUT (skill); |
1321 | CMP_OUT (slaying); |
1267 | |
1322 | CMP_OUT (tag); |
1268 | CMP_OUT (tag); |
|
|
1269 | CMP_OUT (custom_name); |
|
|
1270 | |
|
|
1271 | if (object *owner = op->owner) |
|
|
1272 | if (const char *ref = owner->ref ()) |
|
|
1273 | f.put (KW(owner), ref); |
|
|
1274 | |
|
|
1275 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
|
|
1276 | |
1323 | CMP_OUT (other_arch); |
1277 | CMP_OUT (other_arch); |
1324 | |
1278 | |
1325 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1279 | if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); |
1326 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1280 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
1327 | |
1281 | |
1328 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1282 | if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); |
1329 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1283 | if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); |
1330 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1284 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1331 | |
1285 | |
1332 | if (op->animation_id != tmp->animation_id) |
1286 | if (op->animation_id != arch->animation_id) |
1333 | if (op->has_anim ()) |
1287 | if (op->has_anim ()) |
1334 | f.put (KW_animation, op->anim ().name); |
1288 | f.put (KW(animation), op->anim ().name); |
1335 | else |
1289 | else |
1336 | { |
1290 | { |
1337 | f.put (KW_animation, (const char *)0); |
1291 | f.put (KW(animation)); |
1338 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1292 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1339 | } |
1293 | } |
1340 | |
1294 | |
1341 | CMP_OUT2 (str, stats.Str); |
1295 | CMP_OUT2 (str, stats.Str); |
1342 | CMP_OUT2 (dex, stats.Dex); |
1296 | CMP_OUT2 (dex, stats.Dex); |
… | |
… | |
1353 | CMP_OUT2 (grace, stats.grace); |
1307 | CMP_OUT2 (grace, stats.grace); |
1354 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1308 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1355 | CMP_OUT2 (exp, stats.exp); |
1309 | CMP_OUT2 (exp, stats.exp); |
1356 | |
1310 | |
1357 | CMP_OUT (perm_exp); |
1311 | CMP_OUT (perm_exp); |
1358 | CMP_OUT (expmul); |
1312 | //CMP_OUT (expmul); |
1359 | |
1313 | |
1360 | CMP_OUT2 (food, stats.food); |
1314 | CMP_OUT2 (food, stats.food); |
1361 | CMP_OUT2 (dam, stats.dam); |
1315 | CMP_OUT2 (dam, stats.dam); |
1362 | CMP_OUT2 (luck, stats.luck); |
1316 | CMP_OUT2 (luck, stats.luck); |
1363 | CMP_OUT2 (wc, stats.wc); |
1317 | CMP_OUT2 (wc, stats.wc); |
1364 | CMP_OUT2 (ac, stats.ac); |
1318 | CMP_OUT2 (ac, stats.ac); |
1365 | |
1319 | |
1366 | CMP_OUT (x); |
|
|
1367 | CMP_OUT (y); |
|
|
1368 | CMP_OUT (speed); |
|
|
1369 | CMP_OUT (speed_left); |
|
|
1370 | CMP_OUT2 (move_state, move_status); |
1320 | CMP_OUT2 (move_state, move_status); |
1371 | CMP_OUT (attack_movement); |
1321 | CMP_OUT (attack_movement); |
1372 | CMP_OUT (nrof); |
1322 | CMP_OUT (nrof); |
1373 | CMP_OUT (level); |
1323 | CMP_OUT (level); |
1374 | CMP_OUT (direction); |
|
|
1375 | CMP_OUT (type); |
|
|
1376 | CMP_OUT (subtype); |
|
|
1377 | CMP_OUT (attacktype); |
1324 | CMP_OUT (attacktype); |
1378 | |
1325 | |
|
|
1326 | // using memcmp here seems to be a loss - is gcc vectorising? |
1379 | for (int i = 0; i < NROFATTACKS; i++) |
1327 | for (int i = 0; i < NROFATTACKS; i++) |
1380 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1328 | if (expect_false (op->resist[i] != arch->resist[i])) |
1381 | f.put (resist_save[i], op->resist[i]); |
1329 | f.put (resist_save[i], op->resist[i]); |
1382 | |
1330 | |
1383 | CMP_OUT (path_attuned); |
1331 | CMP_OUT (path_attuned); |
1384 | CMP_OUT (path_repelled); |
1332 | CMP_OUT (path_repelled); |
1385 | CMP_OUT (path_denied); |
1333 | CMP_OUT (path_denied); |
|
|
1334 | |
1386 | CMP_OUT2 (material, materials);//TODO: nuke |
1335 | CMP_OUT2 (material, materials);//TODO: nuke |
1387 | CMP_OUT (materialname); |
1336 | if (op->material != arch->material) |
|
|
1337 | f.put (KW(materialname), op->material->name); |
|
|
1338 | |
1388 | CMP_OUT (value); |
1339 | CMP_OUT (value); |
1389 | CMP_OUT (carrying); |
1340 | CMP_OUT (carrying); |
1390 | CMP_OUT (weight); |
1341 | CMP_OUT (weight); |
1391 | CMP_OUT (invisible); |
1342 | CMP_OUT (invisible); |
1392 | CMP_OUT (state); |
1343 | CMP_OUT (state); |
… | |
… | |
1397 | CMP_OUT (last_eat); |
1348 | CMP_OUT (last_eat); |
1398 | CMP_OUT (glow_radius); |
1349 | CMP_OUT (glow_radius); |
1399 | |
1350 | |
1400 | if (op->flag [FLAG_IS_LINKED]) |
1351 | if (op->flag [FLAG_IS_LINKED]) |
1401 | if (auto (ol, op->find_link ())) |
1352 | if (auto (ol, op->find_link ())) |
1402 | f.put (KW_connected, ol->id); |
1353 | f.put (KW(connected), ol->id); |
1403 | |
1354 | |
1404 | CMP_OUT (randomitems); |
1355 | CMP_OUT (randomitems); |
|
|
1356 | |
1405 | CMP_OUT2 (container, weight_limit); |
1357 | CMP_OUT2 (container, weight_limit); |
1406 | |
1358 | |
1407 | CMP_OUT (run_away); |
1359 | CMP_OUT (run_away); |
1408 | CMP_OUT (pick_up); |
1360 | CMP_OUT (pick_up); |
1409 | CMP_OUT (will_apply); |
1361 | CMP_OUT (will_apply); |
… | |
… | |
1424 | CMP_OUT (move_on); |
1376 | CMP_OUT (move_on); |
1425 | CMP_OUT (move_off); |
1377 | CMP_OUT (move_off); |
1426 | CMP_OUT (move_slow); |
1378 | CMP_OUT (move_slow); |
1427 | CMP_OUT (move_slow_penalty); |
1379 | CMP_OUT (move_slow_penalty); |
1428 | |
1380 | |
1429 | if (op->flag != tmp->flag) |
1381 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1382 | |
|
|
1383 | #if stdcpp // we need gcc, sorry |
|
|
1384 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1385 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1386 | |
|
|
1387 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1388 | |
|
|
1389 | // quickly test whether any other flags differ |
|
|
1390 | if (expect_true (diff.any ())) |
1430 | for (int i = 0; i <= NUM_FLAGS; i++) |
1391 | for (int i = 0; i < NUM_FLAGS; i++) |
1431 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1392 | if (expect_false (diff [i])) |
1432 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1393 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1394 | #else |
|
|
1395 | // use sgi extensions |
|
|
1396 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1397 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1398 | #endif |
1433 | |
1399 | |
1434 | // save body locations |
1400 | // save body locations. gcc's memcmp does an abysmal job when used |
1435 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1401 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1436 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1402 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1437 | f.put (body_locations[i].save_name, op->slot[i].info); |
1403 | f.put (body_locations[i].kw, op->slot[i].info); |
1438 | } |
1404 | } |
1439 | |
1405 | |
1440 | /* |
1406 | /* |
1441 | * Dumps all variables in an object to a file. |
1407 | * Dumps all variables in an object to a file. |
1442 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1408 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1443 | * the only place this is not set is when saving the player. |
1409 | * the only place this is not set is when saving the player. |
1444 | */ |
1410 | */ |
1445 | bool |
1411 | bool |
1446 | object::write (object_freezer &f) |
1412 | object::write (object_freezer &f) |
1447 | { |
1413 | { |
1448 | if (is_arch ()) |
1414 | if (expect_false (is_arch ())) |
1449 | { |
1415 | { |
1450 | f.put (KW_object, arch->archname); |
1416 | f.put (KW(object), arch->archname); |
1451 | write_diff (f, this, archetype::empty); |
1417 | write_diff (f, this, archetype::empty); |
1452 | } |
1418 | } |
1453 | else |
1419 | else |
1454 | { |
1420 | { |
1455 | f.put (KW_arch, arch->archname); |
1421 | f.put (KW(arch), arch->archname); |
1456 | write_diff (f, this, arch); |
1422 | write_diff (f, this, arch); |
1457 | } |
1423 | } |
1458 | |
1424 | |
1459 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1425 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1460 | tmp->write (f); |
1426 | tmp->write (f); |
1461 | |
1427 | |
1462 | f.put (this); |
1428 | f.put (this); |
1463 | f.put (KW_end); |
1429 | f.put (KW(end)); |
1464 | |
1430 | |
1465 | return true; |
1431 | return true; |
1466 | } |
1432 | } |
1467 | |
1433 | |
1468 | ///////////////////////////////////////////////////////////////////////////// |
1434 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1474 | { |
1440 | { |
1475 | object_thawer f (filename); |
1441 | object_thawer f (filename); |
1476 | |
1442 | |
1477 | for (;;) |
1443 | for (;;) |
1478 | { |
1444 | { |
|
|
1445 | coroapi::cede_to_tick (); |
|
|
1446 | |
1479 | switch (f.kw) |
1447 | switch (f.kw) |
1480 | { |
1448 | { |
1481 | case KW_region: |
1449 | case KW_region: |
1482 | if (!region::read (f)) |
1450 | if (!region::read (f)) |
1483 | return false; |
1451 | return false; |