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.101 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.134 by root, Mon Oct 12 14:00:57 2009 UTC

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

Diff Legend

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