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.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.35 by root, Mon Jan 1 00:41:02 2007 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:
… …
551 */ 551 */
552 archetype *arch = archetype::find (str); 552 archetype *arch = archetype::find (str);
553 553
554 object *tmp; 554 object *tmp;
555 555
556 if (arch != NULL) 556 if (arch)
557 tmp = arch_to_object (arch); 557 tmp = arch_to_object (arch);
558 else 558 else
559 { 559 {
560 tmp = object::create (); 560 tmp = object::create ();
561 /* record the name of the broken object */ 561 /* record the name of the broken object */
562 tmp->name = str; 562 tmp->name = str;
563 } 563 }
564
565 // decativate the object we, as we are still going
566 // to read the speed value. Objects should be activated
567 // when the map, object or player is completly loaded.
568 tmp->deactivate ();
564 569
565 parse_object (tmp, thawer, map_flags); 570 parse_object (tmp, thawer, map_flags);
566 571
567 if (tmp->arch) 572 if (tmp->arch)
568 { 573 {
… …
601 { 606 {
602 /* This is the actual archetype definition then */ 607 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 608 op->arch = archetype::find (str);
604 609
605 if (op->arch) 610 if (op->arch)
611 {
606 op->arch->clone.copy_to (op); 612 op->arch->clone.copy_to (op);
613 // copy_to activates, this should be fixed properly
614 op->deactivate ();
615 }
607 else if (!arch_init) 616 else if (!arch_init)
608 /* record the name of the broken object */ 617 /* record the name of the broken object */
609 op->name = str; 618 op->name = str;
610 } 619 }
611 } 620 }
… …
641 650
642 case KW_speed: 651 case KW_speed:
643 thawer.get (op->speed); 652 thawer.get (op->speed);
644 653
645 //TODO: maybe do in check_object 654 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 655 // removed check for style maps
647 {
648 if (op->speed < 0) 656 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 657 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 658
654 break; 659 break;
655 660
656 case KW_slow_move: 661 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 662 op->move_slow |= MOVE_WALK;
… …
980 case KW_randomitems: 985 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 986 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 987 break;
983 988
984 case KW_msg: 989 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 991 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
989 { 993 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 994 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"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 996 }
993 }
994 break; 997 break;
995 998
996 case KW_lore: 999 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 1000 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1001 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
1004 */ 1004 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1006 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); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1008 break;
1010 1009
1011 case KW_editable: 1010 case KW_editable:
1012 case KW_editor_folder: 1011 case KW_editor_folder:
1013 break; 1012 break;
… …
1030 1029
1031 case KW_EOF: 1030 case KW_EOF:
1032 return LL_EOF; 1031 return LL_EOF;
1033 1032
1034 case KW_ERROR: 1033 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1034 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1035 //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; 1036 break;
1045 1037
1046 default: 1038 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1039 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1040 break;
… …
1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1054 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063 * be reset. 1055 * be reset.
1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1056 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065 * 1057 *
1066 */ 1058 */
1067
1068int 1059int
1069load_object (object_thawer & fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1070{ 1061{
1062 // cede every 500 objects loaded
1063 coroapi::cede_every (500);
1064
1071 return parse_object (op, fp, map_flags); 1065 return parse_object (op, fp, map_flags);
1072} 1066}
1073
1074 1067
1075/* This takes a buffer, scans it for variables, and sets those variables 1068/* This takes a buffer, scans it for variables, and sets those variables
1076 * as appropriate in op. 1069 * as appropriate in op.
1077 * 1070 *
1078 * This function appears to be used in only 2 places - in crossedit to 1071 * This function appears to be used in only 2 places - in crossedit to
… …
1443 1436
1444/* 1437/*
1445 * Dumps all variables in an object to a file. 1438 * 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, 1439 * 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. 1440 * 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 */ 1441 */
1451
1452void 1442void
1453save_object (object_freezer & fp, object *op, int flag) 1443save_object (object_freezer &fp, object *op, int flag)
1454{ 1444{
1455 archetype *at; 1445 // cede every 500 objects saved
1456 object *tmp, *old; 1446 coroapi::cede_every (500);
1457 1447
1458 /* Even if the object does have an owner, it would seem that we should 1448 /* Even if the object does have an owner, it would seem that we should
1459 * still save it. 1449 * still save it.
1460 */ 1450 */
1461 if (op->owner) 1451 if (op->owner)
1462 return; 1452 return;
1463 1453
1464 /* If it is unpaid and we don't want to save those, just return. */ 1454 /* If it is unpaid and we don't want to save those, just return. */
1465 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1455 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466 return; 1456 return;
1467 1457
1468 if ((at = op->arch) == NULL) 1458 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1469 at = empty_archetype;
1470 1459
1471 fp.put (KW_arch, at->name); 1460 fp.put (KW_arch, at->name);
1472
1473 put (fp, op, &at->clone); 1461 put (fp, op, &at->clone);
1474 1462
1475 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1463 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476 1464
1477 old = NULL;
1478
1479 if (flag & 2)
1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481 save_object (fp, tmp, flag); 1466 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 1467
1503 fp.put (op); 1468 fp.put (op);
1504 fprintf (fp, "end\n"); 1469 fp.put (KW_end);
1505} 1470}
1506 1471

Diff Legend

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