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.26 by elmex, Mon Dec 18 17:10:07 2006 UTC vs.
Revision 1.33 by root, Sun Dec 31 17:17:22 2006 UTC

… …
487 SET_FLAG (op, flag); \ 487 SET_FLAG (op, flag); \
488 else \ 488 else \
489 CLEAR_FLAG (op, flag) \ 489 CLEAR_FLAG (op, flag) \
490 490
491int 491int
492parse_object (object *op, object_thawer & thawer, int map_flags) 492parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 493{
494 bool ismore = 0; 494 bool ismore = 0;
495 object *op_inv = op->inv; 495 object *op_inv = op->inv;
496 496
497 for (;;) 497 for (;;)
… …
502 { 502 {
503 case KW_Object: // uppercase alias 503 case KW_Object: // uppercase alias
504 case KW_object: 504 case KW_object:
505 thawer.get (op->name); 505 thawer.get (op->name);
506 506
507 if (op->arch != NULL) 507 if (op->arch)
508 op->arch->name = op->name; 508 op->arch->name = op->name;
509 509
510 break; 510 break;
511 511
512 case KW_uuid: 512 case KW_uuid:
… …
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 540 case KW_slaying: thawer.get_ornull (op->slaying); break;
541 541
542 case KW_arch: 542 case KW_arch:
543 { 543 {
544 const char *str = thawer.get_str (); 544 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
545 546
546 if (op->arch) 547 if (op->arch)
547 { 548 {
548 /* If op->arch has been set, then this new object 549 /* If op->arch has been set, then this new object
549 * must be part of the inventory. So process 550 * must be part of the inventory. So process
… …
551 */ 552 */
552 archetype *arch = archetype::find (str); 553 archetype *arch = archetype::find (str);
553 554
554 object *tmp; 555 object *tmp;
555 556
556 if (arch != NULL) 557 if (arch)
557 tmp = arch_to_object (arch); 558 tmp = arch_to_object (arch);
558 else 559 else
559 { 560 {
560 tmp = object::create (); 561 tmp = object::create ();
561 /* record the name of the broken object */ 562 /* record the name of the broken object */
562 tmp->name = str; 563 tmp->name = str;
563 } 564 }
565
566 // decativate the object we, as we are still going
567 // to read the speed value. Objects should be activated
568 // when the map, object or player is completly loaded.
569 tmp->deactivate ();
564 570
565 parse_object (tmp, thawer, map_flags); 571 parse_object (tmp, thawer, map_flags);
566 572
567 if (tmp->arch) 573 if (tmp->arch)
568 { 574 {
… …
601 { 607 {
602 /* This is the actual archetype definition then */ 608 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 609 op->arch = archetype::find (str);
604 610
605 if (op->arch) 611 if (op->arch)
612 {
606 op->arch->clone.copy_to (op); 613 op->arch->clone.copy_to (op);
614 // copy_to activates, this should be fixed properly
615 op->deactivate ();
616 }
607 else if (!arch_init) 617 else if (!arch_init)
608 /* record the name of the broken object */ 618 /* record the name of the broken object */
609 op->name = str; 619 op->name = str;
610 } 620 }
611 } 621 }
… …
641 651
642 case KW_speed: 652 case KW_speed:
643 thawer.get (op->speed); 653 thawer.get (op->speed);
644 654
645 //TODO: maybe do in check_object 655 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 656 // removed check for style maps
647 {
648 if (op->speed < 0) 657 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 659
654 break; 660 break;
655 661
656 case KW_slow_move: 662 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 663 op->move_slow |= MOVE_WALK;
… …
980 case KW_randomitems: 986 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 987 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 988 break;
983 989
984 case KW_msg: 990 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 991 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 992 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 993 if (strlen (op->msg) >= HUGE_BUF)
989 { 994 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 995 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 996 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 997 }
993 }
994 break; 998 break;
995 999
996 case KW_lore: 1000 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 1001 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1002 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1003 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1004 * about not overflowing the buffer.
1004 */ 1005 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1006 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1009 break;
1010 1010
1011 case KW_editable: 1011 case KW_editable:
1012 case KW_editor_folder: 1012 case KW_editor_folder:
1013 break; 1013 break;
… …
1030 1030
1031 case KW_EOF: 1031 case KW_EOF:
1032 return LL_EOF; 1032 return LL_EOF;
1033 1033
1034 case KW_ERROR: 1034 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1036 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037
1038 //TODO: skip line, ugly, factor parsing better
1039 if (thawer.last_value)
1040 thawer.line = thawer.last_value;
1041
1042 thawer.line += strlen (thawer.line) + 1;
1043
1044 break; 1037 break;
1045 1038
1046 default: 1039 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1041 break;
… …
1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1055 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063 * be reset. 1056 * be reset.
1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1057 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065 * 1058 *
1066 */ 1059 */
1067
1068int 1060int
1069load_object (object_thawer & fp, object *op, int map_flags) 1061load_object (object_thawer &fp, object *op, int map_flags)
1070{ 1062{
1063 // cede every 500 objects loaded
1064 {
1065 static int cede_counter = 0;
1066
1067 if (++cede_counter >= 500)
1068 {
1069 cede_counter = 0;
1070 if (coroapi::nready ())
1071 coroapi::cede ();
1072 }
1073 }
1074
1071 return parse_object (op, fp, map_flags); 1075 return parse_object (op, fp, map_flags);
1072} 1076}
1073
1074 1077
1075/* This takes a buffer, scans it for variables, and sets those variables 1078/* This takes a buffer, scans it for variables, and sets those variables
1076 * as appropriate in op. 1079 * as appropriate in op.
1077 * 1080 *
1078 * This function appears to be used in only 2 places - in crossedit to 1081 * This function appears to be used in only 2 places - in crossedit to
… …
1428 CMP_OUT (move_on); 1431 CMP_OUT (move_on);
1429 CMP_OUT (move_off); 1432 CMP_OUT (move_off);
1430 CMP_OUT (move_slow); 1433 CMP_OUT (move_slow);
1431 CMP_OUT (move_slow_penalty); 1434 CMP_OUT (move_slow_penalty);
1432 1435
1433 if (op->flags != tmp->flags) 1436 if (op->flag != tmp->flag)
1434 for (i = 0; i <= NUM_FLAGS; i++) 1437 for (i = 0; i <= NUM_FLAGS; i++)
1435 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1438 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1436 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1439 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1437 1440
1438 /* Save body locations */ 1441 /* Save body locations */
1439 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1442 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1440 if (op->body_info[i] != tmp->body_info[i]) 1443 if (op->body_info[i] != tmp->body_info[i])
1441 f.put (body_locations[i].save_name, op->body_info[i]); 1444 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1443 1446
1444/* 1447/*
1445 * Dumps all variables in an object to a file. 1448 * Dumps all variables in an object to a file.
1446 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1449 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1447 * the only place this is not set is when saving the player. 1450 * the only place this is not set is when saving the player.
1448 * If bit 1 of flag is set, don't remove the object after save. As of now,
1449 * all of the callers are setting this.
1450 */ 1451 */
1451
1452void 1452void
1453save_object (object_freezer & fp, object *op, int flag) 1453save_object (object_freezer &fp, object *op, int flag)
1454{ 1454{
1455 archetype *at;
1456 object *tmp, *old;
1457
1458 /* Even if the object does have an owner, it would seem that we should 1455 /* Even if the object does have an owner, it would seem that we should
1459 * still save it. 1456 * still save it.
1460 */ 1457 */
1461 if (op->owner) 1458 if (op->owner)
1462 return; 1459 return;
1463 1460
1464 /* If it is unpaid and we don't want to save those, just return. */ 1461 /* If it is unpaid and we don't want to save those, just return. */
1465 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1462 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466 return; 1463 return;
1467 1464
1468 if ((at = op->arch) == NULL) 1465 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1469 at = empty_archetype;
1470 1466
1471 fp.put (KW_arch, at->name); 1467 fp.put (KW_arch, at->name);
1472
1473 put (fp, op, &at->clone); 1468 put (fp, op, &at->clone);
1474 1469
1475 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1470 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476 1471
1477 old = NULL;
1478
1479 if (flag & 2)
1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1472 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481 save_object (fp, tmp, flag); 1473 save_object (fp, tmp, flag);
1482 else
1483 /* Slightly different logic because tmp/op will be removed by
1484 * the save_object we call. So we just keep looking at op->inv
1485 * until there is nothing left. In theory, the variable old
1486 * should not be needed, as recursive loops shouldn't happen.
1487 */
1488 while ((tmp = op->inv) != NULL)
1489 {
1490 if (old == tmp)
1491 {
1492 LOG (llevError, " Recursive loop in inventory\n");
1493 break;
1494 }
1495
1496 save_object (fp, tmp, flag);
1497 old = tmp;
1498 }
1499
1500 if (!(flag & 2))
1501 op->destroy ();
1502 1474
1503 fp.put (op); 1475 fp.put (op);
1504 fprintf (fp, "end\n"); 1476 fp.put (KW_end);
1505} 1477}
1506 1478

Diff Legend

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