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.101 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.172 by root, Tue Jan 3 11:25:31 2012 UTC

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

Diff Legend

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