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.23 by root, Fri Dec 15 19:59:19 2006 UTC vs.
Revision 1.36 by root, Mon Jan 1 21:19:51 2007 UTC

… …
279 279
280 if (!op->name_pl) 280 if (!op->name_pl)
281 op->name_pl = op->name; 281 op->name_pl = op->name;
282 282
283 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
284 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
285 { 285 {
286 if (op->map != NULL) 286 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
288 else 288 else
289 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
… …
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;
… …
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 830 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 832 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 836 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 837 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 838 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 839 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
981 case KW_randomitems: 985 case KW_randomitems:
982 op->randomitems = find_treasurelist (thawer.get_str ()); 986 op->randomitems = find_treasurelist (thawer.get_str ());
983 break; 987 break;
984 988
985 case KW_msg: 989 case KW_msg:
986 {
987 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
988 //TODO: allow longer messages 991 //TODO: allow longer messages
989 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
990 { 993 {
991 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);
992 op->msg = "ERROR, please report: string too long, winged.\n"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
993 } 996 }
994 }
995 break; 997 break;
996 998
997 case KW_lore: 999 case KW_lore:
998 {
999 shstr msgbuf;
1000
1001 thawer.get_ml (KW_endlore, op->lore); 1000 thawer.get_ml (KW_endlore, op->lore);
1002 //TODO: allow longer messages 1001 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
1005 */ 1004 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 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",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 }
1010 break; 1008 break;
1011 1009
1012 case KW_editable: 1010 case KW_editable:
1013 case KW_editor_folder: 1011 case KW_editor_folder:
1014 break; 1012 break;
… …
1031 1029
1032 case KW_EOF: 1030 case KW_EOF:
1033 return LL_EOF; 1031 return LL_EOF;
1034 1032
1035 case KW_ERROR: 1033 case KW_ERROR:
1036 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1034 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1037 //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
1038
1039 //TODO: skip line, ugly, factor parsing better
1040 if (thawer.last_value)
1041 thawer.line = thawer.last_value;
1042
1043 thawer.line += strlen (thawer.line) + 1;
1044
1045 break; 1036 break;
1046 1037
1047 default: 1038 default:
1048 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]);
1049 break; 1040 break;
… …
1063 * 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
1064 * be reset. 1055 * be reset.
1065 * 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)
1066 * 1057 *
1067 */ 1058 */
1068
1069int 1059int
1070load_object (object_thawer & fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1061{
1062 coroapi::cede_every (1000); // cede once in a while
1063
1072 return parse_object (op, fp, map_flags); 1064 return parse_object (op, fp, map_flags);
1073} 1065}
1074
1075 1066
1076/* This takes a buffer, scans it for variables, and sets those variables 1067/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1068 * as appropriate in op.
1078 * 1069 *
1079 * This function appears to be used in only 2 places - in crossedit to 1070 * This function appears to be used in only 2 places - in crossedit to
… …
1182 KW_monster, 1173 KW_monster,
1183 KW_friendly, 1174 KW_friendly,
1184 KW_generator, 1175 KW_generator,
1185 KW_is_thrown, 1176 KW_is_thrown,
1186 KW_auto_apply, 1177 KW_auto_apply,
1187 KW_treasure, 1178 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1179 KW_player_sold,
1189 /* 20 */ 1180 /* 20 */
1190 KW_see_invisible, 1181 KW_see_invisible,
1191 KW_can_roll, 1182 KW_can_roll,
1192 KW_overlay_floor, 1183 KW_overlay_floor,
… …
1429 CMP_OUT (move_on); 1420 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1421 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1422 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1423 CMP_OUT (move_slow_penalty);
1433 1424
1434 if (!COMPARE_FLAGS (op, tmp)) 1425 if (op->flag != tmp->flag)
1435 for (i = 0; i <= NUM_FLAGS; i++) 1426 for (i = 0; i <= NUM_FLAGS; i++)
1436 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1427 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1428 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1429
1439 /* Save body locations */ 1430 /* Save body locations */
1440 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1431 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (op->body_info[i] != tmp->body_info[i]) 1432 if (op->body_info[i] != tmp->body_info[i])
1442 f.put (body_locations[i].save_name, op->body_info[i]); 1433 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1444 1435
1445/* 1436/*
1446 * Dumps all variables in an object to a file. 1437 * Dumps all variables in an object to a file.
1447 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1438 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1448 * the only place this is not set is when saving the player. 1439 * the only place this is not set is when saving the player.
1449 * If bit 1 of flag is set, don't remove the object after save. As of now,
1450 * all of the callers are setting this.
1451 */ 1440 */
1452
1453void 1441void
1454save_object (object_freezer & fp, object *op, int flag) 1442save_object (object_freezer &fp, object *op, int flag)
1455{ 1443{
1456 archetype *at;
1457 object *tmp, *old;
1458
1459 /* Even if the object does have an owner, it would seem that we should 1444 /* Even if the object does have an owner, it would seem that we should
1460 * still save it. 1445 * still save it.
1461 */ 1446 */
1462 if (op->owner) 1447 if (op->owner)
1463 return; 1448 return;
1464 1449
1465 /* If it is unpaid and we don't want to save those, just return. */ 1450 /* If it is unpaid and we don't want to save those, just return. */
1466 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1451 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1467 return; 1452 return;
1468 1453
1469 if ((at = op->arch) == NULL) 1454 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1470 at = empty_archetype;
1471 1455
1472 fp.put (KW_arch, at->name); 1456 fp.put (KW_arch, at->name);
1473
1474 put (fp, op, &at->clone); 1457 put (fp, op, &at->clone);
1475 1458
1476 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1459 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1477 1460
1478 old = NULL;
1479
1480 if (flag & 2)
1481 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1461 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1482 save_object (fp, tmp, flag); 1462 save_object (fp, tmp, flag);
1483 else
1484 /* Slightly different logic because tmp/op will be removed by
1485 * the save_object we call. So we just keep looking at op->inv
1486 * until there is nothing left. In theory, the variable old
1487 * should not be needed, as recursive loops shouldn't happen.
1488 */
1489 while ((tmp = op->inv) != NULL)
1490 {
1491 if (old == tmp)
1492 {
1493 LOG (llevError, " Recursive loop in inventory\n");
1494 break;
1495 }
1496
1497 save_object (fp, tmp, flag);
1498 old = tmp;
1499 }
1500
1501 if (!(flag & 2))
1502 op->destroy ();
1503 1463
1504 fp.put (op); 1464 fp.put (op);
1505 fprintf (fp, "end\n"); 1465 fp.put (KW_end);
1506} 1466}
1507 1467

Diff Legend

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