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.100 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.144 by root, Tue Nov 10 04:38:45 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)
… …
453 stats.maxhp = 0; 463 stats.maxhp = 0;
454 } 464 }
455 else 465 else
456 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
457 } 467 }
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);
458 } 481 }
459} 482}
460 483
461static void 484static void
462set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
510 533
511 goto next; 534 goto next;
512 } 535 }
513 } 536 }
514 537
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 539
517next: ; 540next: ;
518 } 541 }
519} 542}
543
544//-GPL
520 545
521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
522 547
523bool 548bool
524object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
525{ 550{
526 object *op_inv = inv; 551 object *op_inv = inv;
552 key_value *last_kv = key_values;
527 553
528 for (;;) 554 for (;;)
529 { 555 {
530 switch (f.kw) 556 switch (f.kw)
531 { 557 {
532 case KW_uuid: 558 case KW_uuid:
533 if (const char *s = f.get_str ()) 559 if (const char *s = f.get_str ())
534 { 560 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 561 {
540 uuid.seq = seq; 562 f.parse_warn ("unparseable uuid");
541 break; 563 uuid = UUID::gen ();
542 } 564 }
543 }
544
545 uuid = gen_uuid ();
546 break; 565 break;
547 566
548 case KW_oid: 567 case KW_oid:
549 f.get (this, f.get_sint32 ()); 568 f.get (this, f.get_sint32 ());
550 break; 569 break;
… …
556 575
557 case KW_attach: f.get_ornull (attach); break; 576 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 577 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 579 case KW_slaying: f.get_ornull (slaying); break;
580 case KW_tag: f.get_ornull (tag); break;
561 581
562 case KW_arch: 582 case KW_arch:
563 {
564 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
565 tmp->deactivate ();
566
567 { 584 {
585 tmp->deactivate ();
586
568 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
571 // save ordering the same between repeated load/saves. 590 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 593 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 594
575 if (!op_inv) 595 if (!op_inv)
576 { 596 {
… …
588 608
589 tmp->below = 0; 609 tmp->below = 0;
590 tmp->env = this; 610 tmp->env = this;
591 op_inv = tmp; 611 op_inv = tmp;
592 } 612 }
593 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
594 continue; 616 continue;
595 617
596 case KW_other_arch: 618 case KW_other_arch:
597 other_arch =
598 loading_arch 619 if (loading_arch == this)
599 ? archetype::get (f.get_str ()) 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
621 else
622 {
600 : archetype::find (f.get_str ()); 623 other_arch = archetype::find (f.get_str ());
601 624
602 if (!other_arch) 625 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 626 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
627 }
604 break; 628 break;
605 629
606 case KW_owner: 630 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ()); 631 f.delayed_deref (this, owner, f.get_str ());
608 break; 632 break;
… …
612 CLEAR_FLAG (this, FLAG_ANIMATE); 636 CLEAR_FLAG (this, FLAG_ANIMATE);
613 animation_id = 0; 637 animation_id = 0;
614 638
615 const char *str = f.get_str (); 639 const char *str = f.get_str ();
616 if (str && (animation_id = find_animation (str))) 640 if (str && (animation_id = find_animation (str)))
617 SET_FLAG (this, FLAG_ANIMATE); 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
618 } 642 }
619 break; 643 break;
620 644
621 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
622 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
… …
701 case KW_invisible: f.get (invisible); break; 725 case KW_invisible: f.get (invisible); break;
702 case KW_magic: f.get (magic); break; 726 case KW_magic: f.get (magic); break;
703 case KW_state: f.get (state); break; 727 case KW_state: f.get (state); break;
704 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 728 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
705 case KW_material: f.get (materials); break; //TODO: nuke 729 case KW_material: f.get (materials); break; //TODO: nuke
706 case KW_materialname: f.get (materialname); break; 730
731 case KW_materialname:
732 {
733 shstr sh;
734 f.get (sh);
735 material = name_to_material (sh);
736 }
737 break;
707 738
708 /* These are the new values */ 739 /* These are the new values */
709 case KW_move_block: set_move (move_block, f.get_str ()); break; 740 case KW_move_block: set_move (move_block, f.get_str ()); break;
710 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 741 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
711 case KW_move_type: set_move (move_type, f.get_str ()); break; 742 case KW_move_type: set_move (move_type, f.get_str ()); break;
… …
811 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 842 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; 843 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
813 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 844 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
814 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 845 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
815 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 846 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
847 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
816 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 848 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
817 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 849 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
818 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 850 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
819 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 851 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
820 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 852 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
920 case KW_anim_speed: f.get (anim_speed); break; 952 case KW_anim_speed: f.get (anim_speed); break;
921 case KW_container: f.get (weight_limit); break; 953 case KW_container: f.get (weight_limit); break;
922 case KW_will_apply: f.get (will_apply); break; 954 case KW_will_apply: f.get (will_apply); break;
923 case KW_attack_movement: f.get (attack_movement); break; 955 case KW_attack_movement: f.get (attack_movement); break;
924 case KW_move_state: f.get (move_status); break; 956 case KW_move_state: f.get (move_status); break;
925 case KW_expmul: f.get (expmul); break; 957 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
926 case KW_glow_radius: f.get (glow_radius); break; 958 case KW_glow_radius: f.get (glow_radius); break;
927 case KW_weapontype: f.get (weapontype); break; 959 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; 960 case KW_casting_time: f.get (casting_time); break;
961
962 // elevation is deprecated
930 case KW_elevation: f.get (elevation); break; 963 case KW_elevation: break;
964
931 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 965 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
932 case KW_client_type: f.get (client_type); break; 966 case KW_client_type: f.get (client_type); break;
933 case KW_duration: f.get (duration); break; 967 case KW_duration: f.get (duration); break;
934 case KW_range: f.get (range); break; 968 case KW_range: f.get (range); break;
935 case KW_range_modifier: f.get (range_modifier); break; 969 case KW_range_modifier: f.get (range_modifier); break;
… …
954 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 988 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
955 case KW_can_apply: 989 case KW_can_apply:
956 break; 990 break;
957 991
958 case KW_connected: 992 case KW_connected:
959 add_button_link (this, map, f.get_sint32 ()); 993 {
994 shstr connected;
995
996 f.get (connected);
997 add_link (map, connected);
998 }
960 break; 999 break;
961 1000
962 case KW_randomitems: 1001 case KW_randomitems:
963 if (f.get_str ()) 1002 if (f.get_str ())
964 { 1003 {
… …
966 loading_arch 1005 loading_arch
967 ? treasurelist::get (f.get_str ()) 1006 ? treasurelist::get (f.get_str ())
968 : treasurelist::find (f.get_str ()); 1007 : treasurelist::find (f.get_str ());
969 1008
970 if (!randomitems) 1009 if (!randomitems)
1010 {
971 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1011 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1012 randomitems = treasurelist::get (shstr_none); // avoid crashes
1013 }
972 } 1014 }
973 else 1015 else
974 randomitems = 0; 1016 randomitems = 0;
975 break; 1017 break;
976 1018
… …
992 1034
993 f.next (); 1035 f.next ();
994 return true; 1036 return true;
995 1037
996 case KW_ERROR: 1038 case KW_ERROR:
997 set_ob_key_value (this, f.kw_str, f.value, true); 1039 // append as key value pair (do not use kv_set as it prepends)
1040 // we also do not even try to find old values, duplicate keys stay duplicate
1041 {
1042 key_value *kv = new key_value;
1043
1044 kv->next = 0;
1045 kv->key = shstr (f.kw_str);
1046 kv->value = shstr (f.value);
1047
1048 if (!last_kv)
1049 key_values = last_kv = kv;
1050 else
1051 {
1052 while (last_kv->next)
1053 last_kv = last_kv->next;
1054
1055 last_kv->next = kv;
1056 last_kv = kv;
1057 }
1058 }
998 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1059 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
999 break; 1060 break;
1000 1061
1001 default: 1062 default:
1002 if (!f.parse_error ("object", name)) 1063 if (!f.parse_error ("object", name))
… …
1016 archetype *arch = archetype::find (f.get_str ()); 1077 archetype *arch = archetype::find (f.get_str ());
1017 1078
1018 if (!arch) 1079 if (!arch)
1019 { 1080 {
1020 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1081 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1021 arch = archetype::find ("earthwall"); 1082 arch = archetype::find (shstr_earthwall);
1022 } 1083 }
1023 1084
1024 assert (arch); //D maybe use exception handling of sorts? 1085 assert (arch); //D maybe use exception handling of sorts?
1025 1086
1026 f.next (); 1087 f.next ();
1027 1088
1028 object *op = object::create (); 1089 object *op = arch->instance ();
1029
1030 op->map = map; 1090 op->map = map;
1031 arch->copy_to (op);
1032 // copy_to activates, this should be fixed properly 1091 // instance() activates, this should be fixed properly
1033 op->deactivate (); 1092 op->deactivate ();
1034 1093
1035 if (!op->parse_kv (f)) 1094 if (!op->parse_kv (f))
1036 { 1095 {
1037 op->destroy (true); 1096 op->destroy ();
1038 return 0; 1097 return 0;
1039 } 1098 }
1040 1099
1041 op->post_load_check (); 1100 op->post_load_check ();
1042 return op; 1101 return op;
… …
1054 object_thawer f (buf, (AV *)0); 1113 object_thawer f (buf, (AV *)0);
1055 1114
1056 return op->parse_kv (f); 1115 return op->parse_kv (f);
1057} 1116}
1058 1117
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 1118// compare *op against *arch and output differences
1111static void 1119static void
1112write_diff (object_freezer &f, object *op, object *tmp) 1120write_diff (object_freezer &f, object *op, object *arch)
1113{ 1121{
1114 static const keyword resist_save[NROFATTACKS] = { 1122 static const keyword resist_save[NROFATTACKS] = {
1115# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1123# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1116# include "attackinc.h" 1124# include "attackinc.h"
1117# undef def 1125# undef def
… …
1131 KW_applied, 1139 KW_applied,
1132 KW_unpaid, 1140 KW_unpaid,
1133 KW_can_use_shield, 1141 KW_can_use_shield,
1134 KW_no_pick, 1142 KW_no_pick,
1135 KW_NULL, // walk_on 1143 KW_NULL, // walk_on
1144 /* 10 */
1136 KW_NULL, // no_pass 1145 KW_NULL, // no_pass
1137 /* 10 */
1138 KW_is_animated, 1146 KW_is_animated,
1139 KW_NULL, // slow_move 1147 KW_NULL, // slow_move
1140 KW_NULL, // flying 1148 KW_NULL, // flying
1141 KW_monster, 1149 KW_monster,
1142 KW_friendly, 1150 KW_friendly,
1143 KW_generator, 1151 KW_generator,
1144 KW_is_thrown, 1152 KW_is_thrown,
1145 KW_auto_apply, 1153 KW_auto_apply,
1146 KW_treasure_env, 1154 KW_treasure_env,
1155 /* 20 */
1147 KW_player_sold, 1156 KW_player_sold,
1148 /* 20 */
1149 KW_see_invisible, 1157 KW_see_invisible,
1150 KW_can_roll, 1158 KW_can_roll,
1151 KW_overlay_floor, 1159 KW_overlay_floor,
1152 KW_is_turnable, 1160 KW_is_turnable,
1153 KW_NULL, // walk_off 1161 KW_NULL, // walk_off
1154 KW_NULL, // fly_on 1162 KW_NULL, // fly_on
1155 KW_NULL, // fly_off 1163 KW_NULL, // fly_off
1156 KW_is_used_up, 1164 KW_is_used_up,
1157 KW_identified, 1165 KW_identified,
1166 /* 30 */
1158 KW_reflecting, 1167 KW_reflecting,
1159 /* 30 */
1160 KW_changing, 1168 KW_changing,
1161 KW_splitting, 1169 KW_splitting,
1162 KW_hitback, 1170 KW_hitback,
1163 KW_startequip, 1171 KW_startequip,
1164 KW_blocksview, 1172 KW_blocksview,
1165 KW_undead, 1173 KW_undead,
1166 KW_scared, 1174 KW_scared,
1167 KW_unaggressive, 1175 KW_unaggressive,
1168 KW_reflect_missile, 1176 KW_reflect_missile,
1177 /* 40 */
1169 KW_reflect_spell, 1178 KW_reflect_spell,
1170 /* 40 */
1171 KW_no_magic, 1179 KW_no_magic,
1172 KW_no_fix_player, 1180 KW_no_fix_player,
1173 KW_is_lightable, 1181 KW_is_lightable,
1174 KW_tear_down, 1182 KW_tear_down,
1175 KW_run_away, 1183 KW_run_away,
1176 KW_NULL, // pass_thru 1184 KW_NULL, // pass_thru
1177 KW_NULL, // an_pass_thru 1185 KW_NULL, // an_pass_thru
1178 KW_pick_up, 1186 KW_pick_up,
1179 KW_unique, 1187 KW_unique,
1188 /* 50 */
1180 KW_no_drop, 1189 KW_no_drop,
1181 /* 50 */
1182 KW_NULL, // wizcast 1190 KW_NULL, // wizcast
1183 KW_can_cast_spell, 1191 KW_can_cast_spell,
1184 KW_can_use_scroll, 1192 KW_can_use_scroll,
1185 KW_can_use_range, 1193 KW_can_use_range,
1186 KW_can_use_bow, 1194 KW_can_use_bow,
1187 KW_can_use_armour, 1195 KW_can_use_armour,
1188 KW_can_use_weapon, 1196 KW_can_use_weapon,
1189 KW_can_use_ring, 1197 KW_can_use_ring,
1190 KW_has_ready_range, 1198 KW_has_ready_range,
1199 /* 60 */
1191 KW_has_ready_bow, 1200 KW_has_ready_bow,
1192 /* 60 */
1193 KW_xrays, 1201 KW_xrays,
1194 KW_NULL, 1202 KW_NULL,
1195 KW_is_floor, 1203 KW_is_floor,
1196 KW_lifesave, 1204 KW_lifesave,
1197 KW_no_strength, 1205 KW_no_strength,
1198 KW_sleep, 1206 KW_sleep,
1199 KW_stand_still, 1207 KW_stand_still,
1200 KW_random_move, 1208 KW_random_move,
1201 KW_only_attack, 1209 KW_only_attack,
1210 /* 70 */
1202 KW_confused, 1211 KW_confused,
1203 /* 70 */
1204 KW_stealth, 1212 KW_stealth,
1205 KW_NULL, 1213 KW_NULL,
1206 KW_NULL, 1214 KW_NULL,
1207 KW_cursed, 1215 KW_cursed,
1208 KW_damned, 1216 KW_damned,
1209 KW_see_anywhere, 1217 KW_see_anywhere,
1210 KW_known_magical, 1218 KW_known_magical,
1211 KW_known_cursed, 1219 KW_known_cursed,
1212 KW_can_use_skill, 1220 KW_can_use_skill,
1221 /* 80 */
1213 KW_been_applied, 1222 KW_been_applied,
1214 /* 80 */
1215 KW_has_ready_scroll, 1223 KW_has_ready_scroll,
1216 KW_can_use_rod, 1224 KW_can_use_rod,
1217 KW_precious, 1225 KW_precious,
1218 KW_can_use_horn, 1226 KW_can_use_horn,
1219 KW_make_invisible, 1227 KW_make_invisible,
1220 KW_inv_locked, 1228 KW_inv_locked,
1221 KW_is_wooded, 1229 KW_is_wooded,
1222 KW_is_hilly, 1230 KW_is_hilly,
1223 KW_has_ready_skill, 1231 KW_has_ready_skill,
1232 /* 90 */
1224 KW_has_ready_weapon, 1233 KW_has_ready_weapon,
1225 /* 90 */
1226 KW_no_skill_ident, 1234 KW_no_skill_ident,
1227 KW_is_blind, 1235 KW_is_blind,
1228 KW_can_see_in_dark, 1236 KW_can_see_in_dark,
1229 KW_is_cauldron, 1237 KW_is_cauldron,
1230 KW_NULL, 1238 KW_NULL,
1231 KW_no_steal, 1239 KW_no_steal,
1232 KW_one_hit, 1240 KW_one_hit,
1233 KW_NULL, 1241 KW_NULL,
1234 KW_berserk, 1242 KW_berserk,
1243 /* 100 */
1235 KW_neutral, 1244 KW_neutral,
1236 /* 100 */
1237 KW_no_attack, 1245 KW_no_attack,
1238 KW_no_damage, 1246 KW_no_damage,
1239 KW_obj_original, 1247 KW_obj_original,
1240 KW_NULL, 1248 KW_NULL,
1241 KW_activate_on_push, 1249 KW_activate_on_push,
1242 KW_activate_on_release, 1250 KW_activate_on_release,
1243 KW_is_water, 1251 KW_is_water,
1244 KW_use_content_on_gen, 1252 KW_use_content_on_gen,
1245 KW_NULL, 1253 KW_NULL,
1254 /* 110 */
1246 KW_is_buildable, 1255 KW_is_buildable,
1247 /* 110 */
1248 KW_destroy_on_death, 1256 KW_destroy_on_death,
1249 KW_NULL, 1257 KW_NULL,
1250 }; 1258 };
1251 1259
1252 int i; 1260 // obj_original is the only commonly differing flag between archetype
1261 // and object, so special-case it here to be able to skip the loop
1262 static const struct flagmask : object::flags_t
1263 {
1264 flagmask ()
1265 {
1266 for (int i = 0; i < NUM_FLAGS; i++)
1267 if (flag_names [i])
1268 set (i);
1269 }
1270 } flagmask;
1253 1271
1254 /* This saves the key/value lists. We do it first so that any 1272 /* 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. 1273 * keys that match field names will be overwritten by the loader.
1256 */ 1274 */
1257 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1275 for (key_value *kv = op->key_values; kv; kv = kv->next)
1258 { 1276 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1259 /* Find the field in the opposing member. */ 1277 f.put (kv->key, kv->value);
1260 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1261 1278
1262 /* If there's no partnering field, or it's got a different value, save our field. */ 1279 if (op->uuid)
1263 if (!arch_field || my_field->value != arch_field->value)
1264 f.put (my_field->key, my_field->value);
1265 } 1280 {
1281 // highly optimised - this is often 25% of all data written
1282 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1283 char *ptr = cur;
1266 1284
1267 /* We don't need to worry about the arch's extra fields - they 1285 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1268 * will get taken care of the copy_to method. 1286 ptr += sizeof ("uuid ") - 1;
1269 */ 1287 ptr = op->uuid.append (ptr);
1288 *ptr++ = '\n';
1270 1289
1271 { 1290 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 } 1291 }
1276 1292
1277#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1293#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) 1294#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1279 1295
1280 if (object *owner = op->owner) 1296 CMP_OUT (x);
1281 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1297 CMP_OUT (y);
1298
1299 CMP_OUT (type);
1300 CMP_OUT (subtype);
1301 CMP_OUT (direction);
1282 1302
1283 CMP_OUT (name); 1303 CMP_OUT (name);
1284 CMP_OUT (name_pl); 1304 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1305
1306 CMP_OUT (speed);
1307 CMP_OUT (speed_left);
1308
1286 CMP_OUT (title); 1309 CMP_OUT (title);
1287 CMP_OUT (race); 1310 CMP_OUT (race);
1288 CMP_OUT (slaying); 1311 CMP_OUT (slaying);
1312 CMP_OUT (skill);
1313
1314 CMP_OUT (tag);
1315 CMP_OUT (custom_name);
1316
1317 if (object *owner = op->owner)
1318 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1319
1320 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1321
1289 CMP_OUT (other_arch); 1322 CMP_OUT (other_arch);
1290 1323
1291 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1324 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); 1325 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1293 1326
1294 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1327 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); 1328 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); 1329 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1297 1330
1298 if (op->animation_id != tmp->animation_id) 1331 if (op->animation_id != arch->animation_id)
1299 if (op->animation_id) 1332 if (op->has_anim ())
1333 f.put (KW_animation, op->anim ().name);
1334 else
1300 { 1335 {
1301 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1336 f.put (KW_animation, (const char *)0);
1302 1337 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1303 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1304 f.put (KW_is_animated, (sint32)0);
1305 } 1338 }
1306 else
1307 f.put (KW_animation, (const char *)0);
1308 1339
1309 CMP_OUT2 (str, stats.Str); 1340 CMP_OUT2 (str, stats.Str);
1310 CMP_OUT2 (dex, stats.Dex); 1341 CMP_OUT2 (dex, stats.Dex);
1311 CMP_OUT2 (con, stats.Con); 1342 CMP_OUT2 (con, stats.Con);
1312 CMP_OUT2 (wis, stats.Wis); 1343 CMP_OUT2 (wis, stats.Wis);
… …
1321 CMP_OUT2 (grace, stats.grace); 1352 CMP_OUT2 (grace, stats.grace);
1322 CMP_OUT2 (maxgrace, stats.maxgrace); 1353 CMP_OUT2 (maxgrace, stats.maxgrace);
1323 CMP_OUT2 (exp, stats.exp); 1354 CMP_OUT2 (exp, stats.exp);
1324 1355
1325 CMP_OUT (perm_exp); 1356 CMP_OUT (perm_exp);
1326 CMP_OUT (expmul); 1357 //CMP_OUT (expmul);
1327 1358
1328 CMP_OUT2 (food, stats.food); 1359 CMP_OUT2 (food, stats.food);
1329 CMP_OUT2 (dam, stats.dam); 1360 CMP_OUT2 (dam, stats.dam);
1330 CMP_OUT2 (luck, stats.luck); 1361 CMP_OUT2 (luck, stats.luck);
1331 CMP_OUT2 (wc, stats.wc); 1362 CMP_OUT2 (wc, stats.wc);
1332 CMP_OUT2 (ac, stats.ac); 1363 CMP_OUT2 (ac, stats.ac);
1333 1364
1334 CMP_OUT (x);
1335 CMP_OUT (y);
1336 CMP_OUT (speed);
1337 CMP_OUT (speed_left);
1338 CMP_OUT2 (move_state, move_status); 1365 CMP_OUT2 (move_state, move_status);
1339 CMP_OUT (attack_movement); 1366 CMP_OUT (attack_movement);
1340 CMP_OUT (nrof); 1367 CMP_OUT (nrof);
1341 CMP_OUT (level); 1368 CMP_OUT (level);
1342 CMP_OUT (direction);
1343 CMP_OUT (type);
1344 CMP_OUT (subtype);
1345 CMP_OUT (attacktype); 1369 CMP_OUT (attacktype);
1346 1370
1371 // using memcmp here seems to be a loss - is gcc vectorising?
1347 for (i = 0; i < NROFATTACKS; i++) 1372 for (int i = 0; i < NROFATTACKS; i++)
1348 if (expect_false (op->resist[i] != tmp->resist[i])) 1373 if (expect_false (op->resist[i] != arch->resist[i]))
1349 f.put (resist_save[i], op->resist[i]); 1374 f.put (resist_save[i], op->resist[i]);
1350 1375
1351 CMP_OUT (path_attuned); 1376 CMP_OUT (path_attuned);
1352 CMP_OUT (path_repelled); 1377 CMP_OUT (path_repelled);
1353 CMP_OUT (path_denied); 1378 CMP_OUT (path_denied);
1379
1354 CMP_OUT2 (material, materials);//TODO: nuke 1380 CMP_OUT2 (material, materials);//TODO: nuke
1355 CMP_OUT (materialname); 1381 if (op->material != arch->material)
1382 f.put (KW_materialname, op->material->name);
1383
1356 CMP_OUT (value); 1384 CMP_OUT (value);
1357 CMP_OUT (carrying); 1385 CMP_OUT (carrying);
1358 CMP_OUT (weight); 1386 CMP_OUT (weight);
1359 CMP_OUT (invisible); 1387 CMP_OUT (invisible);
1360 CMP_OUT (state); 1388 CMP_OUT (state);
… …
1363 CMP_OUT (last_sp); 1391 CMP_OUT (last_sp);
1364 CMP_OUT (last_grace); 1392 CMP_OUT (last_grace);
1365 CMP_OUT (last_eat); 1393 CMP_OUT (last_eat);
1366 CMP_OUT (glow_radius); 1394 CMP_OUT (glow_radius);
1367 1395
1368 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1396 if (op->flag [FLAG_IS_LINKED])
1397 if (auto (ol, op->find_link ()))
1369 f.put (KW_connected, i); 1398 f.put (KW_connected, ol->id);
1370 1399
1371 CMP_OUT (randomitems); 1400 CMP_OUT (randomitems);
1372 CMP_OUT2 (container, weight_limit); 1401 CMP_OUT2 (container, weight_limit);
1373 1402
1374 CMP_OUT (run_away); 1403 CMP_OUT (run_away);
1375 CMP_OUT (pick_up); 1404 CMP_OUT (pick_up);
1376 CMP_OUT (will_apply); 1405 CMP_OUT (will_apply);
1377 CMP_OUT (smoothlevel); 1406 CMP_OUT (smoothlevel);
1378 CMP_OUT (weapontype); 1407 CMP_OUT (weapontype);
1379 CMP_OUT (tooltype);
1380 CMP_OUT (elevation);
1381 CMP_OUT (client_type); 1408 CMP_OUT (client_type);
1382 CMP_OUT (item_power); 1409 CMP_OUT (item_power);
1383 CMP_OUT (duration); 1410 CMP_OUT (duration);
1384 CMP_OUT (range); 1411 CMP_OUT (range);
1385 CMP_OUT (range_modifier); 1412 CMP_OUT (range_modifier);
… …
1393 CMP_OUT (move_on); 1420 CMP_OUT (move_on);
1394 CMP_OUT (move_off); 1421 CMP_OUT (move_off);
1395 CMP_OUT (move_slow); 1422 CMP_OUT (move_slow);
1396 CMP_OUT (move_slow_penalty); 1423 CMP_OUT (move_slow_penalty);
1397 1424
1398 if (op->flag != tmp->flag) 1425 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1426
1427 if (diff [FLAG_OBJ_ORIGINAL])
1428 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1429
1430 diff.reset (FLAG_OBJ_ORIGINAL);
1431
1432 // quickly test whether any other flags differ
1433 if (expect_true (diff.any ()))
1399 for (i = 0; i <= NUM_FLAGS; i++) 1434 for (int i = 0; i < NUM_FLAGS; i++)
1400 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1435 if (expect_false (diff [i]))
1401 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1436 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1402 1437
1403 // save body locations 1438 // save body locations. gcc's memcmp does an abysmal job when used
1404 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1439 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1405 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1440 if (expect_false (op->slot[i].info != arch->slot[i].info))
1406 f.put (body_locations[i].save_name, op->slot[i].info); 1441 f.put (body_locations[i].save_name, op->slot[i].info);
1407} 1442}
1408 1443
1409/* 1444/*
1410 * Dumps all variables in an object to a file. 1445 * Dumps all variables in an object to a file.
… …
1412 * the only place this is not set is when saving the player. 1447 * the only place this is not set is when saving the player.
1413 */ 1448 */
1414bool 1449bool
1415object::write (object_freezer &f) 1450object::write (object_freezer &f)
1416{ 1451{
1417 archetype *at = arch ? (archetype *)arch : empty_archetype; 1452 if (is_arch ())
1418 1453 {
1454 f.put (KW_object, arch->archname);
1455 write_diff (f, this, archetype::empty);
1456 }
1457 else
1458 {
1419 f.put (KW_arch, at->archname); 1459 f.put (KW_arch, arch->archname);
1420 write_diff (f, this, at); 1460 write_diff (f, this, arch);
1461 }
1421 1462
1422 for (object *tmp = inv; tmp; tmp = tmp->below) 1463 for (object *tmp = inv; tmp; tmp = tmp->below)
1423 tmp->write (f); 1464 tmp->write (f);
1424 1465
1425 f.put (this); 1466 f.put (this);
… …
1430 1471
1431///////////////////////////////////////////////////////////////////////////// 1472/////////////////////////////////////////////////////////////////////////////
1432 1473
1433// generic resource file load, 1474// generic resource file load,
1434// currently supports: region, treasures, archetypes 1475// currently supports: region, treasures, archetypes
1476bool
1435bool load_resource_file (const char *filename) 1477load_resource_file_ (const char *filename)
1436{ 1478{
1437 object_thawer f (filename); 1479 object_thawer f (filename);
1438
1439 bool success = false;
1440 bool seen_arch = false;
1441 1480
1442 for (;;) 1481 for (;;)
1443 { 1482 {
1444 switch (f.kw) 1483 switch (f.kw)
1445 { 1484 {
1446 case KW_region: 1485 case KW_region:
1447 if (!region::read (f)) 1486 if (!region::read (f))
1448 goto finish; 1487 return false;
1449 break; 1488 break;
1450 1489
1451 case KW_treasure: 1490 case KW_treasure:
1452 case KW_treasureone: 1491 case KW_treasureone:
1453 if (!treasurelist::read (f)) 1492 if (!treasurelist::read (f))
1454 goto finish; 1493 return false;
1455 break; 1494 break;
1456 1495
1457 case KW_object: 1496 case KW_object:
1458 seen_arch = true;
1459 if (!archetype::read (f)) 1497 if (!archetype::read (f))
1460 goto finish; 1498 return false;
1461 break; 1499 break;
1462 1500
1463 case KW_EOF: 1501 case KW_EOF:
1464 success = true; 1502 return true;
1465 goto finish;
1466 1503
1467 default: 1504 default:
1468 if (!f.parse_error ("resource file")) 1505 if (!f.parse_error ("resource file"))
1469 goto finish; 1506 return false;
1470 1507
1471 f.next (); 1508 f.next ();
1472 break; 1509 break;
1473 } 1510 }
1474 } 1511 }
1475
1476finish:
1477 if (seen_arch)
1478 init_archetype_pointers ();
1479
1480 return success;
1481} 1512}
1482 1513

Diff Legend

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