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.80 by root, Sat May 12 16:06:41 2007 UTC vs.
Revision 1.143 by root, Mon Nov 9 19:17:58 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30
31extern archetype *loading_arch;
32
33//+GPL
34 34
35/* 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
36 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
37 * 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
38 * 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
… …
168 "spell_magic_drain", /* 122 */ 168 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 169 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 170 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 171 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 172 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 173 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 174 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 175 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 176 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 177 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 178 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
252 NULL 252 NULL
253}; 253};
254 254
255extern bool loading_arch;
256
257/* 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
258 * 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
259 * 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
260 * 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.
261 */ 259 */
262void 260void
263object::post_load_check () 261object::post_load_check ()
264{ 262{
263 if (type >= NUM_TYPES)
264 {
265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
266 type = 0;
267 }
268
265 switch (type) 269 switch (type)
266 { 270 {
267 case BOW: 271 case BOW:
268 case WAND: 272 case WAND:
269 case ROD: 273 case ROD:
270 case HORN: 274 case HORN:
271 case SKILL_TOOL:
272 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
273 { 276 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 278 slot [body_range].info = -1;
276 } 279 }
277 break; 280 break;
278 281
279 case WEAPON: 282 case WEAPON:
280 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
281 { 284 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
284 } 287 }
285 break; 288 break;
286 289
287 case SHIELD: 290 case SHIELD:
288 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
289 { 292 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
292 } 295 }
293 break; 296 break;
294 297
295 case PLAYER: 298 case PLAYER:
296 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
297 { 300 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
300 } 303 }
301 304
302 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
303 { 306 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
306 } 309 }
307 310
308 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
309 { 312 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 314 slot [body_range].info = 1;
312 } 315 }
313 break; 316 break;
314 } 317 }
315 318
… …
320 * also have to catch is if this object is not using the normal name for 323 * also have to catch is if this object is not using the normal name for
321 * the object. In that case, we also want to use the loaded name. 324 * the object. In that case, we also want to use the loaded name.
322 * Otherwise, what happens is that the the plural name will lose 325 * Otherwise, what happens is that the the plural name will lose
323 * information (appear as just 'hearts' and not 'goblins heart') 326 * information (appear as just 'hearts' and not 'goblins heart')
324 */ 327 */
325 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
326 name_pl = 0; 329 name_pl = 0;
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
… …
338 * not in the ideal fashion. 341 * not in the ideal fashion.
339 */ 342 */
340 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))
341 { 344 {
342 if (!skill) 345 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 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) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 350 }
348 351
349 /* 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
350 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 354 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 360 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 361 || type == BRACERS || type == CLOAK)
359 { 362 {
360 if (last_heal) 363 if (last_heal)
361 { 364 {
362 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 ());
363 gen_sp_armour = last_heal; 366 gen_sp_armour = last_heal;
364 last_heal = 0; 367 last_heal = 0;
365 } 368 }
366 369
367 int ip = calc_item_power (this, 0); 370 int ip = calc_item_power (this, 0);
368 371
369 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 373 if (!item_power && ip)
371 { 374 {
372 if (ip > 3) 375 if (ip > 3)
373 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);
374 377
375 item_power = ip; 378 item_power = ip;
376 } 379 }
377 380
378 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
379 * something that has item_power 1 is probably just fine if our calculated 382 * something that has item_power 1 is probably just fine if our calculated
380 * value is 1 or 2 - these values are small enough that hard to be precise. 383 * value is 1 or 2 - these values are small enough that hard to be precise.
381 * similarly, it item_power is 0, the first check will always pass, 384 * similarly, it item_power is 0, the first check will always pass,
382 * but not the second one. 385 * but not the second one.
383 */ 386 */
387#if 0 //TODO
384 if (ip > 2 * item_power && ip > (item_power + 3)) 388 if (ip > 2 * item_power && ip > (item_power + 3))
385 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);
390#endif
386 } 391 }
387 392
388 /* Old spellcasting object - need to load in the appropiate object */ 393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
389 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
390 /* 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 */
391 ((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
392 { 406 {
407 // TODO: fix firewall object on map
393 /* 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'
394 * in that spell was stored in sp. 409 * in that spell was stored in sp.
395 */ 410 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
396 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]);
397 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
398 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = 0;
399 } 415 }
400 416
401 /* 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 */
402 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
403 { 419 {
420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
404 object *tmp = get_archetype_by_object_name (slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
405 insert_ob_in_ob (tmp, this); 422 insert_ob_in_ob (tmp, this);
406 randomitems = NULL; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
407 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
408 value = arch->clone.value * inv->value; 425 value = arch->value * inv->value;
409 } 426 }
410 427
411 if (QUERY_FLAG (this, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
412 { 429 {
413 if (stats.hp > stats.maxhp) 430 if (stats.hp > stats.maxhp)
414 { 431 {
415 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);
416 stats.maxhp = stats.hp; 433 stats.maxhp = stats.hp;
417 } 434 }
418 435
419 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
420 if (move_type == 0) 437 if (move_type == 0)
421 move_type = MOVE_WALK; 438 move_type = MOVE_WALK;
422 } 439 }
423 440
424 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)
425 {
426 /* Object will duplicate it's content as part of the 442 /* Object will duplicate it's content as part of the
427 * generation process. To do this, we must flag inventory 443 * generation process. To do this, we must flag inventory
428 * so it remains unevaluated concerning the randomitems and 444 * so it remains unevaluated concerning the randomitems and
429 * the living (a demonlord shouldn't cast from inside generator!) 445 * the living (a demonlord shouldn't cast from inside generator!)
430 */ 446 */
447 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
431 flag_inv (this, FLAG_IS_A_TEMPLATE); 448 flag_inv (this, FLAG_IS_A_TEMPLATE);
432 }
433 449
434 /* Handle player movers. We use move_type for player movers 450 /* Handle player movers. We use move_type for player movers
435 * because they operate on their own time (move_on 451 * because they operate on their own time (move_on
436 * would potentially cause them to be triggered when someone steps 452 * would potentially cause them to be triggered when someone steps
437 * 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
438 * are doing, otherwise, set move_type based on maxhp value. 454 * are doing, otherwise, set move_type based on maxhp value.
439 */ 455 */
440 if (type == PLAYERMOVER) 456 if (type == PLAYERMOVER)
441 { 457 {
442 if (!move_type) 458 if (!move_type)
… …
447 stats.maxhp = 0; 463 stats.maxhp = 0;
448 } 464 }
449 else 465 else
450 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
451 } 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);
452 } 481 }
453} 482}
454 483
455static void 484static void
456set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
504 533
505 goto next; 534 goto next;
506 } 535 }
507 } 536 }
508 537
509 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);
510 539
511next: ; 540next: ;
512 } 541 }
513} 542}
514 543
515#define GET_FLAG(op,flag) \ 544//-GPL
516 if (f.get_sint32 ()) \ 545
517 SET_FLAG (op, flag); \ 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
518 else \
519 CLEAR_FLAG (op, flag) \
520 547
521bool 548bool
522object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
523{ 550{
524 object *op_inv = inv; 551 object *op_inv = inv;
552 key_value *last_kv = key_values;
525 553
526 for (;;) 554 for (;;)
527 { 555 {
528 switch (f.kw) 556 switch (f.kw)
529 { 557 {
530 case KW_uuid: 558 case KW_uuid:
531 if (const char *s = f.get_str ()) 559 if (const char *s = f.get_str ())
532 { 560 if (!uuid.parse (s))
533 unsigned int version;
534 unsigned long long seq;
535
536 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
537 { 561 {
538 uuid.seq = seq; 562 f.parse_warn ("unparseable uuid");
539 break; 563 uuid = UUID::gen ();
540 } 564 }
541 }
542
543 uuid = gen_uuid ();
544 break; 565 break;
545 566
546 case KW_oid: 567 case KW_oid:
547 f.get (this, f.get_sint32 ()); 568 f.get (this, f.get_sint32 ());
548 break; 569 break;
… …
554 575
555 case KW_attach: f.get_ornull (attach); break; 576 case KW_attach: f.get_ornull (attach); break;
556 case KW_skill: f.get_ornull (skill); break; 577 case KW_skill: f.get_ornull (skill); break;
557 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
558 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;
559 581
560 case KW_arch: 582 case KW_arch:
561 {
562 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
563 tmp->deactivate ();
564
565 { 584 {
585 tmp->deactivate ();
586
566 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
567 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
568 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
569 // 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
570 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
571 CLEAR_FLAG (tmp, FLAG_REMOVED); 593 CLEAR_FLAG (tmp, FLAG_REMOVED);
572 594
573 if (!op_inv) 595 if (!op_inv)
574 { 596 {
… …
586 608
587 tmp->below = 0; 609 tmp->below = 0;
588 tmp->env = this; 610 tmp->env = this;
589 op_inv = tmp; 611 op_inv = tmp;
590 } 612 }
591 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
592 continue; 616 continue;
593 617
594 case KW_other_arch: 618 case KW_other_arch:
595 other_arch =
596 loading_arch 619 if (loading_arch == this)
597 ? archetype::get (f.get_str ()) 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
621 else
622 {
598 : archetype::find (f.get_str ()); 623 other_arch = archetype::find (f.get_str ());
599 624
600 if (!other_arch) 625 if (!other_arch)
601 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 }
628 break;
629
630 case KW_owner:
631 f.delayed_deref (this, owner, f.get_str ());
602 break; 632 break;
603 633
604 case KW_animation: 634 case KW_animation:
605 { 635 {
606 CLEAR_FLAG (this, FLAG_ANIMATE); 636 CLEAR_FLAG (this, FLAG_ANIMATE);
607 animation_id = 0; 637 animation_id = 0;
608 638
609 const char *str = f.get_str (); 639 const char *str = f.get_str ();
610 if (str && (animation_id = find_animation (str))) 640 if (str && (animation_id = find_animation (str)))
611 SET_FLAG (this, FLAG_ANIMATE); 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612 } 642 }
613 break; 643 break;
614 644
615 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
616 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
… …
633 f.get (move_slow_penalty); 663 f.get (move_slow_penalty);
634 break; 664 break;
635 665
636 case KW_face: 666 case KW_face:
637 face = face_find (f.get_str ()); 667 face = face_find (f.get_str ());
668 break;
669
670 case KW_sound:
671 sound = sound_find (f.get_str ());
672 if (!sound)
673 f.parse_warn ("sound not found");
674 break;
675
676 case KW_sound_destroy:
677 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy)
679 f.parse_warn ("sound not found");
638 break; 680 break;
639 681
640 case KW_x: f.get (x); break; 682 case KW_x: f.get (x); break;
641 case KW_y: f.get (y); break; 683 case KW_y: f.get (y); break;
642 684
… …
769 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 811 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
770 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 812 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
771 813
772 break; 814 break;
773 815
774 case KW_wiz:
775 GET_FLAG (this, FLAG_WIZ);
776 //TODO: move to check_object
777 if (QUERY_FLAG (this, FLAG_WIZ))
778 {
779 SET_FLAG (this, FLAG_WAS_WIZ);
780 SET_FLAG (this, FLAG_WIZPASS);
781 SET_FLAG (this, FLAG_WIZCAST);
782 }
783 else
784 {
785 CLEAR_FLAG (this, FLAG_WIZPASS);
786 CLEAR_FLAG (this, FLAG_WIZCAST);
787 }
788 break;
789
790 case KW_friendly: 816 case KW_friendly:
791 if (f.get_sint32 ()) 817 if (f.get_bool ())
792 if (type != PLAYER) 818 if (type != PLAYER)
793 add_friendly_object (this); 819 add_friendly_object (this);
794 820
795 break; 821 break;
796 822
… …
809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 835 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
810 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 836 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 837 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 838 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
813 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 839 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
840 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
814 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 841 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
815 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 842 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
816 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 843 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
817 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 844 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
818 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 845 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
825 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
826 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
827 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
828 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
829 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
830 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
831 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
834 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
919 case KW_anim_speed: f.get (anim_speed); break; 945 case KW_anim_speed: f.get (anim_speed); break;
920 case KW_container: f.get (weight_limit); break; 946 case KW_container: f.get (weight_limit); break;
921 case KW_will_apply: f.get (will_apply); break; 947 case KW_will_apply: f.get (will_apply); break;
922 case KW_attack_movement: f.get (attack_movement); break; 948 case KW_attack_movement: f.get (attack_movement); break;
923 case KW_move_state: f.get (move_status); break; 949 case KW_move_state: f.get (move_status); break;
924 case KW_expmul: f.get (expmul); break; 950 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
925 case KW_glow_radius: f.get (glow_radius); break; 951 case KW_glow_radius: f.get (glow_radius); break;
926 case KW_weapontype: f.get (weapontype); break; 952 case KW_weapontype: f.get (weapontype); break;
927 case KW_tooltype: f.get (tooltype); break;
928 case KW_casting_time: f.get (casting_time); break; 953 case KW_casting_time: f.get (casting_time); break;
954
955 // elevation is deprecated
929 case KW_elevation: f.get (elevation); break; 956 case KW_elevation: break;
957
930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 958 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
931 case KW_client_type: f.get (client_type); break; 959 case KW_client_type: f.get (client_type); break;
932 case KW_duration: f.get (duration); break; 960 case KW_duration: f.get (duration); break;
933 case KW_range: f.get (range); break; 961 case KW_range: f.get (range); break;
934 case KW_range_modifier: f.get (range_modifier); break; 962 case KW_range_modifier: f.get (range_modifier); break;
… …
953 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 981 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
954 case KW_can_apply: 982 case KW_can_apply:
955 break; 983 break;
956 984
957 case KW_connected: 985 case KW_connected:
958 add_button_link (this, map, f.get_sint32 ()); 986 {
987 shstr connected;
988
989 f.get (connected);
990 add_link (map, connected);
991 }
959 break; 992 break;
960 993
961 case KW_randomitems: 994 case KW_randomitems:
962 if (f.get_str ()) 995 if (f.get_str ())
963 { 996 {
… …
965 loading_arch 998 loading_arch
966 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
967 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
968 1001
969 if (!randomitems) 1002 if (!randomitems)
1003 {
970 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1004 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1005 randomitems = treasurelist::get (shstr_none); // avoid crashes
1006 }
971 } 1007 }
972 else 1008 else
973 randomitems = 0; 1009 randomitems = 0;
974 break; 1010 break;
975 1011
976 case KW_msg: 1012 case KW_msg:
977 f.get_ml (KW_endmsg, msg); 1013 f.get_ml (KW_endmsg, msg);
978 //TODO: allow longer messages
979 if (strlen (msg) >= HUGE_BUF)
980 {
981 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
982 msg = "ERROR, please report: string too long, winged.\n";
983 }
984 break; 1014 break;
985 1015
986 case KW_lore: 1016 case KW_lore:
987 f.get_ml (KW_endlore, lore); 1017 f.get_ml (KW_endlore, lore);
988 //TODO: allow longer messages
989 /* Just print a warning so we can be reasonably safe
990 * about not overflowing the buffer.
991 */
992 if (strlen (lore) > (HUGE_BUF / 2))
993 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
994 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
995 break; 1018 break;
996 1019
997 case KW_editable: 1020 case KW_editable:
998 case KW_editor_folder: 1021 case KW_editor_folder:
999 break; 1022 break;
… …
1004 1027
1005 f.next (); 1028 f.next ();
1006 return true; 1029 return true;
1007 1030
1008 case KW_ERROR: 1031 case KW_ERROR:
1009 set_ob_key_value (this, f.kw_str, f.value, true); 1032 // append as key value pair (do not use kv_set as it prepends)
1033 // we also do not even try to find old values, duplicate keys stay duplicate
1034 {
1035 key_value *kv = new key_value;
1036
1037 kv->next = 0;
1038 kv->key = shstr (f.kw_str);
1039 kv->value = shstr (f.value);
1040
1041 if (!last_kv)
1042 key_values = last_kv = kv;
1043 else
1044 {
1045 while (last_kv->next)
1046 last_kv = last_kv->next;
1047
1048 last_kv->next = kv;
1049 last_kv = kv;
1050 }
1051 }
1010 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1052 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1011 break; 1053 break;
1012 1054
1013 default: 1055 default:
1014 if (!f.parse_error ("object", name)) 1056 if (!f.parse_error ("object", name))
… …
1028 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1029 1071
1030 if (!arch) 1072 if (!arch)
1031 { 1073 {
1032 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1033 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1034 } 1076 }
1035 1077
1036 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1037 1079
1038 f.next (); 1080 f.next ();
1039 1081
1040 object *op = object::create (); 1082 object *op = arch->instance ();
1041
1042 op->map = map; 1083 op->map = map;
1043 arch->clone.copy_to (op);
1044 // copy_to activates, this should be fixed properly 1084 // instance() activates, this should be fixed properly
1045 op->deactivate (); 1085 op->deactivate ();
1046 1086
1047 if (!op->parse_kv (f)) 1087 if (!op->parse_kv (f))
1048 { 1088 {
1049 op->destroy (true); 1089 op->destroy ();
1050 return 0; 1090 return 0;
1051 } 1091 }
1052 1092
1053 op->post_load_check (); 1093 op->post_load_check ();
1054 return op; 1094 return op;
… …
1063int 1103int
1064set_variable (object *op, char *buf) 1104set_variable (object *op, char *buf)
1065{ 1105{
1066 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1067 1107
1068 f.next ();
1069 return op->parse_kv (f); 1108 return op->parse_kv (f);
1070} 1109}
1071 1110
1072/* This returns a string of the integer movement type */
1073#if 0
1074// unused function
1075static char *
1076get_string_move_type (MoveType mt)
1077{
1078 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1079 int i, all_count = 0, count;
1080
1081 strcpy (retbuf, "");
1082 strcpy (retbuf_all, " all");
1083
1084 /* Quick check, and probably fairly common */
1085 if (mt == MOVE_ALL)
1086 return retbuf_all + 1;
1087 if (mt == 0)
1088 {
1089 strcpy (retbuf, "0");
1090 return retbuf;
1091 }
1092
1093 /* We basically slide the bits down. Why look at MOVE_ALL?
1094 * because we may want to return a string like 'all -swim',
1095 * and if we just looked at mt, we couldn't get that.
1096 */
1097 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1098 {
1099 if (mt & (1 << count))
1100 {
1101 strcat (retbuf, " ");
1102 strcat (retbuf, move_name[count]);
1103 }
1104 else
1105 {
1106 strcat (retbuf_all, " -");
1107 strcat (retbuf_all, move_name[count]);
1108 all_count++;
1109 }
1110 }
1111 /* Basically, if there is a single negation, return it, eg
1112 * 'all -swim'. But more than that, just return the
1113 * enumerated values. It doesn't make sense to return
1114 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1115 */
1116 if (all_count <= 1)
1117 return retbuf_all + 1;
1118 else
1119 return retbuf + 1;
1120}
1121#endif
1122
1123// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1124static void 1112static void
1125write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1126{ 1114{
1127 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1128# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1129# include "attackinc.h" 1117# include "attackinc.h"
1130# undef def 1118# undef def
… …
1135 * the 15'th element of this array should match that name. 1123 * the 15'th element of this array should match that name.
1136 * If an entry is NULL, that is a flag not to loaded/saved. 1124 * If an entry is NULL, that is a flag not to loaded/saved.
1137 */ 1125 */
1138 static const keyword flag_names [NUM_FLAGS] = { 1126 static const keyword flag_names [NUM_FLAGS] = {
1139 KW_alive, 1127 KW_alive,
1140 KW_wiz,
1141 KW_NULL, 1128 KW_NULL,
1142 KW_NULL, 1129 KW_NULL,
1143 KW_was_wiz, 1130 KW_NULL,
1131 KW_NULL,
1144 KW_applied, 1132 KW_applied,
1145 KW_unpaid, 1133 KW_unpaid,
1146 KW_can_use_shield, 1134 KW_can_use_shield,
1147 KW_no_pick, 1135 KW_no_pick,
1148 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
1137 /* 10 */
1149 KW_NULL, // no_pass 1138 KW_NULL, // no_pass
1150 /* 10 */
1151 KW_is_animated, 1139 KW_is_animated,
1152 KW_NULL, // slow_move 1140 KW_NULL, // slow_move
1153 KW_NULL, // flying 1141 KW_NULL, // flying
1154 KW_monster, 1142 KW_monster,
1155 KW_friendly, 1143 KW_friendly,
1156 KW_generator, 1144 KW_generator,
1157 KW_is_thrown, 1145 KW_is_thrown,
1158 KW_auto_apply, 1146 KW_auto_apply,
1159 KW_treasure_env, 1147 KW_treasure_env,
1148 /* 20 */
1160 KW_player_sold, 1149 KW_player_sold,
1161 /* 20 */
1162 KW_see_invisible, 1150 KW_see_invisible,
1163 KW_can_roll, 1151 KW_can_roll,
1164 KW_overlay_floor, 1152 KW_overlay_floor,
1165 KW_is_turnable, 1153 KW_is_turnable,
1166 KW_NULL, // walk_off 1154 KW_NULL, // walk_off
1167 KW_NULL, // fly_on 1155 KW_NULL, // fly_on
1168 KW_NULL, // fly_off 1156 KW_NULL, // fly_off
1169 KW_is_used_up, 1157 KW_is_used_up,
1170 KW_identified, 1158 KW_identified,
1159 /* 30 */
1171 KW_reflecting, 1160 KW_reflecting,
1172 /* 30 */
1173 KW_changing, 1161 KW_changing,
1174 KW_splitting, 1162 KW_splitting,
1175 KW_hitback, 1163 KW_hitback,
1176 KW_startequip, 1164 KW_startequip,
1177 KW_blocksview, 1165 KW_blocksview,
1178 KW_undead, 1166 KW_undead,
1179 KW_scared, 1167 KW_scared,
1180 KW_unaggressive, 1168 KW_unaggressive,
1181 KW_reflect_missile, 1169 KW_reflect_missile,
1170 /* 40 */
1182 KW_reflect_spell, 1171 KW_reflect_spell,
1183 /* 40 */
1184 KW_no_magic, 1172 KW_no_magic,
1185 KW_no_fix_player, 1173 KW_no_fix_player,
1186 KW_is_lightable, 1174 KW_is_lightable,
1187 KW_tear_down, 1175 KW_tear_down,
1188 KW_run_away, 1176 KW_run_away,
1189 KW_NULL, // pass_thru 1177 KW_NULL, // pass_thru
1190 KW_NULL, // an_pass_thru 1178 KW_NULL, // an_pass_thru
1191 KW_pick_up, 1179 KW_pick_up,
1192 KW_unique, 1180 KW_unique,
1181 /* 50 */
1193 KW_no_drop, 1182 KW_no_drop,
1194 /* 50 */
1195 KW_NULL, // wizcast 1183 KW_NULL, // wizcast
1196 KW_can_cast_spell, 1184 KW_can_cast_spell,
1197 KW_can_use_scroll, 1185 KW_can_use_scroll,
1198 KW_can_use_range, 1186 KW_can_use_range,
1199 KW_can_use_bow, 1187 KW_can_use_bow,
1200 KW_can_use_armour, 1188 KW_can_use_armour,
1201 KW_can_use_weapon, 1189 KW_can_use_weapon,
1202 KW_can_use_ring, 1190 KW_can_use_ring,
1203 KW_has_ready_range, 1191 KW_has_ready_range,
1192 /* 60 */
1204 KW_has_ready_bow, 1193 KW_has_ready_bow,
1205 /* 60 */
1206 KW_xrays, 1194 KW_xrays,
1207 KW_NULL, 1195 KW_NULL,
1208 KW_is_floor, 1196 KW_is_floor,
1209 KW_lifesave, 1197 KW_lifesave,
1210 KW_no_strength, 1198 KW_no_strength,
1211 KW_sleep, 1199 KW_sleep,
1212 KW_stand_still, 1200 KW_stand_still,
1213 KW_random_move, 1201 KW_random_move,
1214 KW_only_attack, 1202 KW_only_attack,
1203 /* 70 */
1215 KW_confused, 1204 KW_confused,
1216 /* 70 */
1217 KW_stealth, 1205 KW_stealth,
1218 KW_NULL, 1206 KW_NULL,
1219 KW_NULL, 1207 KW_NULL,
1220 KW_cursed, 1208 KW_cursed,
1221 KW_damned, 1209 KW_damned,
1222 KW_see_anywhere, 1210 KW_see_anywhere,
1223 KW_known_magical, 1211 KW_known_magical,
1224 KW_known_cursed, 1212 KW_known_cursed,
1225 KW_can_use_skill, 1213 KW_can_use_skill,
1214 /* 80 */
1226 KW_been_applied, 1215 KW_been_applied,
1227 /* 80 */
1228 KW_has_ready_scroll, 1216 KW_has_ready_scroll,
1229 KW_can_use_rod, 1217 KW_can_use_rod,
1230 KW_precious, 1218 KW_precious,
1231 KW_can_use_horn, 1219 KW_can_use_horn,
1232 KW_make_invisible, 1220 KW_make_invisible,
1233 KW_inv_locked, 1221 KW_inv_locked,
1234 KW_is_wooded, 1222 KW_is_wooded,
1235 KW_is_hilly, 1223 KW_is_hilly,
1236 KW_has_ready_skill, 1224 KW_has_ready_skill,
1225 /* 90 */
1237 KW_has_ready_weapon, 1226 KW_has_ready_weapon,
1238 /* 90 */
1239 KW_no_skill_ident, 1227 KW_no_skill_ident,
1240 KW_is_blind, 1228 KW_is_blind,
1241 KW_can_see_in_dark, 1229 KW_can_see_in_dark,
1242 KW_is_cauldron, 1230 KW_is_cauldron,
1243 KW_NULL, 1231 KW_NULL,
1244 KW_no_steal, 1232 KW_no_steal,
1245 KW_one_hit, 1233 KW_one_hit,
1246 KW_NULL, 1234 KW_NULL,
1247 KW_berserk, 1235 KW_berserk,
1236 /* 100 */
1248 KW_neutral, 1237 KW_neutral,
1249 /* 100 */
1250 KW_no_attack, 1238 KW_no_attack,
1251 KW_no_damage, 1239 KW_no_damage,
1252 KW_obj_original, 1240 KW_obj_original,
1253 KW_NULL, 1241 KW_NULL,
1254 KW_activate_on_push, 1242 KW_activate_on_push,
1255 KW_activate_on_release, 1243 KW_activate_on_release,
1256 KW_is_water, 1244 KW_is_water,
1257 KW_use_content_on_gen, 1245 KW_use_content_on_gen,
1258 KW_NULL, 1246 KW_NULL,
1247 /* 110 */
1259 KW_is_buildable, 1248 KW_is_buildable,
1260 /* 110 */
1261 KW_destroy_on_death, 1249 KW_destroy_on_death,
1262 KW_NULL, 1250 KW_NULL,
1263 }; 1251 };
1264 1252
1265 int i; 1253 // obj_original is the only commonly differing flag between archetype
1254 // and object, so special-case it here to be able to skip the loop
1255 static const struct flagmask : object::flags_t
1256 {
1257 flagmask ()
1258 {
1259 for (int i = 0; i < NUM_FLAGS; i++)
1260 if (flag_names [i])
1261 set (i);
1262 }
1263 } flagmask;
1266 1264
1267 /* This saves the key/value lists. We do it first so that any 1265 /* This saves the key/value lists. We do it first so that any
1268 * keys that match field names will be overwritten by the loader. 1266 * keys that match field names will be overwritten by the loader.
1269 */ 1267 */
1270 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1268 for (key_value *kv = op->key_values; kv; kv = kv->next)
1271 { 1269 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1272 /* Find the field in the opposing member. */ 1270 f.put (kv->key, kv->value);
1273 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1274 1271
1275 /* If there's no partnering field, or it's got a different value, save our field. */ 1272 if (op->uuid)
1276 if (!arch_field || my_field->value != arch_field->value)
1277 f.put (my_field->key, my_field->value);
1278 } 1273 {
1274 // highly optimised - this is often 25% of all data written
1275 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1276 char *ptr = cur;
1279 1277
1280 /* We don't need to worry about the arch's extra fields - they 1278 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1281 * will get taken care of the copy_to method. 1279 ptr += sizeof ("uuid ") - 1;
1282 */ 1280 ptr = op->uuid.append (ptr);
1281 *ptr++ = '\n';
1283 1282
1284 { 1283 f.alloc (ptr - cur);
1285 char uids[64];
1286 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1287 f.put (KW_uuid, (const char *)uids);
1288 } 1284 }
1289 1285
1290#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1286#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1291#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1287#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1288
1289 CMP_OUT (x);
1290 CMP_OUT (y);
1291
1292 CMP_OUT (type);
1293 CMP_OUT (subtype);
1294 CMP_OUT (direction);
1292 1295
1293 CMP_OUT (name); 1296 CMP_OUT (name);
1294 CMP_OUT (name_pl); 1297 CMP_OUT (name_pl);
1295 CMP_OUT (custom_name); 1298
1299 CMP_OUT (speed);
1300 CMP_OUT (speed_left);
1301
1296 CMP_OUT (title); 1302 CMP_OUT (title);
1297 CMP_OUT (race); 1303 CMP_OUT (race);
1298 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1305 CMP_OUT (skill);
1299 1306
1300 if (op->msg != tmp->msg) 1307 CMP_OUT (tag);
1301 f.put (KW_msg, KW_endmsg, op->msg); 1308 CMP_OUT (custom_name);
1302 if (op->lore != tmp->lore) 1309
1303 f.put (KW_lore, KW_endlore, op->lore); 1310 if (object *owner = op->owner)
1311 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1312
1313 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1304 1314
1305 CMP_OUT (other_arch); 1315 CMP_OUT (other_arch);
1306 1316
1307 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1317 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1318 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1308 1319
1320 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1321 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1322 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1323
1309 if (op->animation_id != tmp->animation_id) 1324 if (op->animation_id != arch->animation_id)
1310 if (op->animation_id) 1325 if (op->has_anim ())
1326 f.put (KW_animation, op->anim ().name);
1327 else
1311 { 1328 {
1312 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1329 f.put (KW_animation, (const char *)0);
1313 1330 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1314 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1315 f.put (KW_is_animated, (sint32) 0);
1316 } 1331 }
1317 else
1318 f.put (KW_animation, (const char *) 0);
1319 1332
1320 CMP_OUT2 (str, stats.Str); 1333 CMP_OUT2 (str, stats.Str);
1321 CMP_OUT2 (dex, stats.Dex); 1334 CMP_OUT2 (dex, stats.Dex);
1322 CMP_OUT2 (con, stats.Con); 1335 CMP_OUT2 (con, stats.Con);
1323 CMP_OUT2 (wis, stats.Wis); 1336 CMP_OUT2 (wis, stats.Wis);
… …
1332 CMP_OUT2 (grace, stats.grace); 1345 CMP_OUT2 (grace, stats.grace);
1333 CMP_OUT2 (maxgrace, stats.maxgrace); 1346 CMP_OUT2 (maxgrace, stats.maxgrace);
1334 CMP_OUT2 (exp, stats.exp); 1347 CMP_OUT2 (exp, stats.exp);
1335 1348
1336 CMP_OUT (perm_exp); 1349 CMP_OUT (perm_exp);
1337 CMP_OUT (expmul); 1350 //CMP_OUT (expmul);
1338 1351
1339 CMP_OUT2 (food, stats.food); 1352 CMP_OUT2 (food, stats.food);
1340 CMP_OUT2 (dam, stats.dam); 1353 CMP_OUT2 (dam, stats.dam);
1341 CMP_OUT2 (luck, stats.luck); 1354 CMP_OUT2 (luck, stats.luck);
1342 CMP_OUT2 (wc, stats.wc); 1355 CMP_OUT2 (wc, stats.wc);
1343 CMP_OUT2 (ac, stats.ac); 1356 CMP_OUT2 (ac, stats.ac);
1344 1357
1345 CMP_OUT (x);
1346 CMP_OUT (y);
1347 CMP_OUT (speed);
1348 CMP_OUT (speed_left);
1349 CMP_OUT2 (move_state, move_status); 1358 CMP_OUT2 (move_state, move_status);
1350 CMP_OUT (attack_movement); 1359 CMP_OUT (attack_movement);
1351 CMP_OUT (nrof); 1360 CMP_OUT (nrof);
1352 CMP_OUT (level); 1361 CMP_OUT (level);
1353 CMP_OUT (direction);
1354 CMP_OUT (type);
1355 CMP_OUT (subtype);
1356 CMP_OUT (attacktype); 1362 CMP_OUT (attacktype);
1357 1363
1364 // using memcmp here seems to be a loss - us gcc vectorising?
1358 for (i = 0; i < NROFATTACKS; i++) 1365 for (int i = 0; i < NROFATTACKS; i++)
1359 if (op->resist[i] != tmp->resist[i]) 1366 if (expect_false (op->resist[i] != arch->resist[i]))
1360 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1361 1368
1362 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1363 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1364 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
… …
1374 CMP_OUT (last_sp); 1381 CMP_OUT (last_sp);
1375 CMP_OUT (last_grace); 1382 CMP_OUT (last_grace);
1376 CMP_OUT (last_eat); 1383 CMP_OUT (last_eat);
1377 CMP_OUT (glow_radius); 1384 CMP_OUT (glow_radius);
1378 1385
1379 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1386 if (op->flag [FLAG_IS_LINKED])
1387 if (auto (ol, op->find_link ()))
1380 f.put (KW_connected, i); 1388 f.put (KW_connected, ol->id);
1381 1389
1382 CMP_OUT (randomitems); 1390 CMP_OUT (randomitems);
1383 CMP_OUT2 (container, weight_limit); 1391 CMP_OUT2 (container, weight_limit);
1384 1392
1385 CMP_OUT (run_away); 1393 CMP_OUT (run_away);
1386 CMP_OUT (pick_up); 1394 CMP_OUT (pick_up);
1387 CMP_OUT (will_apply); 1395 CMP_OUT (will_apply);
1388 CMP_OUT (smoothlevel); 1396 CMP_OUT (smoothlevel);
1389 CMP_OUT (weapontype); 1397 CMP_OUT (weapontype);
1390 CMP_OUT (tooltype);
1391 CMP_OUT (elevation);
1392 CMP_OUT (client_type); 1398 CMP_OUT (client_type);
1393 CMP_OUT (item_power); 1399 CMP_OUT (item_power);
1394 CMP_OUT (duration); 1400 CMP_OUT (duration);
1395 CMP_OUT (range); 1401 CMP_OUT (range);
1396 CMP_OUT (range_modifier); 1402 CMP_OUT (range_modifier);
… …
1404 CMP_OUT (move_on); 1410 CMP_OUT (move_on);
1405 CMP_OUT (move_off); 1411 CMP_OUT (move_off);
1406 CMP_OUT (move_slow); 1412 CMP_OUT (move_slow);
1407 CMP_OUT (move_slow_penalty); 1413 CMP_OUT (move_slow_penalty);
1408 1414
1409 if (op->flag != tmp->flag) 1415 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1416
1417 if (diff [FLAG_OBJ_ORIGINAL])
1418 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1419
1420 diff.reset (FLAG_OBJ_ORIGINAL);
1421
1422 // quickly test whether any other flags differ
1423 if (expect_true (diff.any ()))
1410 for (i = 0; i <= NUM_FLAGS; i++) 1424 for (int i = 0; i < NUM_FLAGS; i++)
1411 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1425 if (expect_false (diff [i]))
1412 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1413 1427
1414 // save body locations 1428 // save body locations. gcc's memcmp does an abysmal job when used
1415 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1416 if (op->slot[i].info != tmp->slot[i].info) 1430 if (expect_false (op->slot[i].info != arch->slot[i].info))
1417 f.put (body_locations[i].save_name, op->slot[i].info); 1431 f.put (body_locations[i].save_name, op->slot[i].info);
1418} 1432}
1419 1433
1420/* 1434/*
1421 * Dumps all variables in an object to a file. 1435 * Dumps all variables in an object to a file.
… …
1423 * the only place this is not set is when saving the player. 1437 * the only place this is not set is when saving the player.
1424 */ 1438 */
1425bool 1439bool
1426object::write (object_freezer &f) 1440object::write (object_freezer &f)
1427{ 1441{
1428 /* Even if the object does have an owner, it would seem that we should 1442 if (is_arch ())
1429 * still save it. 1443 {
1430 */ 1444 f.put (KW_object, arch->archname);
1431 if (owner) 1445 write_diff (f, this, archetype::empty);
1432 return true; 1446 }
1433 1447 else
1434 archetype *at = arch ? (archetype *)arch : empty_archetype; 1448 {
1435
1436 f.put (KW_arch, at->name); 1449 f.put (KW_arch, arch->archname);
1437 write_diff (f, this, &at->clone); 1450 write_diff (f, this, arch);
1451 }
1438 1452
1439 for (object *tmp = inv; tmp; tmp = tmp->below) 1453 for (object *tmp = inv; tmp; tmp = tmp->below)
1440 tmp->write (f); 1454 tmp->write (f);
1441 1455
1442 f.put (this); 1456 f.put (this);
… …
1447 1461
1448///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
1449 1463
1450// generic resource file load, 1464// generic resource file load,
1451// currently supports: region, treasures, archetypes 1465// currently supports: region, treasures, archetypes
1466bool
1452bool load_resource_file (const char *filename) 1467load_resource_file_ (const char *filename)
1453{ 1468{
1454 object_thawer f (filename); 1469 object_thawer f (filename);
1455
1456 bool success = false;
1457 bool seen_arch = false;
1458
1459 f.next ();
1460 1470
1461 for (;;) 1471 for (;;)
1462 { 1472 {
1463 switch (f.kw) 1473 switch (f.kw)
1464 { 1474 {
1465 case KW_region: 1475 case KW_region:
1466 if (!region::read (f)) 1476 if (!region::read (f))
1467 goto finish; 1477 return false;
1468 break; 1478 break;
1469 1479
1470 case KW_treasure: 1480 case KW_treasure:
1471 case KW_treasureone: 1481 case KW_treasureone:
1472 if (!treasurelist::read (f)) 1482 if (!treasurelist::read (f))
1473 goto finish; 1483 return false;
1474 break; 1484 break;
1475 1485
1476 case KW_object: 1486 case KW_object:
1477 seen_arch = true;
1478 if (!archetype::read (f)) 1487 if (!archetype::read (f))
1479 goto finish; 1488 return false;
1480 break; 1489 break;
1481 1490
1482 case KW_EOF: 1491 case KW_EOF:
1483 success = true; 1492 return true;
1484 goto finish;
1485 1493
1486 default: 1494 default:
1487 if (!f.parse_error ("resource file")) 1495 if (!f.parse_error ("resource file"))
1488 goto finish; 1496 return false;
1489 1497
1490 f.next (); 1498 f.next ();
1491 break; 1499 break;
1492 } 1500 }
1493 } 1501 }
1494
1495finish:
1496 if (seen_arch)
1497 init_archetype_pointers ();
1498
1499 return success;
1500} 1502}
1501 1503

Diff Legend

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