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.84 by root, Tue May 22 10:49:58 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{
265 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
266 { 264 {
267 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 ());
268 type = 0; 266 type = 0;
269 } 267 }
270 268
271 switch (type) 269 switch (type)
272 { 270 {
… …
274 case WAND: 272 case WAND:
275 case ROD: 273 case ROD:
276 case HORN: 274 case HORN:
277 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
278 { 276 {
279 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);
280 slot [body_range].info = -1; 278 slot [body_range].info = -1;
281 } 279 }
282 break; 280 break;
283 281
284 case WEAPON: 282 case WEAPON:
285 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
286 { 284 {
287 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);
288 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
289 } 287 }
290 break; 288 break;
291 289
292 case SHIELD: 290 case SHIELD:
293 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
294 { 292 {
295 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);
296 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
297 } 295 }
298 break; 296 break;
299 297
300 case PLAYER: 298 case PLAYER:
301 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
302 { 300 {
303 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);
304 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
305 } 303 }
306 304
307 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
308 { 306 {
309 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);
310 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
311 } 309 }
312 310
313 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
314 { 312 {
315 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);
316 slot [body_range].info = 1; 314 slot [body_range].info = 1;
317 } 315 }
318 break; 316 break;
319 } 317 }
320 318
… …
325 * 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
326 * 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.
327 * Otherwise, what happens is that the the plural name will lose 325 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 326 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 327 */
330 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)
331 name_pl = 0; 329 name_pl = 0;
332 330
333 if (!name_pl) 331 if (!name_pl)
334 name_pl = name; 332 name_pl = name;
335 333
… …
343 * not in the ideal fashion. 341 * not in the ideal fashion.
344 */ 342 */
345 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))
346 { 344 {
347 if (!skill) 345 if (!skill)
348 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
349 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) ||
350 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
351 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);
352 } 350 }
353 351
354 /* 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
355 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
356 * that may have an old value. 354 * that may have an old value.
… …
362 || type == AMULET || type == GIRDLE 360 || type == AMULET || type == GIRDLE
363 || type == BRACERS || type == CLOAK) 361 || type == BRACERS || type == CLOAK)
364 { 362 {
365 if (last_heal) 363 if (last_heal)
366 { 364 {
367 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 ());
368 gen_sp_armour = last_heal; 366 gen_sp_armour = last_heal;
369 last_heal = 0; 367 last_heal = 0;
370 } 368 }
371 369
372 int ip = calc_item_power (this, 0); 370 int ip = calc_item_power (this, 0);
373 371
374 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
375 if (!item_power && ip) 373 if (!item_power && ip)
376 { 374 {
377 if (ip > 3) 375 if (ip > 3)
378 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);
379 377
380 item_power = ip; 378 item_power = ip;
381 } 379 }
382 380
383 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
… …
390 if (ip > 2 * item_power && ip > (item_power + 3)) 388 if (ip > 2 * item_power && ip > (item_power + 3))
391 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);
392#endif 390#endif
393 } 391 }
394 392
395 /* Old spellcasting object - need to load in the appropiate object */ 393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
396 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
397 /* 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 */
398 ((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
399 { 406 {
407 // TODO: fix firewall object on map
400 /* 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'
401 * in that spell was stored in sp. 409 * in that spell was stored in sp.
402 */ 410 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
403 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]);
404 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = 0;
406 } 415 }
407 416
408 /* 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 */
409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
410 { 419 {
420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
411 object *tmp = get_archetype_by_object_name (slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 422 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 425 value = arch->value * inv->value;
416 } 426 }
417 427
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 429 {
420 if (stats.hp > stats.maxhp) 430 if (stats.hp > stats.maxhp)
421 { 431 {
422 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);
423 stats.maxhp = stats.hp; 433 stats.maxhp = stats.hp;
424 } 434 }
425 435
426 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
427 if (move_type == 0) 437 if (move_type == 0)
428 move_type = MOVE_WALK; 438 move_type = MOVE_WALK;
429 } 439 }
430 440
431 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)
432 {
433 /* Object will duplicate it's content as part of the 442 /* Object will duplicate it's content as part of the
434 * generation process. To do this, we must flag inventory 443 * generation process. To do this, we must flag inventory
435 * so it remains unevaluated concerning the randomitems and 444 * so it remains unevaluated concerning the randomitems and
436 * the living (a demonlord shouldn't cast from inside generator!) 445 * the living (a demonlord shouldn't cast from inside generator!)
437 */ 446 */
447 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
438 flag_inv (this, FLAG_IS_A_TEMPLATE); 448 flag_inv (this, FLAG_IS_A_TEMPLATE);
439 }
440 449
441 /* Handle player movers. We use move_type for player movers 450 /* Handle player movers. We use move_type for player movers
442 * because they operate on their own time (move_on 451 * because they operate on their own time (move_on
443 * would potentially cause them to be triggered when someone steps 452 * would potentially cause them to be triggered when someone steps
444 * 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
445 * are doing, otherwise, set move_type based on maxhp value. 454 * are doing, otherwise, set move_type based on maxhp value.
446 */ 455 */
447 if (type == PLAYERMOVER) 456 if (type == PLAYERMOVER)
448 { 457 {
449 if (!move_type) 458 if (!move_type)
… …
454 stats.maxhp = 0; 463 stats.maxhp = 0;
455 } 464 }
456 else 465 else
457 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
458 } 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);
459 } 481 }
460} 482}
461 483
462static void 484static void
463set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
511 533
512 goto next; 534 goto next;
513 } 535 }
514 } 536 }
515 537
516 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);
517 539
518next: ; 540next: ;
519 } 541 }
520} 542}
521 543
522#define GET_FLAG(op,flag) \ 544//-GPL
523 if (f.get_sint32 ()) \ 545
524 SET_FLAG (op, flag); \ 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
525 else \
526 CLEAR_FLAG (op, flag) \
527 547
528bool 548bool
529object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
530{ 550{
531 object *op_inv = inv; 551 object *op_inv = inv;
552 key_value *last_kv = key_values;
532 553
533 for (;;) 554 for (;;)
534 { 555 {
535 switch (f.kw) 556 switch (f.kw)
536 { 557 {
537 case KW_uuid: 558 case KW_uuid:
538 if (const char *s = f.get_str ()) 559 if (const char *s = f.get_str ())
539 { 560 if (!uuid.parse (s))
540 unsigned int version;
541 unsigned long long seq;
542
543 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
544 { 561 {
545 uuid.seq = seq; 562 f.parse_warn ("unparseable uuid");
546 break; 563 uuid = UUID::gen ();
547 } 564 }
548 }
549
550 uuid = gen_uuid ();
551 break; 565 break;
552 566
553 case KW_oid: 567 case KW_oid:
554 f.get (this, f.get_sint32 ()); 568 f.get (this, f.get_sint32 ());
555 break; 569 break;
… …
561 575
562 case KW_attach: f.get_ornull (attach); break; 576 case KW_attach: f.get_ornull (attach); break;
563 case KW_skill: f.get_ornull (skill); break; 577 case KW_skill: f.get_ornull (skill); break;
564 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
565 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;
566 581
567 case KW_arch: 582 case KW_arch:
568 {
569 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
570 tmp->deactivate ();
571
572 { 584 {
585 tmp->deactivate ();
586
573 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
574 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
575 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
576 // 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
577 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
578 CLEAR_FLAG (tmp, FLAG_REMOVED); 593 CLEAR_FLAG (tmp, FLAG_REMOVED);
579 594
580 if (!op_inv) 595 if (!op_inv)
581 { 596 {
… …
593 608
594 tmp->below = 0; 609 tmp->below = 0;
595 tmp->env = this; 610 tmp->env = this;
596 op_inv = tmp; 611 op_inv = tmp;
597 } 612 }
598 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
599 continue; 616 continue;
600 617
601 case KW_other_arch: 618 case KW_other_arch:
602 other_arch =
603 loading_arch 619 if (loading_arch == this)
604 ? archetype::get (f.get_str ()) 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
621 else
622 {
605 : archetype::find (f.get_str ()); 623 other_arch = archetype::find (f.get_str ());
606 624
607 if (!other_arch) 625 if (!other_arch)
608 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 ());
609 break; 632 break;
610 633
611 case KW_animation: 634 case KW_animation:
612 { 635 {
613 CLEAR_FLAG (this, FLAG_ANIMATE); 636 CLEAR_FLAG (this, FLAG_ANIMATE);
614 animation_id = 0; 637 animation_id = 0;
615 638
616 const char *str = f.get_str (); 639 const char *str = f.get_str ();
617 if (str && (animation_id = find_animation (str))) 640 if (str && (animation_id = find_animation (str)))
618 SET_FLAG (this, FLAG_ANIMATE); 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
619 } 642 }
620 break; 643 break;
621 644
622 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
623 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
… …
640 f.get (move_slow_penalty); 663 f.get (move_slow_penalty);
641 break; 664 break;
642 665
643 case KW_face: 666 case KW_face:
644 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");
645 break; 680 break;
646 681
647 case KW_x: f.get (x); break; 682 case KW_x: f.get (x); break;
648 case KW_y: f.get (y); break; 683 case KW_y: f.get (y); break;
649 684
… …
777 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 812 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
778 813
779 break; 814 break;
780 815
781 case KW_friendly: 816 case KW_friendly:
782 if (f.get_sint32 ()) 817 if (f.get_bool ())
783 if (type != PLAYER) 818 if (type != PLAYER)
784 add_friendly_object (this); 819 add_friendly_object (this);
785 820
786 break; 821 break;
787 822
… …
800 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 835 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
801 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;
802 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 837 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
803 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 838 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
804 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;
805 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 841 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
806 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 842 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
807 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 843 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
808 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 844 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
809 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 845 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
909 case KW_anim_speed: f.get (anim_speed); break; 945 case KW_anim_speed: f.get (anim_speed); break;
910 case KW_container: f.get (weight_limit); break; 946 case KW_container: f.get (weight_limit); break;
911 case KW_will_apply: f.get (will_apply); break; 947 case KW_will_apply: f.get (will_apply); break;
912 case KW_attack_movement: f.get (attack_movement); break; 948 case KW_attack_movement: f.get (attack_movement); break;
913 case KW_move_state: f.get (move_status); break; 949 case KW_move_state: f.get (move_status); break;
914 case KW_expmul: f.get (expmul); break; 950 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
915 case KW_glow_radius: f.get (glow_radius); break; 951 case KW_glow_radius: f.get (glow_radius); break;
916 case KW_weapontype: f.get (weapontype); break; 952 case KW_weapontype: f.get (weapontype); break;
917 case KW_tooltype: f.get (tooltype); break;
918 case KW_casting_time: f.get (casting_time); break; 953 case KW_casting_time: f.get (casting_time); break;
954
955 // elevation is deprecated
919 case KW_elevation: f.get (elevation); break; 956 case KW_elevation: break;
957
920 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;
921 case KW_client_type: f.get (client_type); break; 959 case KW_client_type: f.get (client_type); break;
922 case KW_duration: f.get (duration); break; 960 case KW_duration: f.get (duration); break;
923 case KW_range: f.get (range); break; 961 case KW_range: f.get (range); break;
924 case KW_range_modifier: f.get (range_modifier); break; 962 case KW_range_modifier: f.get (range_modifier); break;
… …
943 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;
944 case KW_can_apply: 982 case KW_can_apply:
945 break; 983 break;
946 984
947 case KW_connected: 985 case KW_connected:
948 add_button_link (this, map, f.get_sint32 ()); 986 {
987 shstr connected;
988
989 f.get (connected);
990 add_link (map, connected);
991 }
949 break; 992 break;
950 993
951 case KW_randomitems: 994 case KW_randomitems:
952 if (f.get_str ()) 995 if (f.get_str ())
953 { 996 {
… …
955 loading_arch 998 loading_arch
956 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
957 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
958 1001
959 if (!randomitems) 1002 if (!randomitems)
1003 {
960 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 }
961 } 1007 }
962 else 1008 else
963 randomitems = 0; 1009 randomitems = 0;
964 break; 1010 break;
965 1011
966 case KW_msg: 1012 case KW_msg:
967 f.get_ml (KW_endmsg, msg); 1013 f.get_ml (KW_endmsg, msg);
968 //TODO: allow longer messages
969 if (strlen (msg) >= HUGE_BUF)
970 {
971 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
972 msg = "ERROR, please report: string too long, winged.\n";
973 }
974 break; 1014 break;
975 1015
976 case KW_lore: 1016 case KW_lore:
977 f.get_ml (KW_endlore, lore); 1017 f.get_ml (KW_endlore, lore);
978 //TODO: allow longer messages
979 /* Just print a warning so we can be reasonably safe
980 * about not overflowing the buffer.
981 */
982 if (strlen (lore) > (HUGE_BUF / 2))
983 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
984 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
985 break; 1018 break;
986 1019
987 case KW_editable: 1020 case KW_editable:
988 case KW_editor_folder: 1021 case KW_editor_folder:
989 break; 1022 break;
… …
994 1027
995 f.next (); 1028 f.next ();
996 return true; 1029 return true;
997 1030
998 case KW_ERROR: 1031 case KW_ERROR:
999 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 }
1000 //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
1001 break; 1053 break;
1002 1054
1003 default: 1055 default:
1004 if (!f.parse_error ("object", name)) 1056 if (!f.parse_error ("object", name))
… …
1018 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1019 1071
1020 if (!arch) 1072 if (!arch)
1021 { 1073 {
1022 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 ());
1023 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1024 } 1076 }
1025 1077
1026 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1027 1079
1028 f.next (); 1080 f.next ();
1029 1081
1030 object *op = object::create (); 1082 object *op = arch->instance ();
1031
1032 op->map = map; 1083 op->map = map;
1033 arch->clone.copy_to (op);
1034 // copy_to activates, this should be fixed properly 1084 // instance() activates, this should be fixed properly
1035 op->deactivate (); 1085 op->deactivate ();
1036 1086
1037 if (!op->parse_kv (f)) 1087 if (!op->parse_kv (f))
1038 { 1088 {
1039 op->destroy (true); 1089 op->destroy ();
1040 return 0; 1090 return 0;
1041 } 1091 }
1042 1092
1043 op->post_load_check (); 1093 op->post_load_check ();
1044 return op; 1094 return op;
… …
1053int 1103int
1054set_variable (object *op, char *buf) 1104set_variable (object *op, char *buf)
1055{ 1105{
1056 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1057 1107
1058 f.next ();
1059 return op->parse_kv (f); 1108 return op->parse_kv (f);
1060} 1109}
1061 1110
1062/* This returns a string of the integer movement type */
1063#if 0
1064// unused function
1065static char *
1066get_string_move_type (MoveType mt)
1067{
1068 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1069 int i, all_count = 0, count;
1070
1071 strcpy (retbuf, "");
1072 strcpy (retbuf_all, " all");
1073
1074 /* Quick check, and probably fairly common */
1075 if (mt == MOVE_ALL)
1076 return retbuf_all + 1;
1077 if (mt == 0)
1078 {
1079 strcpy (retbuf, "0");
1080 return retbuf;
1081 }
1082
1083 /* We basically slide the bits down. Why look at MOVE_ALL?
1084 * because we may want to return a string like 'all -swim',
1085 * and if we just looked at mt, we couldn't get that.
1086 */
1087 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1088 {
1089 if (mt & (1 << count))
1090 {
1091 strcat (retbuf, " ");
1092 strcat (retbuf, move_name[count]);
1093 }
1094 else
1095 {
1096 strcat (retbuf_all, " -");
1097 strcat (retbuf_all, move_name[count]);
1098 all_count++;
1099 }
1100 }
1101 /* Basically, if there is a single negation, return it, eg
1102 * 'all -swim'. But more than that, just return the
1103 * enumerated values. It doesn't make sense to return
1104 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1105 */
1106 if (all_count <= 1)
1107 return retbuf_all + 1;
1108 else
1109 return retbuf + 1;
1110}
1111#endif
1112
1113// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1114static void 1112static void
1115write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1116{ 1114{
1117 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1118# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1119# include "attackinc.h" 1117# include "attackinc.h"
1120# undef def 1118# undef def
… …
1134 KW_applied, 1132 KW_applied,
1135 KW_unpaid, 1133 KW_unpaid,
1136 KW_can_use_shield, 1134 KW_can_use_shield,
1137 KW_no_pick, 1135 KW_no_pick,
1138 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
1137 /* 10 */
1139 KW_NULL, // no_pass 1138 KW_NULL, // no_pass
1140 /* 10 */
1141 KW_is_animated, 1139 KW_is_animated,
1142 KW_NULL, // slow_move 1140 KW_NULL, // slow_move
1143 KW_NULL, // flying 1141 KW_NULL, // flying
1144 KW_monster, 1142 KW_monster,
1145 KW_friendly, 1143 KW_friendly,
1146 KW_generator, 1144 KW_generator,
1147 KW_is_thrown, 1145 KW_is_thrown,
1148 KW_auto_apply, 1146 KW_auto_apply,
1149 KW_treasure_env, 1147 KW_treasure_env,
1148 /* 20 */
1150 KW_player_sold, 1149 KW_player_sold,
1151 /* 20 */
1152 KW_see_invisible, 1150 KW_see_invisible,
1153 KW_can_roll, 1151 KW_can_roll,
1154 KW_overlay_floor, 1152 KW_overlay_floor,
1155 KW_is_turnable, 1153 KW_is_turnable,
1156 KW_NULL, // walk_off 1154 KW_NULL, // walk_off
1157 KW_NULL, // fly_on 1155 KW_NULL, // fly_on
1158 KW_NULL, // fly_off 1156 KW_NULL, // fly_off
1159 KW_is_used_up, 1157 KW_is_used_up,
1160 KW_identified, 1158 KW_identified,
1159 /* 30 */
1161 KW_reflecting, 1160 KW_reflecting,
1162 /* 30 */
1163 KW_changing, 1161 KW_changing,
1164 KW_splitting, 1162 KW_splitting,
1165 KW_hitback, 1163 KW_hitback,
1166 KW_startequip, 1164 KW_startequip,
1167 KW_blocksview, 1165 KW_blocksview,
1168 KW_undead, 1166 KW_undead,
1169 KW_scared, 1167 KW_scared,
1170 KW_unaggressive, 1168 KW_unaggressive,
1171 KW_reflect_missile, 1169 KW_reflect_missile,
1170 /* 40 */
1172 KW_reflect_spell, 1171 KW_reflect_spell,
1173 /* 40 */
1174 KW_no_magic, 1172 KW_no_magic,
1175 KW_no_fix_player, 1173 KW_no_fix_player,
1176 KW_is_lightable, 1174 KW_is_lightable,
1177 KW_tear_down, 1175 KW_tear_down,
1178 KW_run_away, 1176 KW_run_away,
1179 KW_NULL, // pass_thru 1177 KW_NULL, // pass_thru
1180 KW_NULL, // an_pass_thru 1178 KW_NULL, // an_pass_thru
1181 KW_pick_up, 1179 KW_pick_up,
1182 KW_unique, 1180 KW_unique,
1181 /* 50 */
1183 KW_no_drop, 1182 KW_no_drop,
1184 /* 50 */
1185 KW_NULL, // wizcast 1183 KW_NULL, // wizcast
1186 KW_can_cast_spell, 1184 KW_can_cast_spell,
1187 KW_can_use_scroll, 1185 KW_can_use_scroll,
1188 KW_can_use_range, 1186 KW_can_use_range,
1189 KW_can_use_bow, 1187 KW_can_use_bow,
1190 KW_can_use_armour, 1188 KW_can_use_armour,
1191 KW_can_use_weapon, 1189 KW_can_use_weapon,
1192 KW_can_use_ring, 1190 KW_can_use_ring,
1193 KW_has_ready_range, 1191 KW_has_ready_range,
1192 /* 60 */
1194 KW_has_ready_bow, 1193 KW_has_ready_bow,
1195 /* 60 */
1196 KW_xrays, 1194 KW_xrays,
1197 KW_NULL, 1195 KW_NULL,
1198 KW_is_floor, 1196 KW_is_floor,
1199 KW_lifesave, 1197 KW_lifesave,
1200 KW_no_strength, 1198 KW_no_strength,
1201 KW_sleep, 1199 KW_sleep,
1202 KW_stand_still, 1200 KW_stand_still,
1203 KW_random_move, 1201 KW_random_move,
1204 KW_only_attack, 1202 KW_only_attack,
1203 /* 70 */
1205 KW_confused, 1204 KW_confused,
1206 /* 70 */
1207 KW_stealth, 1205 KW_stealth,
1208 KW_NULL, 1206 KW_NULL,
1209 KW_NULL, 1207 KW_NULL,
1210 KW_cursed, 1208 KW_cursed,
1211 KW_damned, 1209 KW_damned,
1212 KW_see_anywhere, 1210 KW_see_anywhere,
1213 KW_known_magical, 1211 KW_known_magical,
1214 KW_known_cursed, 1212 KW_known_cursed,
1215 KW_can_use_skill, 1213 KW_can_use_skill,
1214 /* 80 */
1216 KW_been_applied, 1215 KW_been_applied,
1217 /* 80 */
1218 KW_has_ready_scroll, 1216 KW_has_ready_scroll,
1219 KW_can_use_rod, 1217 KW_can_use_rod,
1220 KW_precious, 1218 KW_precious,
1221 KW_can_use_horn, 1219 KW_can_use_horn,
1222 KW_make_invisible, 1220 KW_make_invisible,
1223 KW_inv_locked, 1221 KW_inv_locked,
1224 KW_is_wooded, 1222 KW_is_wooded,
1225 KW_is_hilly, 1223 KW_is_hilly,
1226 KW_has_ready_skill, 1224 KW_has_ready_skill,
1225 /* 90 */
1227 KW_has_ready_weapon, 1226 KW_has_ready_weapon,
1228 /* 90 */
1229 KW_no_skill_ident, 1227 KW_no_skill_ident,
1230 KW_is_blind, 1228 KW_is_blind,
1231 KW_can_see_in_dark, 1229 KW_can_see_in_dark,
1232 KW_is_cauldron, 1230 KW_is_cauldron,
1233 KW_NULL, 1231 KW_NULL,
1234 KW_no_steal, 1232 KW_no_steal,
1235 KW_one_hit, 1233 KW_one_hit,
1236 KW_NULL, 1234 KW_NULL,
1237 KW_berserk, 1235 KW_berserk,
1236 /* 100 */
1238 KW_neutral, 1237 KW_neutral,
1239 /* 100 */
1240 KW_no_attack, 1238 KW_no_attack,
1241 KW_no_damage, 1239 KW_no_damage,
1242 KW_obj_original, 1240 KW_obj_original,
1243 KW_NULL, 1241 KW_NULL,
1244 KW_activate_on_push, 1242 KW_activate_on_push,
1245 KW_activate_on_release, 1243 KW_activate_on_release,
1246 KW_is_water, 1244 KW_is_water,
1247 KW_use_content_on_gen, 1245 KW_use_content_on_gen,
1248 KW_NULL, 1246 KW_NULL,
1247 /* 110 */
1249 KW_is_buildable, 1248 KW_is_buildable,
1250 /* 110 */
1251 KW_destroy_on_death, 1249 KW_destroy_on_death,
1252 KW_NULL, 1250 KW_NULL,
1253 }; 1251 };
1254 1252
1255 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;
1256 1264
1257 /* 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
1258 * keys that match field names will be overwritten by the loader. 1266 * keys that match field names will be overwritten by the loader.
1259 */ 1267 */
1260 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)
1261 { 1269 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1262 /* Find the field in the opposing member. */ 1270 f.put (kv->key, kv->value);
1263 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1264 1271
1265 /* If there's no partnering field, or it's got a different value, save our field. */ 1272 if (op->uuid)
1266 if (!arch_field || my_field->value != arch_field->value)
1267 f.put (my_field->key, my_field->value);
1268 } 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;
1269 1277
1270 /* We don't need to worry about the arch's extra fields - they 1278 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1271 * will get taken care of the copy_to method. 1279 ptr += sizeof ("uuid ") - 1;
1272 */ 1280 ptr = op->uuid.append (ptr);
1281 *ptr++ = '\n';
1273 1282
1274 { 1283 f.alloc (ptr - cur);
1275 char uids[64];
1276 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1277 f.put (KW_uuid, (const char *)uids);
1278 } 1284 }
1279 1285
1280#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)
1281#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);
1282 1295
1283 CMP_OUT (name); 1296 CMP_OUT (name);
1284 CMP_OUT (name_pl); 1297 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1298
1299 CMP_OUT (speed);
1300 CMP_OUT (speed_left);
1301
1286 CMP_OUT (title); 1302 CMP_OUT (title);
1287 CMP_OUT (race); 1303 CMP_OUT (race);
1288 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1305 CMP_OUT (skill);
1289 1306
1290 if (op->msg != tmp->msg) 1307 CMP_OUT (tag);
1291 f.put (KW_msg, KW_endmsg, op->msg); 1308 CMP_OUT (custom_name);
1292 if (op->lore != tmp->lore) 1309
1293 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
1294 1314
1295 CMP_OUT (other_arch); 1315 CMP_OUT (other_arch);
1296 1316
1297 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);
1298 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
1299 if (op->animation_id != tmp->animation_id) 1324 if (op->animation_id != arch->animation_id)
1300 if (op->animation_id) 1325 if (op->has_anim ())
1326 f.put (KW_animation, op->anim ().name);
1327 else
1301 { 1328 {
1302 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1329 f.put (KW_animation, (const char *)0);
1303 1330 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1304 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1305 f.put (KW_is_animated, (sint32) 0);
1306 } 1331 }
1307 else
1308 f.put (KW_animation, (const char *) 0);
1309 1332
1310 CMP_OUT2 (str, stats.Str); 1333 CMP_OUT2 (str, stats.Str);
1311 CMP_OUT2 (dex, stats.Dex); 1334 CMP_OUT2 (dex, stats.Dex);
1312 CMP_OUT2 (con, stats.Con); 1335 CMP_OUT2 (con, stats.Con);
1313 CMP_OUT2 (wis, stats.Wis); 1336 CMP_OUT2 (wis, stats.Wis);
… …
1322 CMP_OUT2 (grace, stats.grace); 1345 CMP_OUT2 (grace, stats.grace);
1323 CMP_OUT2 (maxgrace, stats.maxgrace); 1346 CMP_OUT2 (maxgrace, stats.maxgrace);
1324 CMP_OUT2 (exp, stats.exp); 1347 CMP_OUT2 (exp, stats.exp);
1325 1348
1326 CMP_OUT (perm_exp); 1349 CMP_OUT (perm_exp);
1327 CMP_OUT (expmul); 1350 //CMP_OUT (expmul);
1328 1351
1329 CMP_OUT2 (food, stats.food); 1352 CMP_OUT2 (food, stats.food);
1330 CMP_OUT2 (dam, stats.dam); 1353 CMP_OUT2 (dam, stats.dam);
1331 CMP_OUT2 (luck, stats.luck); 1354 CMP_OUT2 (luck, stats.luck);
1332 CMP_OUT2 (wc, stats.wc); 1355 CMP_OUT2 (wc, stats.wc);
1333 CMP_OUT2 (ac, stats.ac); 1356 CMP_OUT2 (ac, stats.ac);
1334 1357
1335 CMP_OUT (x);
1336 CMP_OUT (y);
1337 CMP_OUT (speed);
1338 CMP_OUT (speed_left);
1339 CMP_OUT2 (move_state, move_status); 1358 CMP_OUT2 (move_state, move_status);
1340 CMP_OUT (attack_movement); 1359 CMP_OUT (attack_movement);
1341 CMP_OUT (nrof); 1360 CMP_OUT (nrof);
1342 CMP_OUT (level); 1361 CMP_OUT (level);
1343 CMP_OUT (direction);
1344 CMP_OUT (type);
1345 CMP_OUT (subtype);
1346 CMP_OUT (attacktype); 1362 CMP_OUT (attacktype);
1347 1363
1364 // using memcmp here seems to be a loss - us gcc vectorising?
1348 for (i = 0; i < NROFATTACKS; i++) 1365 for (int i = 0; i < NROFATTACKS; i++)
1349 if (op->resist[i] != tmp->resist[i]) 1366 if (expect_false (op->resist[i] != arch->resist[i]))
1350 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1351 1368
1352 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1353 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1354 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
… …
1364 CMP_OUT (last_sp); 1381 CMP_OUT (last_sp);
1365 CMP_OUT (last_grace); 1382 CMP_OUT (last_grace);
1366 CMP_OUT (last_eat); 1383 CMP_OUT (last_eat);
1367 CMP_OUT (glow_radius); 1384 CMP_OUT (glow_radius);
1368 1385
1369 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 ()))
1370 f.put (KW_connected, i); 1388 f.put (KW_connected, ol->id);
1371 1389
1372 CMP_OUT (randomitems); 1390 CMP_OUT (randomitems);
1373 CMP_OUT2 (container, weight_limit); 1391 CMP_OUT2 (container, weight_limit);
1374 1392
1375 CMP_OUT (run_away); 1393 CMP_OUT (run_away);
1376 CMP_OUT (pick_up); 1394 CMP_OUT (pick_up);
1377 CMP_OUT (will_apply); 1395 CMP_OUT (will_apply);
1378 CMP_OUT (smoothlevel); 1396 CMP_OUT (smoothlevel);
1379 CMP_OUT (weapontype); 1397 CMP_OUT (weapontype);
1380 CMP_OUT (tooltype);
1381 CMP_OUT (elevation);
1382 CMP_OUT (client_type); 1398 CMP_OUT (client_type);
1383 CMP_OUT (item_power); 1399 CMP_OUT (item_power);
1384 CMP_OUT (duration); 1400 CMP_OUT (duration);
1385 CMP_OUT (range); 1401 CMP_OUT (range);
1386 CMP_OUT (range_modifier); 1402 CMP_OUT (range_modifier);
… …
1394 CMP_OUT (move_on); 1410 CMP_OUT (move_on);
1395 CMP_OUT (move_off); 1411 CMP_OUT (move_off);
1396 CMP_OUT (move_slow); 1412 CMP_OUT (move_slow);
1397 CMP_OUT (move_slow_penalty); 1413 CMP_OUT (move_slow_penalty);
1398 1414
1399 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 ()))
1400 for (i = 0; i <= NUM_FLAGS; i++) 1424 for (int i = 0; i < NUM_FLAGS; i++)
1401 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1425 if (expect_false (diff [i]))
1402 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1403 1427
1404 // save body locations 1428 // save body locations. gcc's memcmp does an abysmal job when used
1405 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1406 if (op->slot[i].info != tmp->slot[i].info) 1430 if (expect_false (op->slot[i].info != arch->slot[i].info))
1407 f.put (body_locations[i].save_name, op->slot[i].info); 1431 f.put (body_locations[i].save_name, op->slot[i].info);
1408} 1432}
1409 1433
1410/* 1434/*
1411 * Dumps all variables in an object to a file. 1435 * Dumps all variables in an object to a file.
… …
1413 * 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.
1414 */ 1438 */
1415bool 1439bool
1416object::write (object_freezer &f) 1440object::write (object_freezer &f)
1417{ 1441{
1418 /* Even if the object does have an owner, it would seem that we should 1442 if (is_arch ())
1419 * still save it. 1443 {
1420 */ 1444 f.put (KW_object, arch->archname);
1421 if (owner) 1445 write_diff (f, this, archetype::empty);
1422 return true; 1446 }
1423 1447 else
1424 archetype *at = arch ? (archetype *)arch : empty_archetype; 1448 {
1425
1426 f.put (KW_arch, at->name); 1449 f.put (KW_arch, arch->archname);
1427 write_diff (f, this, &at->clone); 1450 write_diff (f, this, arch);
1451 }
1428 1452
1429 for (object *tmp = inv; tmp; tmp = tmp->below) 1453 for (object *tmp = inv; tmp; tmp = tmp->below)
1430 tmp->write (f); 1454 tmp->write (f);
1431 1455
1432 f.put (this); 1456 f.put (this);
… …
1437 1461
1438///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
1439 1463
1440// generic resource file load, 1464// generic resource file load,
1441// currently supports: region, treasures, archetypes 1465// currently supports: region, treasures, archetypes
1466bool
1442bool load_resource_file (const char *filename) 1467load_resource_file_ (const char *filename)
1443{ 1468{
1444 object_thawer f (filename); 1469 object_thawer f (filename);
1445
1446 bool success = false;
1447 bool seen_arch = false;
1448
1449 f.next ();
1450 1470
1451 for (;;) 1471 for (;;)
1452 { 1472 {
1453 switch (f.kw) 1473 switch (f.kw)
1454 { 1474 {
1455 case KW_region: 1475 case KW_region:
1456 if (!region::read (f)) 1476 if (!region::read (f))
1457 goto finish; 1477 return false;
1458 break; 1478 break;
1459 1479
1460 case KW_treasure: 1480 case KW_treasure:
1461 case KW_treasureone: 1481 case KW_treasureone:
1462 if (!treasurelist::read (f)) 1482 if (!treasurelist::read (f))
1463 goto finish; 1483 return false;
1464 break; 1484 break;
1465 1485
1466 case KW_object: 1486 case KW_object:
1467 seen_arch = true;
1468 if (!archetype::read (f)) 1487 if (!archetype::read (f))
1469 goto finish; 1488 return false;
1470 break; 1489 break;
1471 1490
1472 case KW_EOF: 1491 case KW_EOF:
1473 success = true; 1492 return true;
1474 goto finish;
1475 1493
1476 default: 1494 default:
1477 if (!f.parse_error ("resource file")) 1495 if (!f.parse_error ("resource file"))
1478 goto finish; 1496 return false;
1479 1497
1480 f.next (); 1498 f.next ();
1481 break; 1499 break;
1482 } 1500 }
1483 } 1501 }
1484
1485finish:
1486 if (seen_arch)
1487 init_archetype_pointers ();
1488
1489 return success;
1490} 1502}
1491 1503

Diff Legend

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