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.119 by elmex, Mon Sep 1 22:29:17 2008 UTC vs.
Revision 1.176 by root, Wed Nov 14 06:21:39 2012 UTC

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

Diff Legend

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