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.104 by elmex, Thu Nov 8 12:10:47 2007 UTC vs.
Revision 1.133 by root, Wed Sep 23 04:07:52 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 23
28#include <global.h> 24#include <global.h>
29#include <loader.h> 25#include <loader.h>
30#include <sproto.h> 26#include <sproto.h>
31 27
… …
261void 257void
262object::post_load_check () 258object::post_load_check ()
263{ 259{
264 if (type >= NUM_TYPES) 260 if (type >= NUM_TYPES)
265 { 261 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 262 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 263 type = 0;
268 } 264 }
269 265
270 switch (type) 266 switch (type)
271 { 267 {
… …
273 case WAND: 269 case WAND:
274 case ROD: 270 case ROD:
275 case HORN: 271 case HORN:
276 if (slot [body_range].info != -1) 272 if (slot [body_range].info != -1)
277 { 273 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 274 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1; 275 slot [body_range].info = -1;
280 } 276 }
281 break; 277 break;
282 278
283 case WEAPON: 279 case WEAPON:
284 if (slot [body_combat].info != -1) 280 if (slot [body_combat].info != -1)
285 { 281 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 282 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1; 283 slot [body_combat].info = -1;
288 } 284 }
289 break; 285 break;
290 286
291 case SHIELD: 287 case SHIELD:
292 if (slot [body_shield].info != -1) 288 if (slot [body_shield].info != -1)
293 { 289 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 290 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1; 291 slot [body_shield].info = -1;
296 } 292 }
297 break; 293 break;
298 294
299 case PLAYER: 295 case PLAYER:
300 if (slot [body_shield].info != 1) 296 if (slot [body_shield].info != 1)
301 { 297 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 298 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1; 299 slot [body_shield].info = 1;
304 } 300 }
305 301
306 if (slot [body_combat].info != 1) 302 if (slot [body_combat].info != 1)
307 { 303 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 304 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1; 305 slot [body_combat].info = 1;
310 } 306 }
311 307
312 if (slot [body_range].info != 1) 308 if (slot [body_range].info != 1)
313 { 309 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 310 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1; 311 slot [body_range].info = 1;
316 } 312 }
317 break; 313 break;
318 } 314 }
319 315
… …
342 * not in the ideal fashion. 338 * not in the ideal fashion.
343 */ 339 */
344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
345 { 341 {
346 if (!skill) 342 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 344 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 345 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
351 } 347 }
352 348
353 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 351 * that may have an old value.
… …
361 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
363 { 359 {
364 if (last_heal) 360 if (last_heal)
365 { 361 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
368 last_heal = 0; 364 last_heal = 0;
369 } 365 }
370 366
371 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
372 368
373 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 370 if (!item_power && ip)
375 { 371 {
376 if (ip > 3) 372 if (ip > 3)
377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 373 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
378 374
379 item_power = ip; 375 item_power = ip;
380 } 376 }
381 377
382 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 387#endif
392 } 388 }
393 389
394 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 403 {
404 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 406 * in that spell was stored in sp.
401 */ 407 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
405 } 412 }
406 413
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 416 {
417 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 422 value = arch->value * inv->value;
415 } 423 }
416 424
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 426 {
419 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
420 { 428 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 429 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
423 } 431 }
424 432
425 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
426 if (move_type == 0) 434 if (move_type == 0)
427 move_type = MOVE_WALK; 435 move_type = MOVE_WALK;
428 } 436 }
429 437
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 438 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 439 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 440 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 441 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 442 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 443 */
444 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 445 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 446
440 /* Handle player movers. We use move_type for player movers 447 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 448 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 449 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 450 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 451 * are doing, otherwise, set move_type based on maxhp value.
445 */ 452 */
446 if (type == PLAYERMOVER) 453 if (type == PLAYERMOVER)
447 { 454 {
448 if (!move_type) 455 if (!move_type)
… …
453 stats.maxhp = 0; 460 stats.maxhp = 0;
454 } 461 }
455 else 462 else
456 move_type = MOVE_WALK; 463 move_type = MOVE_WALK;
457 } 464 }
465 }
466
467 // if the object has an animation, try to provide a default face
468 if (has_anim ())
469 {
470 const animation &anim_ob = anim ();
471
472 if (anim_speed)
473 // if this item is time-animated, force the last frame
474 animate_object (this, 0);
475 else if (flag [FLAG_MONSTER])
476 // if it is a monster, set appropriate facing
477 animate_object (this, direction);
458 } 478 }
459} 479}
460 480
461static void 481static void
462set_move (MoveType &mt, const char *str) 482set_move (MoveType &mt, const char *str)
… …
510 530
511 goto next; 531 goto next;
512 } 532 }
513 } 533 }
514 534
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 535 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 536
517next: ; 537next: ;
518 } 538 }
519} 539}
520 540
… …
522 542
523bool 543bool
524object::parse_kv (object_thawer &f) 544object::parse_kv (object_thawer &f)
525{ 545{
526 object *op_inv = inv; 546 object *op_inv = inv;
547 key_value *last_kv = key_values;
527 548
528 for (;;) 549 for (;;)
529 { 550 {
530 switch (f.kw) 551 switch (f.kw)
531 { 552 {
532 case KW_uuid: 553 case KW_uuid:
533 if (const char *s = f.get_str ()) 554 if (const char *s = f.get_str ())
534 { 555 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 556 {
540 uuid.seq = seq; 557 f.parse_warn ("unparseable uuid");
541 break; 558 uuid = UUID::gen ();
542 } 559 }
543 }
544
545 uuid = gen_uuid ();
546 break; 560 break;
547 561
548 case KW_oid: 562 case KW_oid:
549 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
550 break; 564 break;
… …
559 case KW_race: f.get_ornull (race); break; 573 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 574 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break; 575 case KW_tag: f.get_ornull (tag); break;
562 576
563 case KW_arch: 577 case KW_arch:
564 {
565 object *tmp = object::read (f); 578 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 579 {
580 tmp->deactivate ();
581
569 // was: insert_ob_in_ob (tmp, op); 582 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 583 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 584 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 585 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects 586 // and finally we do not want any funny effects
… …
590 603
591 tmp->below = 0; 604 tmp->below = 0;
592 tmp->env = this; 605 tmp->env = this;
593 op_inv = tmp; 606 op_inv = tmp;
594 } 607 }
595 } 608 else
609 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
610
596 continue; 611 continue;
597 612
598 case KW_other_arch: 613 case KW_other_arch:
599 other_arch =
600 loading_arch 614 if (loading_arch == this)
601 ? archetype::get (f.get_str ()) 615 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
616 else
617 {
602 : archetype::find (f.get_str ()); 618 other_arch = archetype::find (f.get_str ());
603 619
604 if (!other_arch) 620 if (!other_arch)
605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 621 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
622 }
606 break; 623 break;
607 624
608 case KW_owner: 625 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ()); 626 f.delayed_deref (this, owner, f.get_str ());
610 break; 627 break;
… …
614 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
615 animation_id = 0; 632 animation_id = 0;
616 633
617 const char *str = f.get_str (); 634 const char *str = f.get_str ();
618 if (str && (animation_id = find_animation (str))) 635 if (str && (animation_id = find_animation (str)))
619 SET_FLAG (this, FLAG_ANIMATE); 636 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
620 } 637 }
621 break; 638 break;
622 639
623 case KW_last_heal: f.get (last_heal); break; 640 case KW_last_heal: f.get (last_heal); break;
624 case KW_last_sp: f.get (last_sp); break; 641 case KW_last_sp: f.get (last_sp); break;
… …
813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 830 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
814 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 831 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 832 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 833 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
817 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 834 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
835 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
818 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 836 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
819 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 837 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
820 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 838 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
821 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 839 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
822 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 840 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
922 case KW_anim_speed: f.get (anim_speed); break; 940 case KW_anim_speed: f.get (anim_speed); break;
923 case KW_container: f.get (weight_limit); break; 941 case KW_container: f.get (weight_limit); break;
924 case KW_will_apply: f.get (will_apply); break; 942 case KW_will_apply: f.get (will_apply); break;
925 case KW_attack_movement: f.get (attack_movement); break; 943 case KW_attack_movement: f.get (attack_movement); break;
926 case KW_move_state: f.get (move_status); break; 944 case KW_move_state: f.get (move_status); break;
927 case KW_expmul: f.get (expmul); break; 945 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
928 case KW_glow_radius: f.get (glow_radius); break; 946 case KW_glow_radius: f.get (glow_radius); break;
929 case KW_weapontype: f.get (weapontype); break; 947 case KW_weapontype: f.get (weapontype); break;
930 case KW_tooltype: f.get (tooltype); break;
931 case KW_casting_time: f.get (casting_time); break; 948 case KW_casting_time: f.get (casting_time); break;
949
950 // elevation is deprecated
932 case KW_elevation: f.get (elevation); break; 951 case KW_elevation: break;
952
933 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 953 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
934 case KW_client_type: f.get (client_type); break; 954 case KW_client_type: f.get (client_type); break;
935 case KW_duration: f.get (duration); break; 955 case KW_duration: f.get (duration); break;
936 case KW_range: f.get (range); break; 956 case KW_range: f.get (range); break;
937 case KW_range_modifier: f.get (range_modifier); break; 957 case KW_range_modifier: f.get (range_modifier); break;
… …
956 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 976 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
957 case KW_can_apply: 977 case KW_can_apply:
958 break; 978 break;
959 979
960 case KW_connected: 980 case KW_connected:
961 add_button_link (this, map, f.get_sint32 ()); 981 {
982 shstr connected;
983
984 f.get (connected);
985 add_link (map, connected);
986 }
962 break; 987 break;
963 988
964 case KW_randomitems: 989 case KW_randomitems:
965 if (f.get_str ()) 990 if (f.get_str ())
966 { 991 {
… …
994 1019
995 f.next (); 1020 f.next ();
996 return true; 1021 return true;
997 1022
998 case KW_ERROR: 1023 case KW_ERROR:
999 set_ob_key_value (this, f.kw_str, f.value, true); 1024 // append as key value pair (do not use kv_set as it prepends)
1025 // we also do not even try to find old values, duplicate keys stay duplicate
1026 {
1027 key_value *kv = new key_value;
1028
1029 kv->next = 0;
1030 kv->key = shstr (f.kw_str);
1031 kv->value = shstr (f.value);
1032
1033 if (!last_kv)
1034 key_values = last_kv = kv;
1035 else
1036 {
1037 while (last_kv->next)
1038 last_kv = last_kv->next;
1039
1040 last_kv->next = kv;
1041 last_kv = kv;
1042 }
1043 }
1000 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1044 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1001 break; 1045 break;
1002 1046
1003 default: 1047 default:
1004 if (!f.parse_error ("object", name)) 1048 if (!f.parse_error ("object", name))
… …
1025 1069
1026 assert (arch); //D maybe use exception handling of sorts? 1070 assert (arch); //D maybe use exception handling of sorts?
1027 1071
1028 f.next (); 1072 f.next ();
1029 1073
1030 object *op = object::create (); 1074 object *op = arch->instance ();
1031
1032 op->map = map; 1075 op->map = map;
1033 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1076 // instance() activates, this should be fixed properly
1035 op->deactivate (); 1077 op->deactivate ();
1036 1078
1037 if (!op->parse_kv (f)) 1079 if (!op->parse_kv (f))
1038 { 1080 {
1039 op->destroy (true); 1081 op->destroy ();
1040 return 0; 1082 return 0;
1041 } 1083 }
1042 1084
1043 op->post_load_check (); 1085 op->post_load_check ();
1044 return op; 1086 return op;
… …
1249 /* 110 */ 1291 /* 110 */
1250 KW_destroy_on_death, 1292 KW_destroy_on_death,
1251 KW_NULL, 1293 KW_NULL,
1252 }; 1294 };
1253 1295
1254 int i;
1255
1256 /* This saves the key/value lists. We do it first so that any 1296 /* This saves the key/value lists. We do it first so that any
1257 * keys that match field names will be overwritten by the loader. 1297 * keys that match field names will be overwritten by the loader.
1258 */ 1298 */
1259 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1299 for (key_value *kv = op->key_values; kv; kv = kv->next)
1260 { 1300 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1261 /* Find the field in the opposing member. */ 1301 f.put (kv->key, kv->value);
1262 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1263
1264 /* If there's no partnering field, or it's got a different value, save our field. */
1265 if (!arch_field || my_field->value != arch_field->value)
1266 f.put (my_field->key, my_field->value);
1267 }
1268 1302
1269 /* We don't need to worry about the arch's extra fields - they 1303 /* We don't need to worry about the arch's extra fields - they
1270 * will get taken care of the copy_to method. 1304 * will get taken care of the copy_to method.
1271 */ 1305 */
1272 1306
1273 { 1307 if (op->uuid)
1274 char uids[64]; 1308 f.put (KW_uuid, op->uuid.c_str ());
1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1276 f.put (KW_uuid, (const char *)uids);
1277 }
1278 1309
1279#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1310#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1280#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1311#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1281 1312
1282 if (object *owner = op->owner) 1313 if (object *owner = op->owner)
… …
1285 CMP_OUT (name); 1316 CMP_OUT (name);
1286 CMP_OUT (name_pl); 1317 CMP_OUT (name_pl);
1287 CMP_OUT (custom_name); 1318 CMP_OUT (custom_name);
1288 CMP_OUT (title); 1319 CMP_OUT (title);
1289 CMP_OUT (race); 1320 CMP_OUT (race);
1321 CMP_OUT (skill);
1290 CMP_OUT (slaying); 1322 CMP_OUT (slaying);
1291 CMP_OUT (tag); 1323 CMP_OUT (tag);
1292 CMP_OUT (other_arch); 1324 CMP_OUT (other_arch);
1293 1325
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1326 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1329 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1330 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1331 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1332
1301 if (op->animation_id != tmp->animation_id) 1333 if (op->animation_id != tmp->animation_id)
1302 if (op->animation_id) 1334 if (op->has_anim ())
1335 f.put (KW_animation, op->anim ().name);
1336 else
1303 { 1337 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1338 f.put (KW_animation, (const char *)0);
1305 1339 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0);
1308 } 1340 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1341
1312 CMP_OUT2 (str, stats.Str); 1342 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1343 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1344 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1345 CMP_OUT2 (wis, stats.Wis);
… …
1345 CMP_OUT (direction); 1375 CMP_OUT (direction);
1346 CMP_OUT (type); 1376 CMP_OUT (type);
1347 CMP_OUT (subtype); 1377 CMP_OUT (subtype);
1348 CMP_OUT (attacktype); 1378 CMP_OUT (attacktype);
1349 1379
1350 for (i = 0; i < NROFATTACKS; i++) 1380 for (int i = 0; i < NROFATTACKS; i++)
1351 if (expect_false (op->resist[i] != tmp->resist[i])) 1381 if (expect_false (op->resist[i] != tmp->resist[i]))
1352 f.put (resist_save[i], op->resist[i]); 1382 f.put (resist_save[i], op->resist[i]);
1353 1383
1354 CMP_OUT (path_attuned); 1384 CMP_OUT (path_attuned);
1355 CMP_OUT (path_repelled); 1385 CMP_OUT (path_repelled);
… …
1366 CMP_OUT (last_sp); 1396 CMP_OUT (last_sp);
1367 CMP_OUT (last_grace); 1397 CMP_OUT (last_grace);
1368 CMP_OUT (last_eat); 1398 CMP_OUT (last_eat);
1369 CMP_OUT (glow_radius); 1399 CMP_OUT (glow_radius);
1370 1400
1371 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1401 if (op->flag [FLAG_IS_LINKED])
1402 if (auto (ol, op->find_link ()))
1372 f.put (KW_connected, i); 1403 f.put (KW_connected, ol->id);
1373 1404
1374 CMP_OUT (randomitems); 1405 CMP_OUT (randomitems);
1375 CMP_OUT2 (container, weight_limit); 1406 CMP_OUT2 (container, weight_limit);
1376 1407
1377 CMP_OUT (run_away); 1408 CMP_OUT (run_away);
1378 CMP_OUT (pick_up); 1409 CMP_OUT (pick_up);
1379 CMP_OUT (will_apply); 1410 CMP_OUT (will_apply);
1380 CMP_OUT (smoothlevel); 1411 CMP_OUT (smoothlevel);
1381 CMP_OUT (weapontype); 1412 CMP_OUT (weapontype);
1382 CMP_OUT (tooltype);
1383 CMP_OUT (elevation);
1384 CMP_OUT (client_type); 1413 CMP_OUT (client_type);
1385 CMP_OUT (item_power); 1414 CMP_OUT (item_power);
1386 CMP_OUT (duration); 1415 CMP_OUT (duration);
1387 CMP_OUT (range); 1416 CMP_OUT (range);
1388 CMP_OUT (range_modifier); 1417 CMP_OUT (range_modifier);
… …
1397 CMP_OUT (move_off); 1426 CMP_OUT (move_off);
1398 CMP_OUT (move_slow); 1427 CMP_OUT (move_slow);
1399 CMP_OUT (move_slow_penalty); 1428 CMP_OUT (move_slow_penalty);
1400 1429
1401 if (op->flag != tmp->flag) 1430 if (op->flag != tmp->flag)
1402 for (i = 0; i <= NUM_FLAGS; i++) 1431 for (int i = 0; i <= NUM_FLAGS; i++)
1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1432 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1404 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1433 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1405 1434
1406 // save body locations 1435 // save body locations
1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1436 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1408 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1437 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1409 f.put (body_locations[i].save_name, op->slot[i].info); 1438 f.put (body_locations[i].save_name, op->slot[i].info);
1410} 1439}
1411 1440
1412/* 1441/*
… …
1415 * the only place this is not set is when saving the player. 1444 * the only place this is not set is when saving the player.
1416 */ 1445 */
1417bool 1446bool
1418object::write (object_freezer &f) 1447object::write (object_freezer &f)
1419{ 1448{
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1449 if (is_arch ())
1421 1450 {
1451 f.put (KW_object, arch->archname);
1452 write_diff (f, this, archetype::empty);
1453 }
1454 else
1455 {
1422 f.put (KW_arch, at->archname); 1456 f.put (KW_arch, arch->archname);
1423 write_diff (f, this, at); 1457 write_diff (f, this, arch);
1458 }
1424 1459
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1460 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1461 tmp->write (f);
1427 1462
1428 f.put (this); 1463 f.put (this);
… …
1433 1468
1434///////////////////////////////////////////////////////////////////////////// 1469/////////////////////////////////////////////////////////////////////////////
1435 1470
1436// generic resource file load, 1471// generic resource file load,
1437// currently supports: region, treasures, archetypes 1472// currently supports: region, treasures, archetypes
1473bool
1438bool load_resource_file (const char *filename) 1474load_resource_file_ (const char *filename)
1439{ 1475{
1440 object_thawer f (filename); 1476 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444 1477
1445 for (;;) 1478 for (;;)
1446 { 1479 {
1447 switch (f.kw) 1480 switch (f.kw)
1448 { 1481 {
1449 case KW_region: 1482 case KW_region:
1450 if (!region::read (f)) 1483 if (!region::read (f))
1451 goto finish; 1484 return false;
1452 break; 1485 break;
1453 1486
1454 case KW_treasure: 1487 case KW_treasure:
1455 case KW_treasureone: 1488 case KW_treasureone:
1456 if (!treasurelist::read (f)) 1489 if (!treasurelist::read (f))
1457 goto finish; 1490 return false;
1458 break; 1491 break;
1459 1492
1460 case KW_object: 1493 case KW_object:
1461 seen_arch = true;
1462 if (!archetype::read (f)) 1494 if (!archetype::read (f))
1463 goto finish; 1495 return false;
1464 break; 1496 break;
1465 1497
1466 case KW_EOF: 1498 case KW_EOF:
1467 success = true; 1499 return true;
1468 goto finish;
1469 1500
1470 default: 1501 default:
1471 if (!f.parse_error ("resource file")) 1502 if (!f.parse_error ("resource file"))
1472 goto finish; 1503 return false;
1473 1504
1474 f.next (); 1505 f.next ();
1475 break; 1506 break;
1476 } 1507 }
1477 } 1508 }
1478
1479finish:
1480 if (seen_arch)
1481 init_archetype_pointers ();
1482
1483 return success;
1484} 1509}
1485 1510

Diff Legend

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