ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.2 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.7 by root, Mon Sep 4 17:34:50 2006 UTC

… …
509 { 509 {
510 keyword kw = thawer.get_kv (); 510 keyword kw = thawer.get_kv ();
511 511
512 switch (kw) 512 switch (kw)
513 { 513 {
514 case KW_Object: // uppercase alias
514 case KW_object: 515 case KW_object:
515 thawer.get (op->name); 516 thawer.get (op->name);
516 517
517 if (op->arch != NULL) 518 if (op->arch != NULL)
518 op->arch->name = op->name; 519 op->arch->name = op->name;
… …
554 } 555 }
555 556
556 parse_object (tmp, thawer, map_flags); 557 parse_object (tmp, thawer, map_flags);
557 558
558 if (tmp->arch) 559 if (tmp->arch)
560 {
559 insert_ob_in_ob (tmp, op); 561 // was: insert_ob_in_ob (tmp, op);
562 // but manually adding it can improve map loading times a lot
563 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
564 CLEAR_FLAG (tmp, FLAG_REMOVED);
565 tmp->env = op;
566
567 if (!op->inv)
568 op->inv = tmp;
569 else
570 {
571 tmp->below = op->inv;
572 tmp->below->above = tmp;
573 op->inv = tmp;
574 }
575 }
560 else 576 else
561 { 577 {
562 LOG (llevDebug, "Discarding object without arch: %s\n", 578 LOG (llevDebug, "Discarding object without arch: %s\n",
563 tmp->name ? (const char *) tmp->name : "(null)"); 579 tmp->name ? (const char *) tmp->name : "(null)");
564 free_object (tmp); 580 free_object (tmp);
… …
624 op->move_slow |= MOVE_WALK; 640 op->move_slow |= MOVE_WALK;
625 thawer.get (op->move_slow_penalty); 641 thawer.get (op->move_slow_penalty);
626 break; 642 break;
627 643
628 case KW_face: 644 case KW_face:
645 if (const char *str = thawer.get_str ())
629 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 646 op->face = &new_faces[FindFace (str, 0)];
647 else
648 op->face = 0;
630 break; 649 break;
631 650
632 case KW_x: thawer.get (op->x); break; 651 case KW_x: thawer.get (op->x); break;
633 case KW_y: thawer.get (op->y); break; 652 case KW_y: thawer.get (op->y); break;
653 case KW_Str: // uppercase alias
634 case KW_str: thawer.get (op->stats.Str); break; 654 case KW_str: thawer.get (op->stats.Str); break;
655 case KW_Dex: // uppercase alias
635 case KW_dex: thawer.get (op->stats.Dex); break; 656 case KW_dex: thawer.get (op->stats.Dex); break;
657 case KW_Con: // uppercase alias
636 case KW_con: thawer.get (op->stats.Con); break; 658 case KW_con: thawer.get (op->stats.Con); break;
659 case KW_Wis: // uppercase alias
637 case KW_wis: thawer.get (op->stats.Wis); break; 660 case KW_wis: thawer.get (op->stats.Wis); break;
661 case KW_Cha: // uppercase alias
638 case KW_cha: thawer.get (op->stats.Cha); break; 662 case KW_cha: thawer.get (op->stats.Cha); break;
663 case KW_Int: // uppercase alias
639 case KW_int: thawer.get (op->stats.Int); break; 664 case KW_int: thawer.get (op->stats.Int); break;
665 case KW_Pow: // uppercase alias
640 case KW_pow: thawer.get (op->stats.Pow); break; 666 case KW_pow: thawer.get (op->stats.Pow); break;
641 case KW_hp: thawer.get (op->stats.hp); break; 667 case KW_hp: thawer.get (op->stats.hp); break;
642 case KW_maxhp: thawer.get (op->stats.maxhp); break; 668 case KW_maxhp: thawer.get (op->stats.maxhp); break;
643 case KW_sp: thawer.get (op->stats.sp); break; 669 case KW_sp: thawer.get (op->stats.sp); break;
644 case KW_maxsp: thawer.get (op->stats.maxsp); break; 670 case KW_maxsp: thawer.get (op->stats.maxsp); break;
… …
965 991
966 case KW_editable: 992 case KW_editable:
967 case KW_editor_folder: 993 case KW_editor_folder:
968 break; 994 break;
969 995
996 case KW_More: // uppercase alias
970 case KW_more: 997 case KW_more:
971 /* We need to record that this is a multipart object, 998 /* We need to record that this is a multipart object,
972 * so the calling function can glue things back together 999 * so the calling function can glue things back together
973 */ 1000 */
974 ismore = 1; 1001 ismore = 1;
… …
996 thawer.line += strlen (thawer.line) + 1; 1023 thawer.line += strlen (thawer.line) + 1;
997 1024
998 break; 1025 break;
999 1026
1000 default: 1027 default:
1001 printf ("kw abort %d\n", kw);//D 1028 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]);
1002 abort (); 1029 break;
1003 } 1030 }
1004 } 1031 }
1005} 1032}
1006 1033
1007/* 1034/*
… …
1133 */ 1160 */
1134 if (all_count <=1) return retbuf_all+1; 1161 if (all_count <=1) return retbuf_all+1;
1135 else return retbuf+1; 1162 else return retbuf+1;
1136} 1163}
1137 1164
1138
1139// compare *op against *tmp and output differences 1165// compare *op against *tmp and output differences
1140void 1166void
1141put (object_freezer &f, object *op, object *tmp) 1167put (object_freezer &f, object *op, object *tmp)
1142{ 1168{
1143 int i; 1169 int i;
… …
1173 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1199 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1174 1200
1175 CMP_OUT (other_arch); 1201 CMP_OUT (other_arch);
1176 CMP_OUT (face); 1202 CMP_OUT (face);
1177 1203
1204 if (!op->face || !op->face->name)
1205 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
1206
1178 if (op->animation_id != tmp->animation_id) 1207 if (op->animation_id != tmp->animation_id)
1179 if (op->animation_id) 1208 if (op->animation_id)
1180 { 1209 {
1181 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1210 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1182 1211
1183 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1212 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1184 f.put (KW_is_animated, 0); 1213 f.put (KW_is_animated, (sint32)0);
1185 } 1214 }
1186 else 1215 else
1187 f.put (KW_animation, "NONE"); 1216 f.put (KW_animation, (const char *)0);
1188 1217
1189 CMP_OUT2 (str , stats.Str); 1218 CMP_OUT2 (str , stats.Str);
1190 CMP_OUT2 (dex , stats.Dex); 1219 CMP_OUT2 (dex , stats.Dex);
1191 CMP_OUT2 (con , stats.Con); 1220 CMP_OUT2 (con , stats.Con);
1192 CMP_OUT2 (wis , stats.Wis); 1221 CMP_OUT2 (wis , stats.Wis);

Diff Legend

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