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.28 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.32 by elmex, Sat Dec 30 21:07:46 2006 UTC

… …
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 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 (false);
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 {
569 // was: insert_ob_in_ob (tmp, op); 574 // was: insert_ob_in_ob (tmp, op);
… …
641 646
642 case KW_speed: 647 case KW_speed:
643 thawer.get (op->speed); 648 thawer.get (op->speed);
644 649
645 //TODO: maybe do in check_object 650 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 651 // removed check for style maps
647 {
648 if (op->speed < 0) 652 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 653 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 654
654 break; 655 break;
655 656
656 case KW_slow_move: 657 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 658 op->move_slow |= MOVE_WALK;
… …
980 case KW_randomitems: 981 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 982 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 983 break;
983 984
984 case KW_msg: 985 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 986 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 987 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 988 if (strlen (op->msg) >= HUGE_BUF)
989 { 989 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 990 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"; 991 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 992 }
993 }
994 break; 993 break;
995 994
996 case KW_lore: 995 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 996 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 997 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 998 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 999 * about not overflowing the buffer.
1004 */ 1000 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1001 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1002 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); 1003 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1004 break;
1010 1005
1011 case KW_editable: 1006 case KW_editable:
1012 case KW_editor_folder: 1007 case KW_editor_folder:
1013 break; 1008 break;
… …
1030 1025
1031 case KW_EOF: 1026 case KW_EOF:
1032 return LL_EOF; 1027 return LL_EOF;
1033 1028
1034 case KW_ERROR: 1029 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1030 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1031 //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; 1032 break;
1045 1033
1046 default: 1034 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1035 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1036 break;
… …
1065 * 1053 *
1066 */ 1054 */
1067int 1055int
1068load_object (object_thawer &fp, object *op, int map_flags) 1056load_object (object_thawer &fp, object *op, int map_flags)
1069{ 1057{
1058 // cede every 500 objects loaded
1059 {
1060 static int cede_counter = 0;
1061
1062 if (++cede_counter >= 500)
1063 {
1064 cede_counter = 0;
1065 if (coroapi::nready ())
1066 coroapi::cede ();
1067 }
1068 }
1069
1070 return parse_object (op, fp, map_flags); 1070 return parse_object (op, fp, map_flags);
1071} 1071}
1072 1072
1073/* This takes a buffer, scans it for variables, and sets those variables 1073/* This takes a buffer, scans it for variables, and sets those variables
1074 * as appropriate in op. 1074 * as appropriate in op.
… …
1441 1441
1442/* 1442/*
1443 * Dumps all variables in an object to a file. 1443 * Dumps all variables in an object to a file.
1444 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1444 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1445 * the only place this is not set is when saving the player. 1445 * the only place this is not set is when saving the player.
1446 * If bit 1 of flag is set, don't remove the object after save. As of now,
1447 * all of the callers are setting this.
1448 */ 1446 */
1449
1450void 1447void
1451save_object (object_freezer & fp, object *op, int flag) 1448save_object (object_freezer &fp, object *op, int flag)
1452{ 1449{
1453 archetype *at;
1454 object *tmp, *old;
1455
1456 /* Even if the object does have an owner, it would seem that we should 1450 /* Even if the object does have an owner, it would seem that we should
1457 * still save it. 1451 * still save it.
1458 */ 1452 */
1459 if (op->owner) 1453 if (op->owner)
1460 return; 1454 return;
1461 1455
1462 /* If it is unpaid and we don't want to save those, just return. */ 1456 /* If it is unpaid and we don't want to save those, just return. */
1463 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1457 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1464 return; 1458 return;
1465 1459
1466 if ((at = op->arch) == NULL) 1460 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1467 at = empty_archetype;
1468 1461
1469 fp.put (KW_arch, at->name); 1462 fp.put (KW_arch, at->name);
1470
1471 put (fp, op, &at->clone); 1463 put (fp, op, &at->clone);
1472 1464
1473 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1465 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1474 1466
1475 old = NULL;
1476
1477 if (flag & 2)
1478 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1467 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1479 save_object (fp, tmp, flag); 1468 save_object (fp, tmp, flag);
1480 else
1481 /* Slightly different logic because tmp/op will be removed by
1482 * the save_object we call. So we just keep looking at op->inv
1483 * until there is nothing left. In theory, the variable old
1484 * should not be needed, as recursive loops shouldn't happen.
1485 */
1486 while ((tmp = op->inv) != NULL)
1487 {
1488 if (old == tmp)
1489 {
1490 LOG (llevError, " Recursive loop in inventory\n");
1491 break;
1492 }
1493
1494 save_object (fp, tmp, flag);
1495 old = tmp;
1496 }
1497
1498 if (!(flag & 2))
1499 op->destroy ();
1500 1469
1501 fp.put (op); 1470 fp.put (op);
1502 fprintf (fp, "end\n"); 1471 fp.put (KW_end, 0);
1503} 1472}
1504 1473

Diff Legend

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