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.143 by root, Mon Nov 9 19:17:58 2009 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC

… …
330 330
331 if (!name_pl) 331 if (!name_pl)
332 name_pl = name; 332 name_pl = name;
333 333
334 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
335 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337 337
338 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 341 * not in the ideal fashion.
… …
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
… …
725 case KW_invisible: f.get (invisible); break; 729 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 730 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 731 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 732 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 733 case KW_material: f.get (materials); break; //TODO: nuke
730 case KW_materialname: f.get (materialname); break; 734
735 case KW_materialname:
736 {
737 shstr sh;
738 f.get (sh);
739 material = name_to_material (sh);
740 }
741 break;
731 742
732 /* These are the new values */ 743 /* These are the new values */
733 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
734 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
735 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
736 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
737 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
738 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
739 750
740 /* 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 */
741 case KW_no_pass: 752 case KW_no_pass:
742 { 753 {
743 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 867 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 870 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 871 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
862 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 872 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
990 add_link (map, connected); 1000 add_link (map, connected);
991 } 1001 }
992 break; 1002 break;
993 1003
994 case KW_randomitems: 1004 case KW_randomitems:
995 if (f.get_str ()) 1005 if (f.has_value ())
996 { 1006 {
997 randomitems = 1007 randomitems =
998 loading_arch 1008 loading_arch
999 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
1000 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());
… …
1168 KW_unaggressive, 1178 KW_unaggressive,
1169 KW_reflect_missile, 1179 KW_reflect_missile,
1170 /* 40 */ 1180 /* 40 */
1171 KW_reflect_spell, 1181 KW_reflect_spell,
1172 KW_no_magic, 1182 KW_no_magic,
1173 KW_no_fix_player, 1183 KW_NULL,
1174 KW_is_lightable, 1184 KW_is_lightable,
1175 KW_tear_down, 1185 KW_tear_down,
1176 KW_run_away, 1186 KW_run_away,
1177 KW_NULL, // pass_thru 1187 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1188 KW_NULL, // an_pass_thru
… …
1281 *ptr++ = '\n'; 1291 *ptr++ = '\n';
1282 1292
1283 f.alloc (ptr - cur); 1293 f.alloc (ptr - cur);
1284 } 1294 }
1285 1295
1286#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)
1287#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)
1288 1298
1289 CMP_OUT (x); 1299 CMP_OUT (x);
1290 CMP_OUT (y); 1300 CMP_OUT (y);
1291 1301
1292 CMP_OUT (type); 1302 CMP_OUT (type);
… …
1295 1305
1296 CMP_OUT (name); 1306 CMP_OUT (name);
1297 CMP_OUT (name_pl); 1307 CMP_OUT (name_pl);
1298 1308
1299 CMP_OUT (speed); 1309 CMP_OUT (speed);
1300 CMP_OUT (speed_left); 1310
1311 // speed_left is a major time-burner, and has good locality, so
1312 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left)
1314 {
1315 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1;
1318
1319 if (last_speed_left != op->speed_left)
1320 {
1321 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("speed_left ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
1324 }
1325
1326 f.add (last_speed_left_str, last_speed_left_len);
1327 }
1301 1328
1302 CMP_OUT (title); 1329 CMP_OUT (title);
1303 CMP_OUT (race); 1330 CMP_OUT (race);
1304 CMP_OUT (slaying); 1331 CMP_OUT (slaying);
1305 CMP_OUT (skill); 1332 CMP_OUT (skill);
1306 1333
1307 CMP_OUT (tag); 1334 CMP_OUT (tag);
1308 CMP_OUT (custom_name); 1335 CMP_OUT (custom_name);
1309 1336
1310 if (object *owner = op->owner) 1337 if (object *owner = op->owner)
1311 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1338 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1312 1339
1313 // 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
1314 1341
1315 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1316 1343
1317 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 );
1318 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);
1319 1346
1320 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);
1321 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);
1322 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);
1323 1350
1324 if (op->animation_id != arch->animation_id) 1351 if (op->animation_id != arch->animation_id)
1325 if (op->has_anim ()) 1352 if (op->has_anim ())
1326 f.put (KW_animation, op->anim ().name); 1353 f.put (KW(animation), op->anim ().name);
1327 else 1354 else
1328 { 1355 {
1329 f.put (KW_animation, (const char *)0); 1356 f.put (KW(animation));
1330 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1331 } 1358 }
1332 1359
1333 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1334 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
… …
1359 CMP_OUT (attack_movement); 1386 CMP_OUT (attack_movement);
1360 CMP_OUT (nrof); 1387 CMP_OUT (nrof);
1361 CMP_OUT (level); 1388 CMP_OUT (level);
1362 CMP_OUT (attacktype); 1389 CMP_OUT (attacktype);
1363 1390
1364 // using memcmp here seems to be a loss - us gcc vectorising? 1391 // using memcmp here seems to be a loss - is gcc vectorising?
1365 for (int i = 0; i < NROFATTACKS; i++) 1392 for (int i = 0; i < NROFATTACKS; i++)
1366 if (expect_false (op->resist[i] != arch->resist[i])) 1393 if (expect_false (op->resist[i] != arch->resist[i]))
1367 f.put (resist_save[i], op->resist[i]); 1394 f.put (resist_save[i], op->resist[i]);
1368 1395
1369 CMP_OUT (path_attuned); 1396 CMP_OUT (path_attuned);
1370 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1371 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1399
1372 CMP_OUT2 (material, materials);//TODO: nuke 1400 CMP_OUT2 (material, materials);//TODO: nuke
1373 CMP_OUT (materialname); 1401 if (op->material != arch->material)
1402 f.put (KW(materialname), op->material->name);
1403
1374 CMP_OUT (value); 1404 CMP_OUT (value);
1375 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1376 CMP_OUT (weight); 1406 CMP_OUT (weight);
1377 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
1378 CMP_OUT (state); 1408 CMP_OUT (state);
… …
1383 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1384 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1385 1415
1386 if (op->flag [FLAG_IS_LINKED]) 1416 if (op->flag [FLAG_IS_LINKED])
1387 if (auto (ol, op->find_link ())) 1417 if (auto (ol, op->find_link ()))
1388 f.put (KW_connected, ol->id); 1418 f.put (KW(connected), ol->id);
1389 1419
1390 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1391 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1392 1422
1393 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
… …
1413 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1414 1444
1415 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1416 1446
1417 if (diff [FLAG_OBJ_ORIGINAL]) 1447 if (diff [FLAG_OBJ_ORIGINAL])
1418 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));
1419 1449
1420 diff.reset (FLAG_OBJ_ORIGINAL); 1450 diff.reset (FLAG_OBJ_ORIGINAL);
1421 1451
1422 // quickly test whether any other flags differ 1452 // quickly test whether any other flags differ
1423 if (expect_true (diff.any ())) 1453 if (expect_true (diff.any ()))
1424 for (int i = 0; i < NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1425 if (expect_false (diff [i])) 1455 if (expect_false (diff [i]))
1426 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1427 1457
1428 // 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
1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1430 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1431 f.put (body_locations[i].save_name, op->slot[i].info); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1437 * 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.
1438 */ 1468 */
1439bool 1469bool
1440object::write (object_freezer &f) 1470object::write (object_freezer &f)
1441{ 1471{
1442 if (is_arch ()) 1472 if (expect_false (is_arch ()))
1443 { 1473 {
1444 f.put (KW_object, arch->archname); 1474 f.put (KW(object), arch->archname);
1445 write_diff (f, this, archetype::empty); 1475 write_diff (f, this, archetype::empty);
1446 } 1476 }
1447 else 1477 else
1448 { 1478 {
1449 f.put (KW_arch, arch->archname); 1479 f.put (KW(arch), arch->archname);
1450 write_diff (f, this, arch); 1480 write_diff (f, this, arch);
1451 } 1481 }
1452 1482
1453 for (object *tmp = inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1454 tmp->write (f); 1484 tmp->write (f);
1455 1485
1456 f.put (this); 1486 f.put (this);
1457 f.put (KW_end); 1487 f.put (KW(end));
1458 1488
1459 return true; 1489 return true;
1460} 1490}
1461 1491
1462///////////////////////////////////////////////////////////////////////////// 1492/////////////////////////////////////////////////////////////////////////////

Diff Legend

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