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.30 by root, Tue Dec 26 08:54:59 2006 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:
… …
638 case KW_last_grace: thawer.get (op->last_grace); break; 638 case KW_last_grace: thawer.get (op->last_grace); break;
639 case KW_last_eat: thawer.get (op->last_eat); break; 639 case KW_last_eat: thawer.get (op->last_eat); break;
640 case KW_speed_left: thawer.get (op->speed_left); break; 640 case KW_speed_left: thawer.get (op->speed_left); break;
641 641
642 case KW_speed: 642 case KW_speed:
643 {
644 float speed;
643 thawer.get (op->speed); 645 thawer.get (speed);
646 op->set_speed (speed);
644 647
645 //TODO: maybe do in check_object 648 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 649 if (!(map_flags & MAP_STYLE))
647 {
648 if (op->speed < 0) 650 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 651 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 } 652 }
653
654 break; 653 break;
655 654
656 case KW_slow_move: 655 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 656 op->move_slow |= MOVE_WALK;
658 thawer.get (op->move_slow_penalty); 657 thawer.get (op->move_slow_penalty);
… …
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 824 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 825 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 826 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; 827 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 828 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; 829 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 830 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 831 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 832 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; 833 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1061 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset. 1062 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1063 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 * 1064 *
1067 */ 1065 */
1068
1069int 1066int
1070load_object (object_thawer & fp, object *op, int map_flags) 1067load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1068{
1072 return parse_object (op, fp, map_flags); 1069 return parse_object (op, fp, map_flags);
1073} 1070}
1074
1075 1071
1076/* This takes a buffer, scans it for variables, and sets those variables 1072/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1073 * as appropriate in op.
1078 * 1074 *
1079 * This function appears to be used in only 2 places - in crossedit to 1075 * This function appears to be used in only 2 places - in crossedit to
… …
1182 KW_monster, 1178 KW_monster,
1183 KW_friendly, 1179 KW_friendly,
1184 KW_generator, 1180 KW_generator,
1185 KW_is_thrown, 1181 KW_is_thrown,
1186 KW_auto_apply, 1182 KW_auto_apply,
1187 KW_treasure, 1183 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1184 KW_player_sold,
1189 /* 20 */ 1185 /* 20 */
1190 KW_see_invisible, 1186 KW_see_invisible,
1191 KW_can_roll, 1187 KW_can_roll,
1192 KW_overlay_floor, 1188 KW_overlay_floor,
… …
1429 CMP_OUT (move_on); 1425 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1426 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1427 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1428 CMP_OUT (move_slow_penalty);
1433 1429
1434 if (!COMPARE_FLAGS (op, tmp)) 1430 if (op->flag != tmp->flag)
1435 for (i = 0; i <= NUM_FLAGS; i++) 1431 for (i = 0; i <= NUM_FLAGS; i++)
1436 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1432 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1433 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1434
1439 /* Save body locations */ 1435 /* Save body locations */
1440 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1436 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (op->body_info[i] != tmp->body_info[i]) 1437 if (op->body_info[i] != tmp->body_info[i])
1442 f.put (body_locations[i].save_name, op->body_info[i]); 1438 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1444 1440
1445/* 1441/*
1446 * Dumps all variables in an object to a file. 1442 * 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, 1443 * 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. 1444 * 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 */ 1445 */
1452
1453void 1446void
1454save_object (object_freezer & fp, object *op, int flag) 1447save_object (object_freezer &fp, object *op, int flag)
1455{ 1448{
1456 archetype *at;
1457 object *tmp, *old;
1458
1459 /* Even if the object does have an owner, it would seem that we should 1449 /* Even if the object does have an owner, it would seem that we should
1460 * still save it. 1450 * still save it.
1461 */ 1451 */
1462 if (op->owner) 1452 if (op->owner)
1463 return; 1453 return;
1464 1454
1465 /* If it is unpaid and we don't want to save those, just return. */ 1455 /* If it is unpaid and we don't want to save those, just return. */
1466 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1456 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1467 return; 1457 return;
1468 1458
1469 if ((at = op->arch) == NULL) 1459 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1470 at = empty_archetype;
1471 1460
1472 fp.put (KW_arch, at->name); 1461 fp.put (KW_arch, at->name);
1473
1474 put (fp, op, &at->clone); 1462 put (fp, op, &at->clone);
1475 1463
1476 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1464 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1477 1465
1478 old = NULL;
1479
1480 if (flag & 2)
1481 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1482 save_object (fp, tmp, flag); 1467 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 1468
1504 fp.put (op); 1469 fp.put (op);
1505 fprintf (fp, "end\n"); 1470 fprintf (fp, "end\n");
1506} 1471}
1507 1472

Diff Legend

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