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.147 by root, Wed Nov 11 18:06:46 2009 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC

… …
480 animate_object (this, direction); 480 animate_object (this, direction);
481 } 481 }
482} 482}
483 483
484static void 484static void
485set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, object_thawer &f)
486{ 486{
487 static const struct flagstr { 487 static const struct flagstr {
488 const char *name; 488 const char *name;
489 MoveType flags; 489 MoveType flags;
490 } move_flags[] = { 490 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 496 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 497 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 498 { "all" , MOVE_ALL },
499 }; 499 };
500 500
501 if (!str) 501 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 502
507 if (isdigit (*str)) 503 if (!*str || isdigit (*str))
508 { 504 {
509 mt = atoi (str); 505 mt = atoi (str);
510 return; 506 return;
511 } 507 }
512 508
513 mt = 0; 509 mt = 0;
514 510
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 512 {
517 bool negate = 0; 513 bool negate = 0;
518 514
519 if (*str == '-') 515 if (*str == '-')
520 { 516 {
… …
554 for (;;) 550 for (;;)
555 { 551 {
556 switch (f.kw) 552 switch (f.kw)
557 { 553 {
558 case KW_uuid: 554 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 555 if (!uuid.parse (f.get_str ()))
561 { 556 {
562 f.parse_warn ("unparseable uuid"); 557 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 558 uuid = UUID::gen ();
564 } 559 }
565 break; 560 break;
566 561
567 case KW_oid: 562 case KW_oid:
568 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
569 break; 564 break;
… …
634 case KW_animation: 629 case KW_animation:
635 { 630 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
637 animation_id = 0; 632 animation_id = 0;
638 633
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 634 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 636 }
643 break; 637 break;
644 638
645 case KW_last_heal: f.get (last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
… …
662 move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 657 f.get (move_slow_penalty);
664 break; 658 break;
665 659
666 case KW_face: 660 case KW_face:
667 face = face_find (f.get_str ()); 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 662 break;
669 663
670 case KW_sound: 664 case KW_sound:
665 if (f.has_value ())
666 {
671 sound = sound_find (f.get_str ()); 667 sound = sound_find (f.get_str ());
672 if (!sound) 668 if (!sound)
673 f.parse_warn ("sound not found"); 669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
671 else
672 sound = 0;
674 break; 673 break;
675 674
676 case KW_sound_destroy: 675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
677 sound_destroy = sound_find (f.get_str ()); 678 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 679 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 680 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
681 }
682 else
683 sound_destroy = 0;
680 break; 684 break;
681 685
682 case KW_x: f.get (x); break; 686 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 687 case KW_y: f.get (y); break;
684 688
… …
735 material = name_to_material (sh); 739 material = name_to_material (sh);
736 } 740 }
737 break; 741 break;
738 742
739 /* These are the new values */ 743 /* These are the new values */
740 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
741 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
742 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
743 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
744 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
745 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
746 750
747 /* These are all legacy - any new objects should use the move_ .. values */ 751 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_no_pass: 752 case KW_no_pass:
749 { 753 {
750 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
996 add_link (map, connected); 1000 add_link (map, connected);
997 } 1001 }
998 break; 1002 break;
999 1003
1000 case KW_randomitems: 1004 case KW_randomitems:
1001 if (f.get_str ()) 1005 if (f.has_value ())
1002 { 1006 {
1003 randomitems = 1007 randomitems =
1004 loading_arch 1008 loading_arch
1005 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
1006 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());
… …
1287 *ptr++ = '\n'; 1291 *ptr++ = '\n';
1288 1292
1289 f.alloc (ptr - cur); 1293 f.alloc (ptr - cur);
1290 } 1294 }
1291 1295
1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v) 1296#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) 1297#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1294 1298
1295 CMP_OUT (x); 1299 CMP_OUT (x);
1296 CMP_OUT (y); 1300 CMP_OUT (y);
1297 1301
1298 CMP_OUT (type); 1302 CMP_OUT (type);
… …
1329 1333
1330 CMP_OUT (tag); 1334 CMP_OUT (tag);
1331 CMP_OUT (custom_name); 1335 CMP_OUT (custom_name);
1332 1336
1333 if (object *owner = op->owner) 1337 if (object *owner = op->owner)
1334 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1338 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1335 1339
1336 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1340 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1337 1341
1338 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1339 1343
1340 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1344 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1341 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1345 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1342 1346
1343 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1347 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1344 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1348 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1345 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1349 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1346 1350
1347 if (op->animation_id != arch->animation_id) 1351 if (op->animation_id != arch->animation_id)
1348 if (op->has_anim ()) 1352 if (op->has_anim ())
1349 f.put (KW_animation, op->anim ().name); 1353 f.put (KW(animation), op->anim ().name);
1350 else 1354 else
1351 { 1355 {
1352 f.put (KW_animation, (const char *)0); 1356 f.put (KW(animation));
1353 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1354 } 1358 }
1355 1359
1356 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1357 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
… …
1393 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1394 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1395 1399
1396 CMP_OUT2 (material, materials);//TODO: nuke 1400 CMP_OUT2 (material, materials);//TODO: nuke
1397 if (op->material != arch->material) 1401 if (op->material != arch->material)
1398 f.put (KW_materialname, op->material->name); 1402 f.put (KW(materialname), op->material->name);
1399 1403
1400 CMP_OUT (value); 1404 CMP_OUT (value);
1401 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1402 CMP_OUT (weight); 1406 CMP_OUT (weight);
1403 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
… …
1409 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1410 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1411 1415
1412 if (op->flag [FLAG_IS_LINKED]) 1416 if (op->flag [FLAG_IS_LINKED])
1413 if (auto (ol, op->find_link ())) 1417 if (auto (ol, op->find_link ()))
1414 f.put (KW_connected, ol->id); 1418 f.put (KW(connected), ol->id);
1415 1419
1416 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1417 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1418 1422
1419 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
… …
1439 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1440 1444
1441 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1442 1446
1443 if (diff [FLAG_OBJ_ORIGINAL]) 1447 if (diff [FLAG_OBJ_ORIGINAL])
1444 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1445 1449
1446 diff.reset (FLAG_OBJ_ORIGINAL); 1450 diff.reset (FLAG_OBJ_ORIGINAL);
1447 1451
1448 // quickly test whether any other flags differ 1452 // quickly test whether any other flags differ
1449 if (expect_true (diff.any ())) 1453 if (expect_true (diff.any ()))
1450 for (int i = 0; i < NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1451 if (expect_false (diff [i])) 1455 if (expect_false (diff [i]))
1452 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1453 1457
1454 // save body locations. gcc's memcmp does an abysmal job when used 1458 // save body locations. gcc's memcmp does an abysmal job when used
1455 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1456 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1457 f.put (body_locations[i].save_name, op->slot[i].info); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1463 * the only place this is not set is when saving the player. 1467 * the only place this is not set is when saving the player.
1464 */ 1468 */
1465bool 1469bool
1466object::write (object_freezer &f) 1470object::write (object_freezer &f)
1467{ 1471{
1468 if (is_arch ()) 1472 if (expect_false (is_arch ()))
1469 { 1473 {
1470 f.put (KW_object, arch->archname); 1474 f.put (KW(object), arch->archname);
1471 write_diff (f, this, archetype::empty); 1475 write_diff (f, this, archetype::empty);
1472 } 1476 }
1473 else 1477 else
1474 { 1478 {
1475 f.put (KW_arch, arch->archname); 1479 f.put (KW(arch), arch->archname);
1476 write_diff (f, this, arch); 1480 write_diff (f, this, arch);
1477 } 1481 }
1478 1482
1479 for (object *tmp = inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1480 tmp->write (f); 1484 tmp->write (f);
1481 1485
1482 f.put (this); 1486 f.put (this);
1483 f.put (KW_end); 1487 f.put (KW(end));
1484 1488
1485 return true; 1489 return true;
1486} 1490}
1487 1491
1488///////////////////////////////////////////////////////////////////////////// 1492/////////////////////////////////////////////////////////////////////////////

Diff Legend

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