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.39 by elmex, Wed Jan 3 02:51:09 2007 UTC

… …
263static void 263static void
264check_loaded_object (object *op) 264check_loaded_object (object *op)
265{ 265{
266 int ip; 266 int ip;
267 267
268 /* We do some specialized handling to handle legacy cases of name_pl. 268 /* We do some specialised handling to handle legacy cases of name_pl.
269 * If the object doesn't have a name_pl, we just use the object name - 269 * If the object doesn't have a name_pl, we just use the object name -
270 * this isn't perfect (things won't be properly pluralized), but works to 270 * this isn't perfect (things won't be properly pluralised), but works to
271 * that degree (5 heart is still quite understandable). But the case we 271 * that degree (5 heart is still quite understandable). But the case we
272 * also have to catch is if this object is not using the normal name for 272 * also have to catch is if this object is not using the normal name for
273 * the object. In that case, we also want to use the loaded name. 273 * the object. In that case, we also want to use the loaded name.
274 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
… …
320 { 320 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322 op->gen_sp_armour = op->last_heal; 322 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 323 op->last_heal = 0;
324 } 324 }
325 if (editor) 325
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 326 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 327 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 328 if (!op->item_power && ip)
331 { 329 {
332 if (ip > 3) 330 if (ip > 3)
333 { 331 {
… …
551 */ 549 */
552 archetype *arch = archetype::find (str); 550 archetype *arch = archetype::find (str);
553 551
554 object *tmp; 552 object *tmp;
555 553
556 if (arch != NULL) 554 if (arch)
557 tmp = arch_to_object (arch); 555 tmp = arch_to_object (arch);
558 else 556 else
559 { 557 {
560 tmp = object::create (); 558 tmp = object::create ();
561 /* record the name of the broken object */ 559 /* record the name of the broken object */
562 tmp->name = str; 560 tmp->name = str;
563 } 561 }
562
563 // decativate the object we, as we are still going
564 // to read the speed value. Objects should be activated
565 // when the map, object or player is completly loaded.
566 tmp->deactivate ();
564 567
565 parse_object (tmp, thawer, map_flags); 568 parse_object (tmp, thawer, map_flags);
566 569
567 if (tmp->arch) 570 if (tmp->arch)
568 { 571 {
… …
601 { 604 {
602 /* This is the actual archetype definition then */ 605 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 606 op->arch = archetype::find (str);
604 607
605 if (op->arch) 608 if (op->arch)
609 {
606 op->arch->clone.copy_to (op); 610 op->arch->clone.copy_to (op);
611 // copy_to activates, this should be fixed properly
612 op->deactivate ();
613 }
607 else if (!arch_init) 614 else if (!arch_init)
608 /* record the name of the broken object */ 615 /* record the name of the broken object */
609 op->name = str; 616 op->name = str;
610 } 617 }
611 } 618 }
… …
641 648
642 case KW_speed: 649 case KW_speed:
643 thawer.get (op->speed); 650 thawer.get (op->speed);
644 651
645 //TODO: maybe do in check_object 652 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 653 // removed check for style maps
647 {
648 if (op->speed < 0) 654 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 655 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 656
654 break; 657 break;
655 658
656 case KW_slow_move: 659 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 660 op->move_slow |= MOVE_WALK;
… …
980 case KW_randomitems: 983 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 984 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 985 break;
983 986
984 case KW_msg: 987 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 988 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 989 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 990 if (strlen (op->msg) >= HUGE_BUF)
989 { 991 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 992 LOG (llevDebug, "\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"; 993 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 994 }
993 }
994 break; 995 break;
995 996
996 case KW_lore: 997 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 998 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 999 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1000 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1001 * about not overflowing the buffer.
1004 */ 1002 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1003 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1004 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1005 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1006 break;
1010 1007
1011 case KW_editable: 1008 case KW_editable:
1012 case KW_editor_folder: 1009 case KW_editor_folder:
1013 break; 1010 break;
… …
1030 1027
1031 case KW_EOF: 1028 case KW_EOF:
1032 return LL_EOF; 1029 return LL_EOF;
1033 1030
1034 case KW_ERROR: 1031 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1032 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1033 //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; 1034 break;
1045 1035
1046 default: 1036 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1037 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1038 break;
… …
1065 * 1055 *
1066 */ 1056 */
1067int 1057int
1068load_object (object_thawer &fp, object *op, int map_flags) 1058load_object (object_thawer &fp, object *op, int map_flags)
1069{ 1059{
1060 coroapi::cede_every (1000); // cede once in a while
1061
1070 return parse_object (op, fp, map_flags); 1062 return parse_object (op, fp, map_flags);
1071} 1063}
1072 1064
1073/* This takes a buffer, scans it for variables, and sets those variables 1065/* This takes a buffer, scans it for variables, and sets those variables
1074 * as appropriate in op. 1066 * as appropriate in op.
… …
1441 1433
1442/* 1434/*
1443 * Dumps all variables in an object to a file. 1435 * 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, 1436 * 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. 1437 * 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 */ 1438 */
1449
1450void 1439void
1451save_object (object_freezer & fp, object *op, int flag) 1440save_object (object_freezer &fp, object *op, int flag)
1452{ 1441{
1453 archetype *at;
1454 object *tmp, *old;
1455
1456 /* Even if the object does have an owner, it would seem that we should 1442 /* Even if the object does have an owner, it would seem that we should
1457 * still save it. 1443 * still save it.
1458 */ 1444 */
1459 if (op->owner) 1445 if (op->owner)
1460 return; 1446 return;
1461 1447
1462 /* If it is unpaid and we don't want to save those, just return. */ 1448 /* If it is unpaid and we don't want to save those, just return. */
1463 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1449 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1464 return; 1450 return;
1465 1451
1466 if ((at = op->arch) == NULL) 1452 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1467 at = empty_archetype;
1468 1453
1469 fp.put (KW_arch, at->name); 1454 fp.put (KW_arch, at->name);
1470
1471 put (fp, op, &at->clone); 1455 put (fp, op, &at->clone);
1472 1456
1473 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1457 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1474 1458
1475 old = NULL;
1476
1477 if (flag & 2)
1478 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1459 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1479 save_object (fp, tmp, flag); 1460 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 1461
1501 fp.put (op); 1462 fp.put (op);
1502 fprintf (fp, "end\n"); 1463 fp.put (KW_end);
1503} 1464}
1504 1465

Diff Legend

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