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

Diff Legend

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