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.123 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.165 by sf-pippijn, Tue Mar 15 12:37:21 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <loader.h>
26#include <sproto.h> 26#include <sproto.h>
27 27
28///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29 29
30extern archetype *loading_arch; 30extern archetype *loading_arch;
31
32//+GPL
31 33
32/* This table is only necessary to convert objects that existed before the 34/* This table is only necessary to convert objects that existed before the
33 * spell object conversion to the new object. It was not practical 35 * spell object conversion to the new object. It was not practical
34 * to go through every mapping looking for every potion, rod, wand, etc 36 * to go through every mapping looking for every potion, rod, wand, etc
35 * that had a sp set and update to the new value. So this maps the 37 * that had a sp set and update to the new value. So this maps the
… …
257void 259void
258object::post_load_check () 260object::post_load_check ()
259{ 261{
260 if (type >= NUM_TYPES) 262 if (type >= NUM_TYPES)
261 { 263 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 264 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0; 265 type = 0;
264 } 266 }
265 267
266 switch (type) 268 switch (type)
267 { 269 {
270 case RANGED:
268 case BOW: 271 case BOW:
269 case WAND: 272 case WAND:
270 case ROD: 273 case ROD:
271 case HORN: 274 case HORN:
272 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
273 { 276 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 278 slot [body_range].info = -1;
276 } 279 }
277 break; 280 break;
278 281
279 case WEAPON: 282 case WEAPON:
280 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
281 { 284 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
284 } 287 }
285 break; 288 break;
286 289
287 case SHIELD: 290 case SHIELD:
288 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
289 { 292 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
292 } 295 }
293 break; 296 break;
294 297
295 case PLAYER: 298 case PLAYER:
296 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
297 { 300 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
300 } 303 }
301 304
302 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
303 { 306 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
306 } 309 }
307 310
308 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
309 { 312 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 314 slot [body_range].info = 1;
312 } 315 }
313 break; 316 break;
314 } 317 }
315 318
… …
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
331 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
332 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
333 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337
338 if (speed < 0.)
339 {
340 flag [FLAG_RANDOM_SPEED] = true;
341 speed = -speed;
342 // speed_left will be randomised in instantiate () and copy_to ()
343 }
334 344
335 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 348 * not in the ideal fashion.
339 */ 349 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 350 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 351 {
342 if (!skill) 352 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 353 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 354 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 355 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 356 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 357 }
348 358
349 /* We changed last_heal to gen_sp_armour, which is what it 359 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 360 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 361 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 367 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 368 || type == BRACERS || type == CLOAK)
359 { 369 {
360 if (last_heal) 370 if (last_heal)
361 { 371 {
362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 372 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
363 gen_sp_armour = last_heal; 373 gen_sp_armour = last_heal;
364 last_heal = 0; 374 last_heal = 0;
365 } 375 }
366 376
367 int ip = calc_item_power (this, 0); 377 int ip = calc_item_power (this, 0);
368 378
369 /* Legacy objects from before item power was in the game */ 379 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 380 if (!item_power && ip)
371 { 381 {
372 if (ip > 3) 382 if (ip > 3)
373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 383 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
374 384
375 item_power = ip; 385 item_power = ip;
376 } 386 }
377 387
378 /* Check for possibly bogus values. Has to meet both these criteria - 388 /* Check for possibly bogus values. Has to meet both these criteria -
… …
385 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif 397#endif
388 } 398 }
389 399
390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD 402 if ((type == ROD
393 || type == WAND 403 || type == WAND
394 || type == SCROLL 404 || type == SCROLL
395 || type == HORN 405 || type == HORN
… …
412 } 422 }
413 423
414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 425 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
416 { 426 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 427 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
418 object *tmp = get_archetype_by_object_name (slaying); 428 object *tmp = get_archetype_by_object_name (slaying);
419 insert_ob_in_ob (tmp, this); 429 insert_ob_in_ob (tmp, this);
420 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
421 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
422 value = arch->value * inv->value; 432 value = arch->value * inv->value;
423 } 433 }
424 434
425 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
426 { 436 {
427 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
428 { 438 {
429 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
430 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
431 } 441 }
432 442
433 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
434 if (move_type == 0) 444 if (move_type == 0)
435 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
436 } 446 }
437 447
438 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
439 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
440 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
441 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
442 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
443 */ 453 */
… …
461 } 471 }
462 else 472 else
463 move_type = MOVE_WALK; 473 move_type = MOVE_WALK;
464 } 474 }
465 } 475 }
476
477 // if the object has an animation, try to provide a default face
478 if (has_anim ())
479 {
480 const animation &anim_ob = anim ();
481
482 if (anim_speed)
483 // if this item is time-animated, force the last frame
484 animate_object (this, 0);
485 else if (flag [FLAG_MONSTER])
486 // if it is a monster, set appropriate facing
487 animate_object (this, direction);
488 }
466} 489}
467 490
468static void 491static void
469set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
470{ 493{
471 static const struct flagstr { 494 static const struct flagstr {
472 const char *name; 495 const char *name;
473 MoveType flags; 496 MoveType flags;
474 } move_flags[] = { 497 } move_flags[] = {
… …
480 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
481 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
482 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
483 }; 506 };
484 507
485 if (!str) 508 const char *str = f.get_str ();
486 {
487 mt = 0;
488 return;
489 }
490 509
491 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
492 { 511 {
493 mt = atoi (str); 512 mt = atoi (str);
494 return; 513 return;
495 } 514 }
496 515
497 mt = 0; 516 mt = 0;
498 517
499 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
500 { 519 {
501 bool negate = 0; 520 bool negate = 0;
502 521
503 if (*str == '-') 522 if (*str == '-')
504 { 523 {
505 negate = 1; 524 negate = 1;
506 str++; 525 str++;
507 } 526 }
508 527
509 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
510 { 529 {
511 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
512 { 531 {
513 if (negate) 532 if (negate)
514 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
523 542
524next: ; 543next: ;
525 } 544 }
526} 545}
527 546
547//-GPL
548
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 549#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 550
530bool 551bool
531object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
532{ 553{
… …
536 for (;;) 557 for (;;)
537 { 558 {
538 switch (f.kw) 559 switch (f.kw)
539 { 560 {
540 case KW_uuid: 561 case KW_uuid:
541 if (const char *s = f.get_str ())
542 if (!uuid.parse (s)) 562 if (!uuid.parse (f.get_str ()))
543 { 563 {
544 f.parse_warn ("unparseable uuid"); 564 f.parse_warn ("unparseable uuid");
545 uuid = UUID::gen (); 565 uuid = UUID::gen ();
546 } 566 }
547 break; 567 break;
548 568
549 case KW_oid: 569 case KW_oid:
550 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
551 break; 571 break;
… …
569 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
575 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
576 596
577 if (!op_inv) 597 if (!op_inv)
578 { 598 {
579 inv = tmp; 599 inv = tmp;
580 tmp->above = 0; 600 tmp->above = 0;
… …
613 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
614 break; 634 break;
615 635
616 case KW_animation: 636 case KW_animation:
617 { 637 {
618 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
619 animation_id = 0; 639 animation_id = 0;
620 640
621 const char *str = f.get_str ();
622 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 642 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
624 } 643 }
625 break; 644 break;
626 645
627 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
628 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
629 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
630 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
631 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
632 652
633 case KW_speed: 653 case KW_speed:
634 f.get (speed); 654 f.get (speed);
635 655
… …
644 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
645 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
646 break; 666 break;
647 667
648 case KW_face: 668 case KW_face:
649 face = face_find (f.get_str ()); 669 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
650 break; 670 break;
651 671
652 case KW_sound: 672 case KW_sound:
673 if (f.has_value ())
674 {
653 sound = sound_find (f.get_str ()); 675 sound = sound_find (f.get_str ());
654 if (!sound) 676 if (!sound)
655 f.parse_warn ("sound not found"); 677 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
678 }
679 else
680 sound = 0;
656 break; 681 break;
657 682
658 case KW_sound_destroy: 683 case KW_sound_destroy:
684 if (f.has_value ())
685 {
659 sound_destroy = sound_find (f.get_str ()); 686 sound_destroy = sound_find (f.get_str ());
660 if (!sound_destroy) 687 if (!sound_destroy)
661 f.parse_warn ("sound not found"); 688 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
689 }
690 else
691 sound_destroy = 0;
662 break; 692 break;
663 693
664 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
665 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
666 696
… …
707 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
708 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
709 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
710 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
711 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
712 case KW_materialname: f.get (materialname); break; 742 case KW_materialname: f.get (material); break;
713 743
714 /* These are the new values */ 744 /* These are the new values */
715 case KW_move_block: set_move (move_block, f.get_str ()); break; 745 case KW_move_block: set_move (move_block, f); break;
716 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 746 case KW_move_allow: set_move (move_allow, f); break;
717 case KW_move_type: set_move (move_type, f.get_str ()); break; 747 case KW_move_type: set_move (move_type , f); break;
718 case KW_move_on: set_move (move_on, f.get_str ()); break; 748 case KW_move_on: set_move (move_on , f); break;
719 case KW_move_off: set_move (move_off, f.get_str ()); break; 749 case KW_move_off: set_move (move_off , f); break;
720 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 750 case KW_move_slow: set_move (move_slow , f); break;
721 751
722 /* These are all legacy - any new objects should use the move_ .. values */ 752 /* These are all legacy - any new objects should use the move_ .. values */
723 case KW_no_pass: 753 case KW_no_pass:
724 { 754 {
725 if (f.get_sint32 ()) 755 if (f.get_sint32 ())
… …
788 818
789 819
790 case KW_identified: 820 case KW_identified:
791 GET_FLAG (this, FLAG_IDENTIFIED); 821 GET_FLAG (this, FLAG_IDENTIFIED);
792 //TODO: move to check_object or so 822 //TODO: move to check_object or so
793 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 823 if (this->flag [FLAG_IDENTIFIED])
794 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 824 this->clr_flag (FLAG_KNOWN_MAGICAL);
795 825
796 break; 826 break;
797 827
798 case KW_friendly: 828 case KW_friendly:
799 if (f.get_bool ()) 829 if (f.get_bool ())
… …
834 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 864 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
835 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 865 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
836 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 866 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
837 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 867 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
838 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 868 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
839 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
840 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 869 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
841 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 870 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
842 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 871 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
843 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 872 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
844 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 873 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
888 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 917 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
889 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 918 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
890 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 919 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
891 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 920 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
892 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 921 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
922 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
893 923
894 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 924 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
895 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 925 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
896 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 926 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
897 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 927 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
927 case KW_anim_speed: f.get (anim_speed); break; 957 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 958 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 959 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 960 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 961 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 962 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 963 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 964 case KW_weapontype: f.get (weapontype); break;
935 case KW_tooltype: f.get (tooltype); break;
936 case KW_casting_time: f.get (casting_time); break; 965 case KW_casting_time: f.get (casting_time); break;
937 966
938 // elevation is deprecated 967 // elevation is deprecated
939 case KW_elevation: break; 968 case KW_elevation: break;
940 969
… …
964 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 993 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
965 case KW_can_apply: 994 case KW_can_apply:
966 break; 995 break;
967 996
968 case KW_connected: 997 case KW_connected:
969 add_button_link (this, map, f.get_sint32 ()); 998 {
999 shstr connected;
1000
1001 f.get (connected);
1002 add_link (map, connected);
1003 }
970 break; 1004 break;
971 1005
972 case KW_randomitems: 1006 case KW_randomitems:
973 if (f.get_str ()) 1007 if (f.has_value ())
974 { 1008 {
975 randomitems = 1009 randomitems =
976 loading_arch 1010 loading_arch
977 ? treasurelist::get (f.get_str ()) 1011 ? treasurelist::get (f.get_str ())
978 : treasurelist::find (f.get_str ()); 1012 : treasurelist::find (f.get_str ());
979 1013
980 if (!randomitems) 1014 if (!randomitems)
1015 {
981 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1016 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1017 randomitems = treasurelist::get (shstr_none); // avoid crashes
1018 }
982 } 1019 }
983 else 1020 else
984 randomitems = 0; 1021 randomitems = 0;
985 break; 1022 break;
986 1023
… …
1044 1081
1045 archetype *arch = archetype::find (f.get_str ()); 1082 archetype *arch = archetype::find (f.get_str ());
1046 1083
1047 if (!arch) 1084 if (!arch)
1048 { 1085 {
1049 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1086 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1050 arch = archetype::find ("earthwall"); 1087 arch = archetype::find (shstr_earthwall);
1051 } 1088 }
1052 1089
1053 assert (arch); //D maybe use exception handling of sorts? 1090 assert (arch); //D maybe use exception handling of sorts?
1054 1091
1055 f.next (); 1092 f.next ();
… …
1076 * override values and in c_wiz to mutate values. 1113 * override values and in c_wiz to mutate values.
1077 */ 1114 */
1078int 1115int
1079set_variable (object *op, char *buf) 1116set_variable (object *op, char *buf)
1080{ 1117{
1081 object_thawer f (buf, (AV *)0); 1118 object_thawer f (format ("%s\nend", buf), (AV *)0);
1082 1119
1083 return op->parse_kv (f); 1120 return op->parse_kv (f);
1084} 1121}
1085 1122
1086/* This returns a string of the integer movement type */
1087#if 0
1088// unused function
1089static char *
1090get_string_move_type (MoveType mt)
1091{
1092 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1093 int i, all_count = 0, count;
1094
1095 strcpy (retbuf, "");
1096 strcpy (retbuf_all, " all");
1097
1098 /* Quick check, and probably fairly common */
1099 if (mt == MOVE_ALL)
1100 return retbuf_all + 1;
1101 if (mt == 0)
1102 {
1103 strcpy (retbuf, "0");
1104 return retbuf;
1105 }
1106
1107 /* We basically slide the bits down. Why look at MOVE_ALL?
1108 * because we may want to return a string like 'all -swim',
1109 * and if we just looked at mt, we couldn't get that.
1110 */
1111 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1112 {
1113 if (mt & (1 << count))
1114 {
1115 strcat (retbuf, " ");
1116 strcat (retbuf, move_name[count]);
1117 }
1118 else
1119 {
1120 strcat (retbuf_all, " -");
1121 strcat (retbuf_all, move_name[count]);
1122 all_count++;
1123 }
1124 }
1125 /* Basically, if there is a single negation, return it, eg
1126 * 'all -swim'. But more than that, just return the
1127 * enumerated values. It doesn't make sense to return
1128 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1129 */
1130 if (all_count <= 1)
1131 return retbuf_all + 1;
1132 else
1133 return retbuf + 1;
1134}
1135#endif
1136
1137// compare *op against *tmp and output differences 1123// compare *op against *arch and output differences
1138static void 1124static void
1139write_diff (object_freezer &f, object *op, object *tmp) 1125write_diff (object_freezer &f, object *op, object *arch)
1140{ 1126{
1141 static const keyword resist_save[NROFATTACKS] = { 1127 static const keyword resist_save[NROFATTACKS] = {
1142# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1128# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1143# include "attackinc.h" 1129# include "attackinc.h"
1144# undef def 1130# undef def
… …
1158 KW_applied, 1144 KW_applied,
1159 KW_unpaid, 1145 KW_unpaid,
1160 KW_can_use_shield, 1146 KW_can_use_shield,
1161 KW_no_pick, 1147 KW_no_pick,
1162 KW_NULL, // walk_on 1148 KW_NULL, // walk_on
1149 /* 10 */
1163 KW_NULL, // no_pass 1150 KW_NULL, // no_pass
1164 /* 10 */
1165 KW_is_animated, 1151 KW_is_animated,
1166 KW_NULL, // slow_move 1152 KW_NULL, // slow_move
1167 KW_NULL, // flying 1153 KW_NULL, // flying
1168 KW_monster, 1154 KW_monster,
1169 KW_friendly, 1155 KW_friendly,
1170 KW_generator, 1156 KW_generator,
1171 KW_is_thrown, 1157 KW_is_thrown,
1172 KW_auto_apply, 1158 KW_auto_apply,
1173 KW_treasure_env, 1159 KW_treasure_env,
1160 /* 20 */
1174 KW_player_sold, 1161 KW_player_sold,
1175 /* 20 */
1176 KW_see_invisible, 1162 KW_see_invisible,
1177 KW_can_roll, 1163 KW_can_roll,
1178 KW_overlay_floor, 1164 KW_overlay_floor,
1179 KW_is_turnable, 1165 KW_is_turnable,
1180 KW_NULL, // walk_off 1166 KW_NULL, // walk_off
1181 KW_NULL, // fly_on 1167 KW_NULL, // fly_on
1182 KW_NULL, // fly_off 1168 KW_NULL, // fly_off
1183 KW_is_used_up, 1169 KW_is_used_up,
1184 KW_identified, 1170 KW_identified,
1171 /* 30 */
1185 KW_reflecting, 1172 KW_reflecting,
1186 /* 30 */
1187 KW_changing, 1173 KW_changing,
1188 KW_splitting, 1174 KW_splitting,
1189 KW_hitback, 1175 KW_hitback,
1190 KW_startequip, 1176 KW_startequip,
1191 KW_blocksview, 1177 KW_blocksview,
1192 KW_undead, 1178 KW_undead,
1193 KW_scared, 1179 KW_scared,
1194 KW_unaggressive, 1180 KW_unaggressive,
1195 KW_reflect_missile, 1181 KW_reflect_missile,
1182 /* 40 */
1196 KW_reflect_spell, 1183 KW_reflect_spell,
1197 /* 40 */
1198 KW_no_magic, 1184 KW_no_magic,
1199 KW_no_fix_player, 1185 KW_NULL,
1200 KW_is_lightable, 1186 KW_is_lightable,
1201 KW_tear_down, 1187 KW_tear_down,
1202 KW_run_away, 1188 KW_run_away,
1203 KW_NULL, // pass_thru 1189 KW_NULL, // pass_thru
1204 KW_NULL, // an_pass_thru 1190 KW_NULL, // an_pass_thru
1205 KW_pick_up, 1191 KW_pick_up,
1206 KW_unique, 1192 KW_unique,
1193 /* 50 */
1207 KW_no_drop, 1194 KW_no_drop,
1208 /* 50 */
1209 KW_NULL, // wizcast 1195 KW_NULL, // wizcast
1210 KW_can_cast_spell, 1196 KW_can_cast_spell,
1211 KW_can_use_scroll, 1197 KW_can_use_scroll,
1212 KW_can_use_range, 1198 KW_can_use_range,
1213 KW_can_use_bow, 1199 KW_can_use_bow,
1214 KW_can_use_armour, 1200 KW_can_use_armour,
1215 KW_can_use_weapon, 1201 KW_can_use_weapon,
1216 KW_can_use_ring, 1202 KW_can_use_ring,
1217 KW_has_ready_range, 1203 KW_has_ready_range,
1204 /* 60 */
1218 KW_has_ready_bow, 1205 KW_has_ready_bow,
1219 /* 60 */
1220 KW_xrays, 1206 KW_xrays,
1221 KW_NULL, 1207 KW_NULL,
1222 KW_is_floor, 1208 KW_is_floor,
1223 KW_lifesave, 1209 KW_lifesave,
1224 KW_no_strength, 1210 KW_no_strength,
1225 KW_sleep, 1211 KW_sleep,
1226 KW_stand_still, 1212 KW_stand_still,
1227 KW_random_move, 1213 KW_random_move,
1228 KW_only_attack, 1214 KW_only_attack,
1215 /* 70 */
1229 KW_confused, 1216 KW_confused,
1230 /* 70 */
1231 KW_stealth, 1217 KW_stealth,
1232 KW_NULL, 1218 KW_NULL,
1233 KW_NULL, 1219 KW_NULL,
1234 KW_cursed, 1220 KW_cursed,
1235 KW_damned, 1221 KW_damned,
1236 KW_see_anywhere, 1222 KW_see_anywhere,
1237 KW_known_magical, 1223 KW_known_magical,
1238 KW_known_cursed, 1224 KW_known_cursed,
1239 KW_can_use_skill, 1225 KW_can_use_skill,
1226 /* 80 */
1240 KW_been_applied, 1227 KW_been_applied,
1241 /* 80 */
1242 KW_has_ready_scroll, 1228 KW_has_ready_scroll,
1243 KW_can_use_rod, 1229 KW_can_use_rod,
1244 KW_precious, 1230 KW_precious,
1245 KW_can_use_horn, 1231 KW_can_use_horn,
1246 KW_make_invisible, 1232 KW_make_invisible,
1247 KW_inv_locked, 1233 KW_inv_locked,
1248 KW_is_wooded, 1234 KW_is_wooded,
1249 KW_is_hilly, 1235 KW_is_hilly,
1250 KW_has_ready_skill, 1236 KW_has_ready_skill,
1237 /* 90 */
1251 KW_has_ready_weapon, 1238 KW_has_ready_weapon,
1252 /* 90 */
1253 KW_no_skill_ident, 1239 KW_no_skill_ident,
1254 KW_is_blind, 1240 KW_is_blind,
1255 KW_can_see_in_dark, 1241 KW_can_see_in_dark,
1256 KW_is_cauldron, 1242 KW_is_cauldron,
1257 KW_NULL, 1243 KW_NULL,
1258 KW_no_steal, 1244 KW_no_steal,
1259 KW_one_hit, 1245 KW_one_hit,
1260 KW_NULL, 1246 KW_NULL,
1261 KW_berserk, 1247 KW_berserk,
1248 /* 100 */
1262 KW_neutral, 1249 KW_neutral,
1263 /* 100 */
1264 KW_no_attack, 1250 KW_no_attack,
1265 KW_no_damage, 1251 KW_no_damage,
1266 KW_obj_original, 1252 KW_obj_original,
1267 KW_NULL, 1253 KW_random_speed,
1268 KW_activate_on_push, 1254 KW_activate_on_push,
1269 KW_activate_on_release, 1255 KW_activate_on_release,
1270 KW_is_water, 1256 KW_is_water,
1271 KW_use_content_on_gen, 1257 KW_use_content_on_gen,
1272 KW_NULL, 1258 KW_NULL,
1259 /* 110 */
1273 KW_is_buildable, 1260 KW_is_buildable,
1274 /* 110 */
1275 KW_destroy_on_death, 1261 KW_destroy_on_death,
1276 KW_NULL, 1262 KW_NULL,
1277 }; 1263 };
1264
1265 // obj_original is the only commonly differing flag between archetype
1266 // and object, so special-case it here to be able to skip the loop
1267 static const struct flagmask : object::flags_t
1268 {
1269 flagmask ()
1270 {
1271 for (int i = 0; i < NUM_FLAGS; i++)
1272 if (flag_names [i])
1273 set (i);
1274 }
1275 } flagmask;
1278 1276
1279 /* This saves the key/value lists. We do it first so that any 1277 /* This saves the key/value lists. We do it first so that any
1280 * keys that match field names will be overwritten by the loader. 1278 * keys that match field names will be overwritten by the loader.
1281 */ 1279 */
1282 for (key_value *kv = op->key_values; kv; kv = kv->next) 1280 for (key_value *kv = op->key_values; kv; kv = kv->next)
1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1281 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1284 f.put (kv->key, kv->value); 1282 f.put (kv->key, kv->value);
1285 1283
1286 /* We don't need to worry about the arch's extra fields - they 1284 if (op->uuid)
1287 * will get taken care of the copy_to method. 1285 {
1288 */ 1286 // highly optimised - this is often 25% of all data written
1287 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1288 char *ptr = cur;
1289 1289
1290 f.put (KW_uuid, op->uuid.c_str ()); 1290 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1291 ptr += sizeof ("uuid ") - 1;
1292 ptr = op->uuid.append (ptr);
1293 *ptr++ = '\n';
1291 1294
1295 f.alloc (ptr - cur);
1296 }
1297
1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1298#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 != tmp->v)) f.put (KW_ ## k, op->v) 1299#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1294 1300
1295 if (object *owner = op->owner) 1301 CMP_OUT (x);
1296 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1302 CMP_OUT (y);
1303
1304 CMP_OUT (type);
1305 CMP_OUT (subtype);
1306 CMP_OUT (direction);
1297 1307
1298 CMP_OUT (name); 1308 CMP_OUT (name);
1299 CMP_OUT (name_pl); 1309 CMP_OUT (name_pl);
1300 CMP_OUT (custom_name); 1310 CMP_OUT (speed);
1311
1312 // speed_left is a major time-burner, and has good locality, so
1313 // we use a simple lookup-cache to avoid the very slow printf.
1314 if (op->speed_left != arch->speed_left)
1315 {
1316 static double last_speed_left = 0.;
1317 static char last_speed_left_str [256] = "sl 0\n";
1318 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1319
1320 if (last_speed_left != op->speed_left)
1321 {
1322 last_speed_left = op->speed_left;
1323 last_speed_left_len = sizeof ("sl ") - 1
1324 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1325 }
1326
1327 f.add (last_speed_left_str, last_speed_left_len);
1328 }
1329
1301 CMP_OUT (title); 1330 CMP_OUT (title);
1302 CMP_OUT (race); 1331 CMP_OUT (race);
1332 CMP_OUT (slaying);
1303 CMP_OUT (skill); 1333 CMP_OUT (skill);
1304 CMP_OUT (slaying); 1334
1305 CMP_OUT (tag); 1335 CMP_OUT (tag);
1336 CMP_OUT (custom_name);
1337
1338 if (object *owner = op->owner)
1339 if (const char *ref = owner->ref ())
1340 f.put (KW(owner), ref);
1341
1342 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1343
1306 CMP_OUT (other_arch); 1344 CMP_OUT (other_arch);
1307 1345
1308 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1346 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1309 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1347 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1310 1348
1311 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1349 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1350 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1351 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1314 1352
1315 if (op->animation_id != tmp->animation_id) 1353 if (op->animation_id != arch->animation_id)
1316 if (op->animation_id) 1354 if (op->has_anim ())
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1355 f.put (KW(animation), op->anim ().name);
1318 else 1356 else
1319 { 1357 {
1320 f.put (KW_animation, (const char *)0); 1358 f.put (KW(animation));
1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1359 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1322 } 1360 }
1323 1361
1324 CMP_OUT2 (str, stats.Str); 1362 CMP_OUT2 (str, stats.Str);
1325 CMP_OUT2 (dex, stats.Dex); 1363 CMP_OUT2 (dex, stats.Dex);
… …
1336 CMP_OUT2 (grace, stats.grace); 1374 CMP_OUT2 (grace, stats.grace);
1337 CMP_OUT2 (maxgrace, stats.maxgrace); 1375 CMP_OUT2 (maxgrace, stats.maxgrace);
1338 CMP_OUT2 (exp, stats.exp); 1376 CMP_OUT2 (exp, stats.exp);
1339 1377
1340 CMP_OUT (perm_exp); 1378 CMP_OUT (perm_exp);
1341 CMP_OUT (expmul); 1379 //CMP_OUT (expmul);
1342 1380
1343 CMP_OUT2 (food, stats.food); 1381 CMP_OUT2 (food, stats.food);
1344 CMP_OUT2 (dam, stats.dam); 1382 CMP_OUT2 (dam, stats.dam);
1345 CMP_OUT2 (luck, stats.luck); 1383 CMP_OUT2 (luck, stats.luck);
1346 CMP_OUT2 (wc, stats.wc); 1384 CMP_OUT2 (wc, stats.wc);
1347 CMP_OUT2 (ac, stats.ac); 1385 CMP_OUT2 (ac, stats.ac);
1348 1386
1349 CMP_OUT (x);
1350 CMP_OUT (y);
1351 CMP_OUT (speed);
1352 CMP_OUT (speed_left);
1353 CMP_OUT2 (move_state, move_status); 1387 CMP_OUT2 (move_state, move_status);
1354 CMP_OUT (attack_movement); 1388 CMP_OUT (attack_movement);
1355 CMP_OUT (nrof); 1389 CMP_OUT (nrof);
1356 CMP_OUT (level); 1390 CMP_OUT (level);
1357 CMP_OUT (direction);
1358 CMP_OUT (type);
1359 CMP_OUT (subtype);
1360 CMP_OUT (attacktype); 1391 CMP_OUT (attacktype);
1361 1392
1393 // using memcmp here seems to be a loss - is gcc vectorising?
1362 for (int i = 0; i < NROFATTACKS; i++) 1394 for (int i = 0; i < NROFATTACKS; i++)
1363 if (expect_false (op->resist[i] != tmp->resist[i])) 1395 if (expect_false (op->resist[i] != arch->resist[i]))
1364 f.put (resist_save[i], op->resist[i]); 1396 f.put (resist_save[i], op->resist[i]);
1365 1397
1366 CMP_OUT (path_attuned); 1398 CMP_OUT (path_attuned);
1367 CMP_OUT (path_repelled); 1399 CMP_OUT (path_repelled);
1368 CMP_OUT (path_denied); 1400 CMP_OUT (path_denied);
1401
1369 CMP_OUT2 (material, materials);//TODO: nuke 1402 CMP_OUT2 (material, materials);//TODO: nuke
1370 CMP_OUT (materialname); 1403 if (op->material != arch->material)
1404 f.put (KW(materialname), op->material->name);
1405
1371 CMP_OUT (value); 1406 CMP_OUT (value);
1372 CMP_OUT (carrying); 1407 CMP_OUT (carrying);
1373 CMP_OUT (weight); 1408 CMP_OUT (weight);
1374 CMP_OUT (invisible); 1409 CMP_OUT (invisible);
1375 CMP_OUT (state); 1410 CMP_OUT (state);
… …
1379 CMP_OUT (last_grace); 1414 CMP_OUT (last_grace);
1380 CMP_OUT (last_eat); 1415 CMP_OUT (last_eat);
1381 CMP_OUT (glow_radius); 1416 CMP_OUT (glow_radius);
1382 1417
1383 if (op->flag [FLAG_IS_LINKED]) 1418 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op)) 1419 if (auto (ol, op->find_link ()))
1385 f.put (KW_connected, i); 1420 f.put (KW(connected), ol->id);
1386 1421
1387 CMP_OUT (randomitems); 1422 CMP_OUT (randomitems);
1423
1388 CMP_OUT2 (container, weight_limit); 1424 CMP_OUT2 (container, weight_limit);
1389 1425
1390 CMP_OUT (run_away); 1426 CMP_OUT (run_away);
1391 CMP_OUT (pick_up); 1427 CMP_OUT (pick_up);
1392 CMP_OUT (will_apply); 1428 CMP_OUT (will_apply);
1393 CMP_OUT (smoothlevel); 1429 CMP_OUT (smoothlevel);
1394 CMP_OUT (weapontype); 1430 CMP_OUT (weapontype);
1395 CMP_OUT (tooltype);
1396 CMP_OUT (client_type); 1431 CMP_OUT (client_type);
1397 CMP_OUT (item_power); 1432 CMP_OUT (item_power);
1398 CMP_OUT (duration); 1433 CMP_OUT (duration);
1399 CMP_OUT (range); 1434 CMP_OUT (range);
1400 CMP_OUT (range_modifier); 1435 CMP_OUT (range_modifier);
… …
1408 CMP_OUT (move_on); 1443 CMP_OUT (move_on);
1409 CMP_OUT (move_off); 1444 CMP_OUT (move_off);
1410 CMP_OUT (move_slow); 1445 CMP_OUT (move_slow);
1411 CMP_OUT (move_slow_penalty); 1446 CMP_OUT (move_slow_penalty);
1412 1447
1413 if (op->flag != tmp->flag) 1448 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1449
1450#if stdcpp // we need gcc, sorry
1451 if (diff [FLAG_OBJ_ORIGINAL])
1452 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1453
1454 diff.reset (FLAG_OBJ_ORIGINAL);
1455
1456 // quickly test whether any other flags differ
1457 if (expect_true (diff.any ()))
1414 for (int i = 0; i <= NUM_FLAGS; i++) 1458 for (int i = 0; i < NUM_FLAGS; i++)
1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1459 if (expect_false (diff [i]))
1416 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1460 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1461#else
1462 // use sgi extensions
1463 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1465#endif
1417 1466
1418 // save body locations 1467 // save body locations. gcc's memcmp does an abysmal job when used
1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1420 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1421 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].kw, op->slot[i].info);
1422} 1471}
1423 1472
1424/* 1473/*
1425 * Dumps all variables in an object to a file. 1474 * Dumps all variables in an object to a file.
1426 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1475 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1427 * the only place this is not set is when saving the player. 1476 * the only place this is not set is when saving the player.
1428 */ 1477 */
1429bool 1478bool
1430object::write (object_freezer &f) 1479object::write (object_freezer &f)
1431{ 1480{
1432 archetype *at = arch ? arch : archetype::empty; 1481 if (expect_false (is_arch ()))
1433 1482 {
1483 f.put (KW(object), arch->archname);
1484 write_diff (f, this, archetype::empty);
1485 }
1486 else
1487 {
1434 f.put (KW_arch, at->archname); 1488 f.put (KW(arch), arch->archname);
1435 write_diff (f, this, at); 1489 write_diff (f, this, arch);
1490 }
1436 1491
1437 for (object *tmp = inv; tmp; tmp = tmp->below) 1492 for (object *tmp = inv; tmp; tmp = tmp->below)
1438 tmp->write (f); 1493 tmp->write (f);
1439 1494
1440 f.put (this); 1495 f.put (this);
1441 f.put (KW_end); 1496 f.put (KW(end));
1442 1497
1443 return true; 1498 return true;
1444} 1499}
1445 1500
1446///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////
… …
1452{ 1507{
1453 object_thawer f (filename); 1508 object_thawer f (filename);
1454 1509
1455 for (;;) 1510 for (;;)
1456 { 1511 {
1512 coroapi::cede_to_tick ();
1513
1457 switch (f.kw) 1514 switch (f.kw)
1458 { 1515 {
1459 case KW_region: 1516 case KW_region:
1460 if (!region::read (f)) 1517 if (!region::read (f))
1461 return false; 1518 return false;

Diff Legend

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