… | |
… | |
499 | if (thawer.get_sint32 ()) \ |
499 | if (thawer.get_sint32 ()) \ |
500 | SET_FLAG (op, flag); \ |
500 | SET_FLAG (op, flag); \ |
501 | else \ |
501 | else \ |
502 | CLEAR_FLAG (op, flag) \ |
502 | CLEAR_FLAG (op, flag) \ |
503 | |
503 | |
504 | int parse_object (object * op, object_thawer & thawer, int map_flags) |
504 | int parse_object (object *op, object_thawer &thawer, int map_flags) |
505 | { |
505 | { |
506 | bool ismore = 0; |
506 | bool ismore = 0; |
|
|
507 | object *op_inv = op->inv; |
507 | |
508 | |
508 | for (;;) |
509 | for (;;) |
509 | { |
510 | { |
510 | keyword kw = thawer.get_kv (); |
511 | keyword kw = thawer.get_kv (); |
511 | |
512 | |
512 | switch (kw) |
513 | switch (kw) |
513 | { |
514 | { |
|
|
515 | case KW_Object: // uppercase alias |
514 | case KW_object: |
516 | case KW_object: |
515 | thawer.get (op->name); |
517 | thawer.get (op->name); |
516 | |
518 | |
517 | if (op->arch != NULL) |
519 | if (op->arch != NULL) |
518 | op->arch->name = op->name; |
520 | op->arch->name = op->name; |
… | |
… | |
554 | } |
556 | } |
555 | |
557 | |
556 | parse_object (tmp, thawer, map_flags); |
558 | parse_object (tmp, thawer, map_flags); |
557 | |
559 | |
558 | if (tmp->arch) |
560 | if (tmp->arch) |
|
|
561 | { |
559 | insert_ob_in_ob (tmp, op); |
562 | // was: insert_ob_in_ob (tmp, op); |
|
|
563 | // but manually adding it can improve map loading times a lot |
|
|
564 | // also, appending instead of prepending keeps the |
|
|
565 | // save ordering the same between repeated load/saves. |
|
|
566 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
567 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
|
|
568 | |
|
|
569 | if (!op_inv) |
|
|
570 | { |
|
|
571 | op->inv = tmp; |
|
|
572 | tmp->above = 0; |
|
|
573 | } |
|
|
574 | else |
|
|
575 | { |
|
|
576 | while (op_inv->below) |
|
|
577 | op_inv = op_inv->below; |
|
|
578 | |
|
|
579 | op_inv->below = tmp; |
|
|
580 | tmp->above = op_inv; |
|
|
581 | } |
|
|
582 | |
|
|
583 | tmp->below = 0; |
|
|
584 | tmp->env = op; |
|
|
585 | op_inv = tmp; |
|
|
586 | } |
560 | else |
587 | else |
561 | { |
588 | { |
562 | LOG (llevDebug, "Discarding object without arch: %s\n", |
589 | LOG (llevDebug, "Discarding object without arch: %s\n", |
563 | tmp->name ? (const char *) tmp->name : "(null)"); |
590 | tmp->name ? (const char *) tmp->name : "(null)"); |
564 | free_object (tmp); |
591 | free_object (tmp); |
… | |
… | |
625 | thawer.get (op->move_slow_penalty); |
652 | thawer.get (op->move_slow_penalty); |
626 | break; |
653 | break; |
627 | |
654 | |
628 | case KW_face: |
655 | case KW_face: |
629 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
656 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
630 | break; |
|
|
631 | |
657 | |
632 | case KW_x: thawer.get (op->x); break; |
658 | case KW_x: thawer.get (op->x); break; |
633 | case KW_y: thawer.get (op->y); break; |
659 | case KW_y: thawer.get (op->y); break; |
|
|
660 | case KW_Str: // uppercase alias |
634 | case KW_str: thawer.get (op->stats.Str); break; |
661 | case KW_str: thawer.get (op->stats.Str); break; |
|
|
662 | case KW_Dex: // uppercase alias |
635 | case KW_dex: thawer.get (op->stats.Dex); break; |
663 | case KW_dex: thawer.get (op->stats.Dex); break; |
|
|
664 | case KW_Con: // uppercase alias |
636 | case KW_con: thawer.get (op->stats.Con); break; |
665 | case KW_con: thawer.get (op->stats.Con); break; |
|
|
666 | case KW_Wis: // uppercase alias |
637 | case KW_wis: thawer.get (op->stats.Wis); break; |
667 | case KW_wis: thawer.get (op->stats.Wis); break; |
|
|
668 | case KW_Cha: // uppercase alias |
638 | case KW_cha: thawer.get (op->stats.Cha); break; |
669 | case KW_cha: thawer.get (op->stats.Cha); break; |
|
|
670 | case KW_Int: // uppercase alias |
639 | case KW_int: thawer.get (op->stats.Int); break; |
671 | case KW_int: thawer.get (op->stats.Int); break; |
|
|
672 | case KW_Pow: // uppercase alias |
640 | case KW_pow: thawer.get (op->stats.Pow); break; |
673 | case KW_pow: thawer.get (op->stats.Pow); break; |
641 | case KW_hp: thawer.get (op->stats.hp); break; |
674 | case KW_hp: thawer.get (op->stats.hp); break; |
642 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
675 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
643 | case KW_sp: thawer.get (op->stats.sp); break; |
676 | case KW_sp: thawer.get (op->stats.sp); break; |
644 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
677 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
… | |
… | |
965 | |
998 | |
966 | case KW_editable: |
999 | case KW_editable: |
967 | case KW_editor_folder: |
1000 | case KW_editor_folder: |
968 | break; |
1001 | break; |
969 | |
1002 | |
|
|
1003 | case KW_More: // uppercase alias |
970 | case KW_more: |
1004 | case KW_more: |
971 | /* We need to record that this is a multipart object, |
1005 | /* We need to record that this is a multipart object, |
972 | * so the calling function can glue things back together |
1006 | * so the calling function can glue things back together |
973 | */ |
1007 | */ |
974 | ismore = 1; |
1008 | ismore = 1; |
… | |
… | |
996 | thawer.line += strlen (thawer.line) + 1; |
1030 | thawer.line += strlen (thawer.line) + 1; |
997 | |
1031 | |
998 | break; |
1032 | break; |
999 | |
1033 | |
1000 | default: |
1034 | default: |
1001 | printf ("kw abort %d\n", kw);//D |
1035 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]); |
1002 | abort (); |
1036 | break; |
1003 | } |
1037 | } |
1004 | } |
1038 | } |
1005 | } |
1039 | } |
1006 | |
1040 | |
1007 | /* |
1041 | /* |
… | |
… | |
1028 | * as appropriate in op. |
1062 | * as appropriate in op. |
1029 | * |
1063 | * |
1030 | * This function appears to be used in only 2 places - in crossedit to |
1064 | * This function appears to be used in only 2 places - in crossedit to |
1031 | * override values and in c_wiz to mutate values. |
1065 | * override values and in c_wiz to mutate values. |
1032 | */ |
1066 | */ |
|
|
1067 | int |
1033 | int set_variable(object *op,char *buf) { |
1068 | set_variable(object *op, char *buf) |
|
|
1069 | { |
|
|
1070 | return 0; |
1034 | #if 0 |
1071 | #if 0 |
1035 | int retval; |
1072 | int retval; |
1036 | object_thawer thawer (0); |
1073 | object_thawer thawer (0); |
1037 | |
1074 | |
1038 | strcpy(msgbuf, ""); |
1075 | strcpy(msgbuf, ""); |
… | |
… | |
1095 | |
1132 | |
1096 | void init_vars() { |
1133 | void init_vars() { |
1097 | } |
1134 | } |
1098 | |
1135 | |
1099 | /* This returns a string of the integer movement type */ |
1136 | /* This returns a string of the integer movement type */ |
|
|
1137 | #if 0 |
|
|
1138 | // unused function |
1100 | static char* get_string_move_type(MoveType mt) |
1139 | static char* get_string_move_type(MoveType mt) |
1101 | { |
1140 | { |
1102 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
1141 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
1103 | int i, all_count=0, count; |
1142 | int i, all_count=0, count; |
1104 | |
1143 | |
… | |
… | |
1132 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
1171 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
1133 | */ |
1172 | */ |
1134 | if (all_count <=1) return retbuf_all+1; |
1173 | if (all_count <=1) return retbuf_all+1; |
1135 | else return retbuf+1; |
1174 | else return retbuf+1; |
1136 | } |
1175 | } |
1137 | |
1176 | #endif |
1138 | |
1177 | |
1139 | // compare *op against *tmp and output differences |
1178 | // compare *op against *tmp and output differences |
1140 | void |
1179 | void |
1141 | put (object_freezer &f, object *op, object *tmp) |
1180 | put (object_freezer &f, object *op, object *tmp) |
1142 | { |
1181 | { |
… | |
… | |
1173 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1212 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1174 | |
1213 | |
1175 | CMP_OUT (other_arch); |
1214 | CMP_OUT (other_arch); |
1176 | CMP_OUT (face); |
1215 | CMP_OUT (face); |
1177 | |
1216 | |
|
|
1217 | if (!op->face || !op->face->name) |
|
|
1218 | printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>");//D |
|
|
1219 | |
1178 | if (op->animation_id != tmp->animation_id) |
1220 | if (op->animation_id != tmp->animation_id) |
1179 | if (op->animation_id) |
1221 | if (op->animation_id) |
1180 | { |
1222 | { |
1181 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1223 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1182 | |
1224 | |
1183 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
1225 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
1184 | f.put (KW_is_animated, 0); |
1226 | f.put (KW_is_animated, (sint32)0); |
1185 | } |
1227 | } |
1186 | else |
1228 | else |
1187 | f.put (KW_animation, "NONE"); |
1229 | f.put (KW_animation, (const char *)0); |
1188 | |
1230 | |
1189 | CMP_OUT2 (str , stats.Str); |
1231 | CMP_OUT2 (str , stats.Str); |
1190 | CMP_OUT2 (dex , stats.Dex); |
1232 | CMP_OUT2 (dex , stats.Dex); |
1191 | CMP_OUT2 (con , stats.Con); |
1233 | CMP_OUT2 (con , stats.Con); |
1192 | CMP_OUT2 (wis , stats.Wis); |
1234 | CMP_OUT2 (wis , stats.Wis); |