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

Diff Legend

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