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.19 by root, Thu Sep 21 00:05:24 2006 UTC vs.
Revision 1.32 by elmex, Sat Dec 30 21:07:46 2006 UTC

… …
26 variable. */ 26 variable. */
27 27
28 28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34/* Maps the MOVE_* values to names */ 33/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 35
… …
280 279
281 if (!op->name_pl) 280 if (!op->name_pl)
282 op->name_pl = op->name; 281 op->name_pl = op->name;
283 282
284 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
286 { 285 {
287 if (op->map != NULL) 286 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
289 else 288 else
290 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
… …
488 SET_FLAG (op, flag); \ 487 SET_FLAG (op, flag); \
489 else \ 488 else \
490 CLEAR_FLAG (op, flag) \ 489 CLEAR_FLAG (op, flag) \
491 490
492int 491int
493parse_object (object *op, object_thawer & thawer, int map_flags) 492parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 493{
495 bool ismore = 0; 494 bool ismore = 0;
496 object *op_inv = op->inv; 495 object *op_inv = op->inv;
497 496
498 for (;;) 497 for (;;)
… …
503 { 502 {
504 case KW_Object: // uppercase alias 503 case KW_Object: // uppercase alias
505 case KW_object: 504 case KW_object:
506 thawer.get (op->name); 505 thawer.get (op->name);
507 506
508 if (op->arch != NULL) 507 if (op->arch)
509 op->arch->name = op->name; 508 op->arch->name = op->name;
510 509
511 break; 510 break;
512 511
513 case KW_uuid: 512 case KW_uuid:
… …
556 555
557 if (arch != NULL) 556 if (arch != NULL)
558 tmp = arch_to_object (arch); 557 tmp = arch_to_object (arch);
559 else 558 else
560 { 559 {
561 tmp = get_object (); 560 tmp = object::create ();
562 /* record the name of the broken object */ 561 /* record the name of the broken object */
563 tmp->name = str; 562 tmp->name = str;
564 } 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 (false);
565 569
566 parse_object (tmp, thawer, map_flags); 570 parse_object (tmp, thawer, map_flags);
567 571
568 if (tmp->arch) 572 if (tmp->arch)
569 { 573 {
… …
593 op_inv = tmp; 597 op_inv = tmp;
594 } 598 }
595 else 599 else
596 { 600 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 601 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 602 tmp->destroy ();
599 } 603 }
600 } 604 }
601 else 605 else
602 { 606 {
603 /* This is the actual archetype definition then */ 607 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 608 op->arch = archetype::find (str);
605 609
606 if (op->arch != NULL) 610 if (op->arch)
607 copy_object (&op->arch->clone, op); 611 op->arch->clone.copy_to (op);
608 else if (!arch_init) 612 else if (!arch_init)
609 /* record the name of the broken object */ 613 /* record the name of the broken object */
610 op->name = str; 614 op->name = str;
611 } 615 }
612 } 616 }
… …
642 646
643 case KW_speed: 647 case KW_speed:
644 thawer.get (op->speed); 648 thawer.get (op->speed);
645 649
646 //TODO: maybe do in check_object 650 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 651 // removed check for style maps
648 {
649 if (op->speed < 0) 652 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 653 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
651
652 update_ob_speed (op);
653 }
654 654
655 break; 655 break;
656 656
657 case KW_slow_move: 657 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 658 op->move_slow |= MOVE_WALK;
… …
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
982 case KW_randomitems: 981 case KW_randomitems:
983 op->randomitems = find_treasurelist (thawer.get_str ()); 982 op->randomitems = find_treasurelist (thawer.get_str ());
984 break; 983 break;
985 984
986 case KW_msg: 985 case KW_msg:
987 {
988 thawer.get_ml (KW_endmsg, op->msg); 986 thawer.get_ml (KW_endmsg, op->msg);
989 //TODO: allow longer messages 987 //TODO: allow longer messages
990 if (strlen (op->msg) >= HUGE_BUF) 988 if (strlen (op->msg) >= HUGE_BUF)
991 { 989 {
992 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);
993 op->msg = "ERROR, please report: string too long, winged.\n"; 991 op->msg = "ERROR, please report: string too long, winged.\n";
994 } 992 }
995 }
996 break; 993 break;
997 994
998 case KW_lore: 995 case KW_lore:
999 {
1000 shstr msgbuf;
1001
1002 thawer.get_ml (KW_endlore, op->lore); 996 thawer.get_ml (KW_endlore, op->lore);
1003 //TODO: allow longer messages 997 //TODO: allow longer messages
1004 /* Just print a warning so we can be reasonably safe 998 /* Just print a warning so we can be reasonably safe
1005 * about not overflowing the buffer. 999 * about not overflowing the buffer.
1006 */ 1000 */
1007 if (strlen (op->lore) > (HUGE_BUF / 2)) 1001 if (strlen (op->lore) > (HUGE_BUF / 2))
1008 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",
1009 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1003 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1010 }
1011 break; 1004 break;
1012 1005
1013 case KW_editable: 1006 case KW_editable:
1014 case KW_editor_folder: 1007 case KW_editor_folder:
1015 break; 1008 break;
… …
1032 1025
1033 case KW_EOF: 1026 case KW_EOF:
1034 return LL_EOF; 1027 return LL_EOF;
1035 1028
1036 case KW_ERROR: 1029 case KW_ERROR:
1037 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1030 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1038 //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
1039
1040 //TODO: skip line, ugly, factor parsing better
1041 if (thawer.last_value)
1042 thawer.line = thawer.last_value;
1043
1044 thawer.line += strlen (thawer.line) + 1;
1045
1046 break; 1032 break;
1047 1033
1048 default: 1034 default:
1049 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]);
1050 break; 1036 break;
… …
1064 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1050 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1065 * be reset. 1051 * be reset.
1066 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1052 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1067 * 1053 *
1068 */ 1054 */
1069
1070int 1055int
1071load_object (object_thawer & fp, object *op, int map_flags) 1056load_object (object_thawer &fp, object *op, int map_flags)
1072{ 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
1073 return parse_object (op, fp, map_flags); 1070 return parse_object (op, fp, map_flags);
1074} 1071}
1075
1076 1072
1077/* 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
1078 * as appropriate in op. 1074 * as appropriate in op.
1079 * 1075 *
1080 * This function appears to be used in only 2 places - in crossedit to 1076 * This function appears to be used in only 2 places - in crossedit to
1081 * override values and in c_wiz to mutate values. 1077 * override values and in c_wiz to mutate values.
1082 */ 1078 */
1083int 1079int
1084set_variable (object *op, char *buf) 1080set_variable (object *op, char *buf)
1085{ 1081{
1086 return 0;
1087#if 0
1088 int retval;
1089 object_thawer thawer (0); 1082 object_thawer thawer (buf, (AV *)0);
1090 1083
1091 strcpy (msgbuf, "");
1092 strcpy (lorebuf, "");
1093 retval = parse_object (op, thawer, 0); 1084 return parse_object (op, thawer, 0);
1094 yy_switch_to_buffer (yycurbuf);
1095 yy_delete_buffer (yybufstate);
1096 yy_pop_state ();
1097 return retval;
1098#endif
1099} 1085}
1100 1086
1101/* 1087/*
1102 * Initialises the array of variable-names. Needed before any 1088 * Initialises the array of variable-names. Needed before any
1103 * objects can be loaded. Called by init_library(). 1089 * objects can be loaded. Called by init_library().
… …
1193 KW_monster, 1179 KW_monster,
1194 KW_friendly, 1180 KW_friendly,
1195 KW_generator, 1181 KW_generator,
1196 KW_is_thrown, 1182 KW_is_thrown,
1197 KW_auto_apply, 1183 KW_auto_apply,
1198 KW_treasure, 1184 KW_NULL, // was KW_treasure
1199 KW_player_sold, 1185 KW_player_sold,
1200 /* 20 */ 1186 /* 20 */
1201 KW_see_invisible, 1187 KW_see_invisible,
1202 KW_can_roll, 1188 KW_can_roll,
1203 KW_overlay_floor, 1189 KW_overlay_floor,
… …
1313 if (!arch_field || my_field->value != arch_field->value) 1299 if (!arch_field || my_field->value != arch_field->value)
1314 f.put (my_field->key, my_field->value); 1300 f.put (my_field->key, my_field->value);
1315 } 1301 }
1316 1302
1317 /* We don't need to worry about the arch's extra fields - they 1303 /* We don't need to worry about the arch's extra fields - they
1318 * will get taken care of the copy_object function. 1304 * will get taken care of the copy_to method.
1319 */ 1305 */
1320 1306
1321 { 1307 {
1322 char uids[64]; 1308 char uids[64];
1323 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1309 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1440 CMP_OUT (move_on); 1426 CMP_OUT (move_on);
1441 CMP_OUT (move_off); 1427 CMP_OUT (move_off);
1442 CMP_OUT (move_slow); 1428 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1429 CMP_OUT (move_slow_penalty);
1444 1430
1445 if (!COMPARE_FLAGS (op, tmp)) 1431 if (op->flag != tmp->flag)
1446 for (i = 0; i <= NUM_FLAGS; i++) 1432 for (i = 0; i <= NUM_FLAGS; i++)
1447 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1433 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1448 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1434 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1449 1435
1450 /* Save body locations */ 1436 /* Save body locations */
1451 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1437 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1452 if (op->body_info[i] != tmp->body_info[i]) 1438 if (op->body_info[i] != tmp->body_info[i])
1453 f.put (body_locations[i].save_name, op->body_info[i]); 1439 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1455 1441
1456/* 1442/*
1457 * Dumps all variables in an object to a file. 1443 * Dumps all variables in an object to a file.
1458 * 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,
1459 * 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.
1460 * If bit 1 of flag is set, don't remove the object after save. As of now,
1461 * all of the callers are setting this.
1462 */ 1446 */
1463
1464void 1447void
1465save_object (object_freezer & fp, object *op, int flag) 1448save_object (object_freezer &fp, object *op, int flag)
1466{ 1449{
1467 archetype *at;
1468 object *tmp, *old;
1469
1470 /* 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
1471 * still save it. 1451 * still save it.
1472 */ 1452 */
1473 if (op->owner) 1453 if (op->owner)
1474 return; 1454 return;
1475 1455
1476 /* 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. */
1477 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1457 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1478 return; 1458 return;
1479 1459
1480 if ((at = op->arch) == NULL) 1460 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1481 at = empty_archetype;
1482 1461
1483 fp.put (KW_arch, at->name); 1462 fp.put (KW_arch, at->name);
1484
1485 put (fp, op, &at->clone); 1463 put (fp, op, &at->clone);
1486 1464
1487 /* 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 */
1488 1466
1489 old = NULL;
1490
1491 if (flag & 2)
1492 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1467 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1493 save_object (fp, tmp, flag); 1468 save_object (fp, tmp, flag);
1494 else
1495 /* Slightly different logic because tmp/op will be removed by
1496 * the save_object we call. So we just keep looking at op->inv
1497 * until there is nothing left. In theory, the variable old
1498 * should not be needed, as recursive loops shouldn't happen.
1499 */
1500 while ((tmp = op->inv) != NULL)
1501 {
1502 if (old == tmp)
1503 {
1504 LOG (llevError, " Recursive loop in inventory\n");
1505 break;
1506 }
1507
1508 save_object (fp, tmp, flag);
1509 old = tmp;
1510 }
1511
1512 if (!(flag & 2))
1513 {
1514 remove_ob (op);
1515 free_object (op);
1516 }
1517 1469
1518 fp.put (op); 1470 fp.put (op);
1519 fprintf (fp, "end\n"); 1471 fp.put (KW_end, 0);
1520} 1472}
1521 1473

Diff Legend

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