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.106 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.150 by root, Sun Nov 29 09:41:27 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27
28#include <global.h> 25#include <global.h>
29#include <loader.h> 26#include <loader.h>
30#include <sproto.h> 27#include <sproto.h>
31 28
32///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
33 30
34extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
35 34
36/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
37 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
38 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
39 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
261void 260void
262object::post_load_check () 261object::post_load_check ()
263{ 262{
264 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
265 { 264 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 266 type = 0;
268 } 267 }
269 268
270 switch (type) 269 switch (type)
271 { 270 {
… …
273 case WAND: 272 case WAND:
274 case ROD: 273 case ROD:
275 case HORN: 274 case HORN:
276 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
277 { 276 {
278 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);
279 slot [body_range].info = -1; 278 slot [body_range].info = -1;
280 } 279 }
281 break; 280 break;
282 281
283 case WEAPON: 282 case WEAPON:
284 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
285 { 284 {
286 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);
287 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
288 } 287 }
289 break; 288 break;
290 289
291 case SHIELD: 290 case SHIELD:
292 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
293 { 292 {
294 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);
295 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
296 } 295 }
297 break; 296 break;
298 297
299 case PLAYER: 298 case PLAYER:
300 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
301 { 300 {
302 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);
303 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
304 } 303 }
305 304
306 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
307 { 306 {
308 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);
309 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
310 } 309 }
311 310
312 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
313 { 312 {
314 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);
315 slot [body_range].info = 1; 314 slot [body_range].info = 1;
316 } 315 }
317 break; 316 break;
318 } 317 }
319 318
… …
331 330
332 if (!name_pl) 331 if (!name_pl)
333 name_pl = name; 332 name_pl = name;
334 333
335 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
336 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
337 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 }
338 344
339 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
340 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
341 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
342 * not in the ideal fashion. 348 * not in the ideal fashion.
343 */ 349 */
344 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))
345 { 351 {
346 if (!skill) 352 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 353 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 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) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 355 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
350 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);
351 } 357 }
352 358
353 /* 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
354 * really does for many objects. Need to catch any in maps 360 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 361 * that may have an old value.
… …
361 || type == AMULET || type == GIRDLE 367 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 368 || type == BRACERS || type == CLOAK)
363 { 369 {
364 if (last_heal) 370 if (last_heal)
365 { 371 {
366 LOG (llevDebug, "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 ());
367 gen_sp_armour = last_heal; 373 gen_sp_armour = last_heal;
368 last_heal = 0; 374 last_heal = 0;
369 } 375 }
370 376
371 int ip = calc_item_power (this, 0); 377 int ip = calc_item_power (this, 0);
372 378
373 /* Legacy objects from before item power was in the game */ 379 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 380 if (!item_power && ip)
375 { 381 {
376 if (ip > 3) 382 if (ip > 3)
377 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);
378 384
379 item_power = ip; 385 item_power = ip;
380 } 386 }
381 387
382 /* Check for possibly bogus values. Has to meet both these criteria - 388 /* Check for possibly bogus values. Has to meet both these criteria -
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
390 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);
391#endif 397#endif
392 } 398 }
393 399
394 /* Old spellcasting object - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
402 if ((type == ROD
403 || type == WAND
404 || type == SCROLL
405 || type == HORN
406 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 407 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 408 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
409 && !inv
410 && !loading_arch
411 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
412 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 413 {
414 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 416 * in that spell was stored in sp.
401 */ 417 */
418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0;
405 } 422 }
406 423
407 /* 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 */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 425 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 426 {
427 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 428 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 429 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 432 value = arch->value * inv->value;
415 } 433 }
416 434
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 436 {
419 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
420 { 438 {
421 LOG (llevDebug, "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);
422 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
423 } 441 }
424 442
425 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
426 if (move_type == 0) 444 if (move_type == 0)
427 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
428 } 446 }
429 447
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 453 */
454 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 455 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 456
440 /* Handle player movers. We use move_type for player movers 457 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 458 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 459 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 460 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 461 * are doing, otherwise, set move_type based on maxhp value.
445 */ 462 */
446 if (type == PLAYERMOVER) 463 if (type == PLAYERMOVER)
447 { 464 {
448 if (!move_type) 465 if (!move_type)
… …
454 } 471 }
455 else 472 else
456 move_type = MOVE_WALK; 473 move_type = MOVE_WALK;
457 } 474 }
458 } 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 }
459} 489}
460 490
461static void 491static void
462set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
463{ 493{
464 static const struct flagstr { 494 static const struct flagstr {
465 const char *name; 495 const char *name;
466 MoveType flags; 496 MoveType flags;
467 } move_flags[] = { 497 } move_flags[] = {
… …
473 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
474 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
475 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
476 }; 506 };
477 507
478 if (!str) 508 const char *str = f.get_str ();
479 {
480 mt = 0;
481 return;
482 }
483 509
484 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
485 { 511 {
486 mt = atoi (str); 512 mt = atoi (str);
487 return; 513 return;
488 } 514 }
489 515
490 mt = 0; 516 mt = 0;
491 517
492 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
493 { 519 {
494 bool negate = 0; 520 bool negate = 0;
495 521
496 if (*str == '-') 522 if (*str == '-')
497 { 523 {
… …
510 536
511 goto next; 537 goto next;
512 } 538 }
513 } 539 }
514 540
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 541 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 542
517next: ; 543next: ;
518 } 544 }
519} 545}
546
547//-GPL
520 548
521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 549#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
522 550
523bool 551bool
524object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
525{ 553{
526 object *op_inv = inv; 554 object *op_inv = inv;
555 key_value *last_kv = key_values;
527 556
528 for (;;) 557 for (;;)
529 { 558 {
530 switch (f.kw) 559 switch (f.kw)
531 { 560 {
532 case KW_uuid: 561 case KW_uuid:
533 if (const char *s = f.get_str ()) 562 if (!uuid.parse (f.get_str ()))
534 { 563 {
535 unsigned int version; 564 f.parse_warn ("unparseable uuid");
536 unsigned long long seq; 565 uuid = UUID::gen ();
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 {
540 uuid.seq = seq;
541 break;
542 }
543 } 566 }
544
545 uuid = UUID::gen ();
546 break; 567 break;
547 568
548 case KW_oid: 569 case KW_oid:
549 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
550 break; 571 break;
… …
559 case KW_race: f.get_ornull (race); break; 580 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 581 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break; 582 case KW_tag: f.get_ornull (tag); break;
562 583
563 case KW_arch: 584 case KW_arch:
564 {
565 object *tmp = object::read (f); 585 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 586 {
587 tmp->deactivate ();
588
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
… …
590 610
591 tmp->below = 0; 611 tmp->below = 0;
592 tmp->env = this; 612 tmp->env = this;
593 op_inv = tmp; 613 op_inv = tmp;
594 } 614 }
595 } 615 else
616 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
617
596 continue; 618 continue;
597 619
598 case KW_other_arch: 620 case KW_other_arch:
599 other_arch =
600 loading_arch 621 if (loading_arch == this)
601 ? archetype::get (f.get_str ()) 622 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
623 else
624 {
602 : archetype::find (f.get_str ()); 625 other_arch = archetype::find (f.get_str ());
603 626
604 if (!other_arch) 627 if (!other_arch)
605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 628 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
629 }
606 break; 630 break;
607 631
608 case KW_owner: 632 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
610 break; 634 break;
… …
612 case KW_animation: 636 case KW_animation:
613 { 637 {
614 CLEAR_FLAG (this, FLAG_ANIMATE); 638 CLEAR_FLAG (this, FLAG_ANIMATE);
615 animation_id = 0; 639 animation_id = 0;
616 640
617 const char *str = f.get_str ();
618 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
619 SET_FLAG (this, FLAG_ANIMATE); 642 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
620 } 643 }
621 break; 644 break;
622 645
623 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
624 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
625 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
626 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
627 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
628 652
629 case KW_speed: 653 case KW_speed:
630 f.get (speed); 654 f.get (speed);
631 655
… …
640 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
641 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
642 break; 666 break;
643 667
644 case KW_face: 668 case KW_face:
645 face = face_find (f.get_str ()); 669 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
646 break; 670 break;
647 671
648 case KW_sound: 672 case KW_sound:
673 if (f.has_value ())
674 {
649 sound = sound_find (f.get_str ()); 675 sound = sound_find (f.get_str ());
650 if (!sound) 676 if (!sound)
651 f.parse_warn ("sound not found"); 677 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
678 }
679 else
680 sound = 0;
652 break; 681 break;
653 682
654 case KW_sound_destroy: 683 case KW_sound_destroy:
684 if (f.has_value ())
685 {
655 sound_destroy = sound_find (f.get_str ()); 686 sound_destroy = sound_find (f.get_str ());
656 if (!sound_destroy) 687 if (!sound_destroy)
657 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;
658 break; 692 break;
659 693
660 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
661 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
662 696
… …
703 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
704 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
705 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
706 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
707 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
708 case KW_materialname: f.get (materialname); break; 742
743 case KW_materialname:
744 {
745 shstr sh;
746 f.get (sh);
747 material = name_to_material (sh);
748 }
749 break;
709 750
710 /* These are the new values */ 751 /* These are the new values */
711 case KW_move_block: set_move (move_block, f.get_str ()); break; 752 case KW_move_block: set_move (move_block, f); break;
712 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 753 case KW_move_allow: set_move (move_allow, f); break;
713 case KW_move_type: set_move (move_type, f.get_str ()); break; 754 case KW_move_type: set_move (move_type , f); break;
714 case KW_move_on: set_move (move_on, f.get_str ()); break; 755 case KW_move_on: set_move (move_on , f); break;
715 case KW_move_off: set_move (move_off, f.get_str ()); break; 756 case KW_move_off: set_move (move_off , f); break;
716 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 757 case KW_move_slow: set_move (move_slow , f); break;
717 758
718 /* These are all legacy - any new objects should use the move_ .. values */ 759 /* These are all legacy - any new objects should use the move_ .. values */
719 case KW_no_pass: 760 case KW_no_pass:
720 { 761 {
721 if (f.get_sint32 ()) 762 if (f.get_sint32 ())
… …
813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 854 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
814 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 855 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 856 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 857 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
817 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 858 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
859 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
818 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 860 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
819 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 861 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
820 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 862 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
821 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 863 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
822 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 864 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
829 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 871 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
830 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 872 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
831 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 873 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
832 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 874 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
833 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 875 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
834 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
835 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 876 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
836 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 877 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
837 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 878 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
838 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 879 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
839 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 880 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
883 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 924 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
884 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 925 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
885 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 926 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
886 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 927 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
887 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 928 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
929 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
888 930
889 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
890 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 932 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
891 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 933 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
892 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 934 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
922 case KW_anim_speed: f.get (anim_speed); break; 964 case KW_anim_speed: f.get (anim_speed); break;
923 case KW_container: f.get (weight_limit); break; 965 case KW_container: f.get (weight_limit); break;
924 case KW_will_apply: f.get (will_apply); break; 966 case KW_will_apply: f.get (will_apply); break;
925 case KW_attack_movement: f.get (attack_movement); break; 967 case KW_attack_movement: f.get (attack_movement); break;
926 case KW_move_state: f.get (move_status); break; 968 case KW_move_state: f.get (move_status); break;
927 case KW_expmul: f.get (expmul); break; 969 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
928 case KW_glow_radius: f.get (glow_radius); break; 970 case KW_glow_radius: f.get (glow_radius); break;
929 case KW_weapontype: f.get (weapontype); break; 971 case KW_weapontype: f.get (weapontype); break;
930 case KW_tooltype: f.get (tooltype); break;
931 case KW_casting_time: f.get (casting_time); break; 972 case KW_casting_time: f.get (casting_time); break;
973
974 // elevation is deprecated
932 case KW_elevation: f.get (elevation); break; 975 case KW_elevation: break;
976
933 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 977 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
934 case KW_client_type: f.get (client_type); break; 978 case KW_client_type: f.get (client_type); break;
935 case KW_duration: f.get (duration); break; 979 case KW_duration: f.get (duration); break;
936 case KW_range: f.get (range); break; 980 case KW_range: f.get (range); break;
937 case KW_range_modifier: f.get (range_modifier); break; 981 case KW_range_modifier: f.get (range_modifier); break;
… …
956 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 1000 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
957 case KW_can_apply: 1001 case KW_can_apply:
958 break; 1002 break;
959 1003
960 case KW_connected: 1004 case KW_connected:
961 add_button_link (this, map, f.get_sint32 ()); 1005 {
1006 shstr connected;
1007
1008 f.get (connected);
1009 add_link (map, connected);
1010 }
962 break; 1011 break;
963 1012
964 case KW_randomitems: 1013 case KW_randomitems:
965 if (f.get_str ()) 1014 if (f.has_value ())
966 { 1015 {
967 randomitems = 1016 randomitems =
968 loading_arch 1017 loading_arch
969 ? treasurelist::get (f.get_str ()) 1018 ? treasurelist::get (f.get_str ())
970 : treasurelist::find (f.get_str ()); 1019 : treasurelist::find (f.get_str ());
971 1020
972 if (!randomitems) 1021 if (!randomitems)
1022 {
973 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1023 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1024 randomitems = treasurelist::get (shstr_none); // avoid crashes
1025 }
974 } 1026 }
975 else 1027 else
976 randomitems = 0; 1028 randomitems = 0;
977 break; 1029 break;
978 1030
… …
994 1046
995 f.next (); 1047 f.next ();
996 return true; 1048 return true;
997 1049
998 case KW_ERROR: 1050 case KW_ERROR:
999 set_ob_key_value (this, f.kw_str, f.value, true); 1051 // append as key value pair (do not use kv_set as it prepends)
1052 // we also do not even try to find old values, duplicate keys stay duplicate
1053 {
1054 key_value *kv = new key_value;
1055
1056 kv->next = 0;
1057 kv->key = shstr (f.kw_str);
1058 kv->value = shstr (f.value);
1059
1060 if (!last_kv)
1061 key_values = last_kv = kv;
1062 else
1063 {
1064 while (last_kv->next)
1065 last_kv = last_kv->next;
1066
1067 last_kv->next = kv;
1068 last_kv = kv;
1069 }
1070 }
1000 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1071 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1001 break; 1072 break;
1002 1073
1003 default: 1074 default:
1004 if (!f.parse_error ("object", name)) 1075 if (!f.parse_error ("object", name))
… …
1018 archetype *arch = archetype::find (f.get_str ()); 1089 archetype *arch = archetype::find (f.get_str ());
1019 1090
1020 if (!arch) 1091 if (!arch)
1021 { 1092 {
1022 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1093 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1023 arch = archetype::find ("earthwall"); 1094 arch = archetype::find (shstr_earthwall);
1024 } 1095 }
1025 1096
1026 assert (arch); //D maybe use exception handling of sorts? 1097 assert (arch); //D maybe use exception handling of sorts?
1027 1098
1028 f.next (); 1099 f.next ();
1029 1100
1030 object *op = object::create (); 1101 object *op = arch->instance ();
1031
1032 op->map = map; 1102 op->map = map;
1033 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1103 // instance() activates, this should be fixed properly
1035 op->deactivate (); 1104 op->deactivate ();
1036 1105
1037 if (!op->parse_kv (f)) 1106 if (!op->parse_kv (f))
1038 { 1107 {
1039 op->destroy (true); 1108 op->destroy ();
1040 return 0; 1109 return 0;
1041 } 1110 }
1042 1111
1043 op->post_load_check (); 1112 op->post_load_check ();
1044 return op; 1113 return op;
… …
1056 object_thawer f (buf, (AV *)0); 1125 object_thawer f (buf, (AV *)0);
1057 1126
1058 return op->parse_kv (f); 1127 return op->parse_kv (f);
1059} 1128}
1060 1129
1061/* This returns a string of the integer movement type */
1062#if 0
1063// unused function
1064static char *
1065get_string_move_type (MoveType mt)
1066{
1067 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1068 int i, all_count = 0, count;
1069
1070 strcpy (retbuf, "");
1071 strcpy (retbuf_all, " all");
1072
1073 /* Quick check, and probably fairly common */
1074 if (mt == MOVE_ALL)
1075 return retbuf_all + 1;
1076 if (mt == 0)
1077 {
1078 strcpy (retbuf, "0");
1079 return retbuf;
1080 }
1081
1082 /* We basically slide the bits down. Why look at MOVE_ALL?
1083 * because we may want to return a string like 'all -swim',
1084 * and if we just looked at mt, we couldn't get that.
1085 */
1086 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1087 {
1088 if (mt & (1 << count))
1089 {
1090 strcat (retbuf, " ");
1091 strcat (retbuf, move_name[count]);
1092 }
1093 else
1094 {
1095 strcat (retbuf_all, " -");
1096 strcat (retbuf_all, move_name[count]);
1097 all_count++;
1098 }
1099 }
1100 /* Basically, if there is a single negation, return it, eg
1101 * 'all -swim'. But more than that, just return the
1102 * enumerated values. It doesn't make sense to return
1103 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1104 */
1105 if (all_count <= 1)
1106 return retbuf_all + 1;
1107 else
1108 return retbuf + 1;
1109}
1110#endif
1111
1112// compare *op against *tmp and output differences 1130// compare *op against *arch and output differences
1113static void 1131static void
1114write_diff (object_freezer &f, object *op, object *tmp) 1132write_diff (object_freezer &f, object *op, object *arch)
1115{ 1133{
1116 static const keyword resist_save[NROFATTACKS] = { 1134 static const keyword resist_save[NROFATTACKS] = {
1117# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1135# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1118# include "attackinc.h" 1136# include "attackinc.h"
1119# undef def 1137# undef def
… …
1133 KW_applied, 1151 KW_applied,
1134 KW_unpaid, 1152 KW_unpaid,
1135 KW_can_use_shield, 1153 KW_can_use_shield,
1136 KW_no_pick, 1154 KW_no_pick,
1137 KW_NULL, // walk_on 1155 KW_NULL, // walk_on
1156 /* 10 */
1138 KW_NULL, // no_pass 1157 KW_NULL, // no_pass
1139 /* 10 */
1140 KW_is_animated, 1158 KW_is_animated,
1141 KW_NULL, // slow_move 1159 KW_NULL, // slow_move
1142 KW_NULL, // flying 1160 KW_NULL, // flying
1143 KW_monster, 1161 KW_monster,
1144 KW_friendly, 1162 KW_friendly,
1145 KW_generator, 1163 KW_generator,
1146 KW_is_thrown, 1164 KW_is_thrown,
1147 KW_auto_apply, 1165 KW_auto_apply,
1148 KW_treasure_env, 1166 KW_treasure_env,
1167 /* 20 */
1149 KW_player_sold, 1168 KW_player_sold,
1150 /* 20 */
1151 KW_see_invisible, 1169 KW_see_invisible,
1152 KW_can_roll, 1170 KW_can_roll,
1153 KW_overlay_floor, 1171 KW_overlay_floor,
1154 KW_is_turnable, 1172 KW_is_turnable,
1155 KW_NULL, // walk_off 1173 KW_NULL, // walk_off
1156 KW_NULL, // fly_on 1174 KW_NULL, // fly_on
1157 KW_NULL, // fly_off 1175 KW_NULL, // fly_off
1158 KW_is_used_up, 1176 KW_is_used_up,
1159 KW_identified, 1177 KW_identified,
1178 /* 30 */
1160 KW_reflecting, 1179 KW_reflecting,
1161 /* 30 */
1162 KW_changing, 1180 KW_changing,
1163 KW_splitting, 1181 KW_splitting,
1164 KW_hitback, 1182 KW_hitback,
1165 KW_startequip, 1183 KW_startequip,
1166 KW_blocksview, 1184 KW_blocksview,
1167 KW_undead, 1185 KW_undead,
1168 KW_scared, 1186 KW_scared,
1169 KW_unaggressive, 1187 KW_unaggressive,
1170 KW_reflect_missile, 1188 KW_reflect_missile,
1189 /* 40 */
1171 KW_reflect_spell, 1190 KW_reflect_spell,
1172 /* 40 */
1173 KW_no_magic, 1191 KW_no_magic,
1174 KW_no_fix_player, 1192 KW_NULL,
1175 KW_is_lightable, 1193 KW_is_lightable,
1176 KW_tear_down, 1194 KW_tear_down,
1177 KW_run_away, 1195 KW_run_away,
1178 KW_NULL, // pass_thru 1196 KW_NULL, // pass_thru
1179 KW_NULL, // an_pass_thru 1197 KW_NULL, // an_pass_thru
1180 KW_pick_up, 1198 KW_pick_up,
1181 KW_unique, 1199 KW_unique,
1200 /* 50 */
1182 KW_no_drop, 1201 KW_no_drop,
1183 /* 50 */
1184 KW_NULL, // wizcast 1202 KW_NULL, // wizcast
1185 KW_can_cast_spell, 1203 KW_can_cast_spell,
1186 KW_can_use_scroll, 1204 KW_can_use_scroll,
1187 KW_can_use_range, 1205 KW_can_use_range,
1188 KW_can_use_bow, 1206 KW_can_use_bow,
1189 KW_can_use_armour, 1207 KW_can_use_armour,
1190 KW_can_use_weapon, 1208 KW_can_use_weapon,
1191 KW_can_use_ring, 1209 KW_can_use_ring,
1192 KW_has_ready_range, 1210 KW_has_ready_range,
1211 /* 60 */
1193 KW_has_ready_bow, 1212 KW_has_ready_bow,
1194 /* 60 */
1195 KW_xrays, 1213 KW_xrays,
1196 KW_NULL, 1214 KW_NULL,
1197 KW_is_floor, 1215 KW_is_floor,
1198 KW_lifesave, 1216 KW_lifesave,
1199 KW_no_strength, 1217 KW_no_strength,
1200 KW_sleep, 1218 KW_sleep,
1201 KW_stand_still, 1219 KW_stand_still,
1202 KW_random_move, 1220 KW_random_move,
1203 KW_only_attack, 1221 KW_only_attack,
1222 /* 70 */
1204 KW_confused, 1223 KW_confused,
1205 /* 70 */
1206 KW_stealth, 1224 KW_stealth,
1207 KW_NULL, 1225 KW_NULL,
1208 KW_NULL, 1226 KW_NULL,
1209 KW_cursed, 1227 KW_cursed,
1210 KW_damned, 1228 KW_damned,
1211 KW_see_anywhere, 1229 KW_see_anywhere,
1212 KW_known_magical, 1230 KW_known_magical,
1213 KW_known_cursed, 1231 KW_known_cursed,
1214 KW_can_use_skill, 1232 KW_can_use_skill,
1233 /* 80 */
1215 KW_been_applied, 1234 KW_been_applied,
1216 /* 80 */
1217 KW_has_ready_scroll, 1235 KW_has_ready_scroll,
1218 KW_can_use_rod, 1236 KW_can_use_rod,
1219 KW_precious, 1237 KW_precious,
1220 KW_can_use_horn, 1238 KW_can_use_horn,
1221 KW_make_invisible, 1239 KW_make_invisible,
1222 KW_inv_locked, 1240 KW_inv_locked,
1223 KW_is_wooded, 1241 KW_is_wooded,
1224 KW_is_hilly, 1242 KW_is_hilly,
1225 KW_has_ready_skill, 1243 KW_has_ready_skill,
1244 /* 90 */
1226 KW_has_ready_weapon, 1245 KW_has_ready_weapon,
1227 /* 90 */
1228 KW_no_skill_ident, 1246 KW_no_skill_ident,
1229 KW_is_blind, 1247 KW_is_blind,
1230 KW_can_see_in_dark, 1248 KW_can_see_in_dark,
1231 KW_is_cauldron, 1249 KW_is_cauldron,
1232 KW_NULL, 1250 KW_NULL,
1233 KW_no_steal, 1251 KW_no_steal,
1234 KW_one_hit, 1252 KW_one_hit,
1235 KW_NULL, 1253 KW_NULL,
1236 KW_berserk, 1254 KW_berserk,
1255 /* 100 */
1237 KW_neutral, 1256 KW_neutral,
1238 /* 100 */
1239 KW_no_attack, 1257 KW_no_attack,
1240 KW_no_damage, 1258 KW_no_damage,
1241 KW_obj_original, 1259 KW_obj_original,
1242 KW_NULL, 1260 KW_random_speed,
1243 KW_activate_on_push, 1261 KW_activate_on_push,
1244 KW_activate_on_release, 1262 KW_activate_on_release,
1245 KW_is_water, 1263 KW_is_water,
1246 KW_use_content_on_gen, 1264 KW_use_content_on_gen,
1247 KW_NULL, 1265 KW_NULL,
1266 /* 110 */
1248 KW_is_buildable, 1267 KW_is_buildable,
1249 /* 110 */
1250 KW_destroy_on_death, 1268 KW_destroy_on_death,
1251 KW_NULL, 1269 KW_NULL,
1252 }; 1270 };
1253 1271
1254 int i; 1272 // obj_original is the only commonly differing flag between archetype
1273 // and object, so special-case it here to be able to skip the loop
1274 static const struct flagmask : object::flags_t
1275 {
1276 flagmask ()
1277 {
1278 for (int i = 0; i < NUM_FLAGS; i++)
1279 if (flag_names [i])
1280 set (i);
1281 }
1282 } flagmask;
1255 1283
1256 /* This saves the key/value lists. We do it first so that any 1284 /* This saves the key/value lists. We do it first so that any
1257 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1258 */ 1286 */
1259 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1287 for (key_value *kv = op->key_values; kv; kv = kv->next)
1260 { 1288 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1261 /* Find the field in the opposing member. */ 1289 f.put (kv->key, kv->value);
1262 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1263 1290
1264 /* If there's no partnering field, or it's got a different value, save our field. */ 1291 if (op->uuid)
1265 if (!arch_field || my_field->value != arch_field->value)
1266 f.put (my_field->key, my_field->value);
1267 } 1292 {
1293 // highly optimised - this is often 25% of all data written
1294 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1295 char *ptr = cur;
1268 1296
1269 /* We don't need to worry about the arch's extra fields - they 1297 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1270 * will get taken care of the copy_to method. 1298 ptr += sizeof ("uuid ") - 1;
1271 */ 1299 ptr = op->uuid.append (ptr);
1300 *ptr++ = '\n';
1272 1301
1273 { 1302 f.alloc (ptr - cur);
1274 char uids[64];
1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1276 f.put (KW_uuid, (const char *)uids);
1277 } 1303 }
1278 1304
1279#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1305#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1280#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1306#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1281 1307
1282 if (object *owner = op->owner) 1308 CMP_OUT (x);
1283 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1309 CMP_OUT (y);
1310
1311 CMP_OUT (type);
1312 CMP_OUT (subtype);
1313 CMP_OUT (direction);
1284 1314
1285 CMP_OUT (name); 1315 CMP_OUT (name);
1286 CMP_OUT (name_pl); 1316 CMP_OUT (name_pl);
1287 CMP_OUT (custom_name); 1317 CMP_OUT (speed);
1318
1319 // speed_left is a major time-burner, and has good locality, so
1320 // we use a simple lookup-cache to avoid the very slow printf.
1321 if (op->speed_left != arch->speed_left)
1322 {
1323 static double last_speed_left = 0.;
1324 static char last_speed_left_str [256] = "sl 0\n";
1325 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1326
1327 if (last_speed_left != op->speed_left)
1328 {
1329 last_speed_left = op->speed_left;
1330 last_speed_left_len = sizeof ("sl ") - 1
1331 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1332 }
1333
1334 f.add (last_speed_left_str, last_speed_left_len);
1335 }
1336
1288 CMP_OUT (title); 1337 CMP_OUT (title);
1289 CMP_OUT (race); 1338 CMP_OUT (race);
1290 CMP_OUT (slaying); 1339 CMP_OUT (slaying);
1340 CMP_OUT (skill);
1341
1291 CMP_OUT (tag); 1342 CMP_OUT (tag);
1343 CMP_OUT (custom_name);
1344
1345 if (object *owner = op->owner)
1346 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1347
1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1349
1292 CMP_OUT (other_arch); 1350 CMP_OUT (other_arch);
1293 1351
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1352 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1295 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1353 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1296 1354
1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1355 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1356 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1357 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1358
1301 if (op->animation_id != tmp->animation_id) 1359 if (op->animation_id != arch->animation_id)
1302 if (op->animation_id) 1360 if (op->has_anim ())
1361 f.put (KW(animation), op->anim ().name);
1362 else
1303 { 1363 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1305
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0); 1364 f.put (KW(animation));
1365 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1308 } 1366 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1367
1312 CMP_OUT2 (str, stats.Str); 1368 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1369 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1370 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1371 CMP_OUT2 (wis, stats.Wis);
… …
1324 CMP_OUT2 (grace, stats.grace); 1380 CMP_OUT2 (grace, stats.grace);
1325 CMP_OUT2 (maxgrace, stats.maxgrace); 1381 CMP_OUT2 (maxgrace, stats.maxgrace);
1326 CMP_OUT2 (exp, stats.exp); 1382 CMP_OUT2 (exp, stats.exp);
1327 1383
1328 CMP_OUT (perm_exp); 1384 CMP_OUT (perm_exp);
1329 CMP_OUT (expmul); 1385 //CMP_OUT (expmul);
1330 1386
1331 CMP_OUT2 (food, stats.food); 1387 CMP_OUT2 (food, stats.food);
1332 CMP_OUT2 (dam, stats.dam); 1388 CMP_OUT2 (dam, stats.dam);
1333 CMP_OUT2 (luck, stats.luck); 1389 CMP_OUT2 (luck, stats.luck);
1334 CMP_OUT2 (wc, stats.wc); 1390 CMP_OUT2 (wc, stats.wc);
1335 CMP_OUT2 (ac, stats.ac); 1391 CMP_OUT2 (ac, stats.ac);
1336 1392
1337 CMP_OUT (x);
1338 CMP_OUT (y);
1339 CMP_OUT (speed);
1340 CMP_OUT (speed_left);
1341 CMP_OUT2 (move_state, move_status); 1393 CMP_OUT2 (move_state, move_status);
1342 CMP_OUT (attack_movement); 1394 CMP_OUT (attack_movement);
1343 CMP_OUT (nrof); 1395 CMP_OUT (nrof);
1344 CMP_OUT (level); 1396 CMP_OUT (level);
1345 CMP_OUT (direction);
1346 CMP_OUT (type);
1347 CMP_OUT (subtype);
1348 CMP_OUT (attacktype); 1397 CMP_OUT (attacktype);
1349 1398
1399 // using memcmp here seems to be a loss - is gcc vectorising?
1350 for (i = 0; i < NROFATTACKS; i++) 1400 for (int i = 0; i < NROFATTACKS; i++)
1351 if (expect_false (op->resist[i] != tmp->resist[i])) 1401 if (expect_false (op->resist[i] != arch->resist[i]))
1352 f.put (resist_save[i], op->resist[i]); 1402 f.put (resist_save[i], op->resist[i]);
1353 1403
1354 CMP_OUT (path_attuned); 1404 CMP_OUT (path_attuned);
1355 CMP_OUT (path_repelled); 1405 CMP_OUT (path_repelled);
1356 CMP_OUT (path_denied); 1406 CMP_OUT (path_denied);
1407
1357 CMP_OUT2 (material, materials);//TODO: nuke 1408 CMP_OUT2 (material, materials);//TODO: nuke
1358 CMP_OUT (materialname); 1409 if (op->material != arch->material)
1410 f.put (KW(materialname), op->material->name);
1411
1359 CMP_OUT (value); 1412 CMP_OUT (value);
1360 CMP_OUT (carrying); 1413 CMP_OUT (carrying);
1361 CMP_OUT (weight); 1414 CMP_OUT (weight);
1362 CMP_OUT (invisible); 1415 CMP_OUT (invisible);
1363 CMP_OUT (state); 1416 CMP_OUT (state);
… …
1366 CMP_OUT (last_sp); 1419 CMP_OUT (last_sp);
1367 CMP_OUT (last_grace); 1420 CMP_OUT (last_grace);
1368 CMP_OUT (last_eat); 1421 CMP_OUT (last_eat);
1369 CMP_OUT (glow_radius); 1422 CMP_OUT (glow_radius);
1370 1423
1371 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1424 if (op->flag [FLAG_IS_LINKED])
1425 if (auto (ol, op->find_link ()))
1372 f.put (KW_connected, i); 1426 f.put (KW(connected), ol->id);
1373 1427
1374 CMP_OUT (randomitems); 1428 CMP_OUT (randomitems);
1429
1375 CMP_OUT2 (container, weight_limit); 1430 CMP_OUT2 (container, weight_limit);
1376 1431
1377 CMP_OUT (run_away); 1432 CMP_OUT (run_away);
1378 CMP_OUT (pick_up); 1433 CMP_OUT (pick_up);
1379 CMP_OUT (will_apply); 1434 CMP_OUT (will_apply);
1380 CMP_OUT (smoothlevel); 1435 CMP_OUT (smoothlevel);
1381 CMP_OUT (weapontype); 1436 CMP_OUT (weapontype);
1382 CMP_OUT (tooltype);
1383 CMP_OUT (elevation);
1384 CMP_OUT (client_type); 1437 CMP_OUT (client_type);
1385 CMP_OUT (item_power); 1438 CMP_OUT (item_power);
1386 CMP_OUT (duration); 1439 CMP_OUT (duration);
1387 CMP_OUT (range); 1440 CMP_OUT (range);
1388 CMP_OUT (range_modifier); 1441 CMP_OUT (range_modifier);
… …
1396 CMP_OUT (move_on); 1449 CMP_OUT (move_on);
1397 CMP_OUT (move_off); 1450 CMP_OUT (move_off);
1398 CMP_OUT (move_slow); 1451 CMP_OUT (move_slow);
1399 CMP_OUT (move_slow_penalty); 1452 CMP_OUT (move_slow_penalty);
1400 1453
1401 if (op->flag != tmp->flag) 1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455
1456 if (diff [FLAG_OBJ_ORIGINAL])
1457 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1458
1459 diff.reset (FLAG_OBJ_ORIGINAL);
1460
1461 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ()))
1402 for (i = 0; i <= NUM_FLAGS; i++) 1463 for (int i = 0; i < NUM_FLAGS; i++)
1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1464 if (expect_false (diff [i]))
1404 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1465 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1405 1466
1406 // save body locations 1467 // save body locations. gcc's memcmp does an abysmal job when used
1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1408 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1409 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].save_name, op->slot[i].info);
1410} 1471}
1411 1472
1412/* 1473/*
1413 * Dumps all variables in an object to a file. 1474 * Dumps all variables in an object to a file.
… …
1415 * 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.
1416 */ 1477 */
1417bool 1478bool
1418object::write (object_freezer &f) 1479object::write (object_freezer &f)
1419{ 1480{
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1481 if (expect_false (is_arch ()))
1421 1482 {
1483 f.put (KW(object), arch->archname);
1484 write_diff (f, this, archetype::empty);
1485 }
1486 else
1487 {
1422 f.put (KW_arch, at->archname); 1488 f.put (KW(arch), arch->archname);
1423 write_diff (f, this, at); 1489 write_diff (f, this, arch);
1490 }
1424 1491
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1492 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1493 tmp->write (f);
1427 1494
1428 f.put (this); 1495 f.put (this);
1429 f.put (KW_end); 1496 f.put (KW(end));
1430 1497
1431 return true; 1498 return true;
1432} 1499}
1433 1500
1434///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////
1435 1502
1436// generic resource file load, 1503// generic resource file load,
1437// currently supports: region, treasures, archetypes 1504// currently supports: region, treasures, archetypes
1505bool
1438bool load_resource_file (const char *filename) 1506load_resource_file_ (const char *filename)
1439{ 1507{
1440 object_thawer f (filename); 1508 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444 1509
1445 for (;;) 1510 for (;;)
1446 { 1511 {
1447 switch (f.kw) 1512 switch (f.kw)
1448 { 1513 {
1449 case KW_region: 1514 case KW_region:
1450 if (!region::read (f)) 1515 if (!region::read (f))
1451 goto finish; 1516 return false;
1452 break; 1517 break;
1453 1518
1454 case KW_treasure: 1519 case KW_treasure:
1455 case KW_treasureone: 1520 case KW_treasureone:
1456 if (!treasurelist::read (f)) 1521 if (!treasurelist::read (f))
1457 goto finish; 1522 return false;
1458 break; 1523 break;
1459 1524
1460 case KW_object: 1525 case KW_object:
1461 seen_arch = true;
1462 if (!archetype::read (f)) 1526 if (!archetype::read (f))
1463 goto finish; 1527 return false;
1464 break; 1528 break;
1465 1529
1466 case KW_EOF: 1530 case KW_EOF:
1467 success = true; 1531 return true;
1468 goto finish;
1469 1532
1470 default: 1533 default:
1471 if (!f.parse_error ("resource file")) 1534 if (!f.parse_error ("resource file"))
1472 goto finish; 1535 return false;
1473 1536
1474 f.next (); 1537 f.next ();
1475 break; 1538 break;
1476 } 1539 }
1477 } 1540 }
1478
1479finish:
1480 if (seen_arch)
1481 init_archetype_pointers ();
1482
1483 return success;
1484} 1541}
1485 1542

Diff Legend

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