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.3 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.10 by root, Fri Sep 8 16:51:42 2006 UTC

… …
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
504int parse_object (object * op, object_thawer & thawer, int map_flags) 504int 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);
… …
624 op->move_slow |= MOVE_WALK; 651 op->move_slow |= MOVE_WALK;
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 if (const char *str = thawer.get_str ())
630 op->face = &new_faces[FindFace (str, 0)]; 656 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
631 else
632 op->face = 0;
633 break;
634 657
635 case KW_x: thawer.get (op->x); break; 658 case KW_x: thawer.get (op->x); break;
636 case KW_y: thawer.get (op->y); break; 659 case KW_y: thawer.get (op->y); break;
660 case KW_Str: // uppercase alias
637 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
638 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
639 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
640 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
641 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
642 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
643 case KW_pow: thawer.get (op->stats.Pow); break; 673 case KW_pow: thawer.get (op->stats.Pow); break;
644 case KW_hp: thawer.get (op->stats.hp); break; 674 case KW_hp: thawer.get (op->stats.hp); break;
645 case KW_maxhp: thawer.get (op->stats.maxhp); break; 675 case KW_maxhp: thawer.get (op->stats.maxhp); break;
646 case KW_sp: thawer.get (op->stats.sp); break; 676 case KW_sp: thawer.get (op->stats.sp); break;
647 case KW_maxsp: thawer.get (op->stats.maxsp); break; 677 case KW_maxsp: thawer.get (op->stats.maxsp); break;
… …
968 998
969 case KW_editable: 999 case KW_editable:
970 case KW_editor_folder: 1000 case KW_editor_folder:
971 break; 1001 break;
972 1002
1003 case KW_More: // uppercase alias
973 case KW_more: 1004 case KW_more:
974 /* We need to record that this is a multipart object, 1005 /* We need to record that this is a multipart object,
975 * so the calling function can glue things back together 1006 * so the calling function can glue things back together
976 */ 1007 */
977 ismore = 1; 1008 ismore = 1;
… …
999 thawer.line += strlen (thawer.line) + 1; 1030 thawer.line += strlen (thawer.line) + 1;
1000 1031
1001 break; 1032 break;
1002 1033
1003 default: 1034 default:
1004 printf ("kw abort %s\n", keyword_str [kw]);//D 1035 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]);
1005 abort (); 1036 break;
1006 } 1037 }
1007 } 1038 }
1008} 1039}
1009 1040
1010/* 1041/*
… …
1031 * as appropriate in op. 1062 * as appropriate in op.
1032 * 1063 *
1033 * 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
1034 * override values and in c_wiz to mutate values. 1065 * override values and in c_wiz to mutate values.
1035 */ 1066 */
1067int
1036int set_variable(object *op,char *buf) { 1068set_variable(object *op, char *buf)
1069{
1070 return 0;
1037#if 0 1071#if 0
1038 int retval; 1072 int retval;
1039 object_thawer thawer (0); 1073 object_thawer thawer (0);
1040 1074
1041 strcpy(msgbuf, ""); 1075 strcpy(msgbuf, "");
… …
1098 1132
1099void init_vars() { 1133void init_vars() {
1100} 1134}
1101 1135
1102/* 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
1103static char* get_string_move_type(MoveType mt) 1139static char* get_string_move_type(MoveType mt)
1104{ 1140{
1105 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; 1141 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1106 int i, all_count=0, count; 1142 int i, all_count=0, count;
1107 1143
… …
1135 * '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'
1136 */ 1172 */
1137 if (all_count <=1) return retbuf_all+1; 1173 if (all_count <=1) return retbuf_all+1;
1138 else return retbuf+1; 1174 else return retbuf+1;
1139} 1175}
1140 1176#endif
1177
1141// compare *op against *tmp and output differences 1178// compare *op against *tmp and output differences
1142void 1179void
1143put (object_freezer &f, object *op, object *tmp) 1180put (object_freezer &f, object *op, object *tmp)
1144{ 1181{
1145 int i; 1182 int i;

Diff Legend

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