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.23 by root, Fri Dec 15 19:59:19 2006 UTC vs.
Revision 1.58 by root, Thu Feb 15 21:07:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27 28
28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32
33/////////////////////////////////////////////////////////////////////////////
32 34
33/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35 37
36/* This table is only necessary to convert objects that existed before the 38/* This table is only necessary to convert objects that existed before the
… …
261 * to check for objects to make sure there are no common errors. 263 * to check for objects to make sure there are no common errors.
262 */ 264 */
263static void 265static void
264check_loaded_object (object *op) 266check_loaded_object (object *op)
265{ 267{
266 int ip;
267
268 /* We do some specialized handling to handle legacy cases of name_pl. 268 /* We do some specialised handling to handle legacy cases of name_pl.
269 * If the object doesn't have a name_pl, we just use the object name - 269 * If the object doesn't have a name_pl, we just use the object name -
270 * this isn't perfect (things won't be properly pluralized), but works to 270 * this isn't perfect (things won't be properly pluralised), but works to
271 * that degree (5 heart is still quite understandable). But the case we 271 * that degree (5 heart is still quite understandable). But the case we
272 * also have to catch is if this object is not using the normal name for 272 * also have to catch is if this object is not using the normal name for
273 * the object. In that case, we also want to use the loaded name. 273 * the object. In that case, we also want to use the loaded name.
274 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 276 */
277 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 277 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
278 op->name_pl = NULL; 278 op->name_pl = 0;
279 279
280 if (!op->name_pl) 280 if (!op->name_pl)
281 op->name_pl = op->name; 281 op->name_pl = op->name;
282 282
283 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
284 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
285 { 285 {
286 if (op->map != NULL) 286 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
288 else 288 else
289 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
290 } 290 }
291
291 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
292 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
293 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
294 * not in the ideal fashion. 295 * not in the ideal fashion.
295 */ 296 */
296 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
297 { 298 {
298 if (!op->skill) 299 if (!op->skill)
299 {
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
301 }
302 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 301 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
303 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
304 {
305 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 303 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
306 }
307 } 304 }
308 305
309 /* We changed last_heal to gen_sp_armour, which is what it 306 /* We changed last_heal to gen_sp_armour, which is what it
310 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
311 * that may have an old value. 308 * that may have an old value.
312 */ 309 */
313 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
314 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
315 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
316 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
317 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 314 || op->type == AMULET || op->type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK)
318 { 316 {
319 if (op->last_heal) 317 if (op->last_heal)
320 { 318 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 319 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 321 op->last_heal = 0;
324 } 322 }
325 if (editor) 323
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
329 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 327 if (!op->item_power && ip)
331 { 328 {
332 if (ip > 3) 329 if (ip > 3)
333 {
334 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 330 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
335 } 331
336 op->item_power = ip; 332 op->item_power = ip;
337 } 333 }
334
338 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
339 * something that has item_power 1 is probably just fine if our calculated 336 * something that has item_power 1 is probably just fine if our calculated
340 * value is 1 or 2 - these values are small enough that hard to be precise. 337 * value is 1 or 2 - these values are small enough that hard to be precise.
341 * similarly, it item_power is 0, the first check will always pass, 338 * similarly, it item_power is 0, the first check will always pass,
342 * but not the second one. 339 * but not the second one.
343 */ 340 */
344 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
345 {
346 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 342 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
347 }
348
349 } 343 }
344
350 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
351 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 346 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
352 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 347 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
353 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 348 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
354 { 349 {
355 object *tmp;
356
357 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 350 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
358 * in that spell was stored in sp. 351 * in that spell was stored in sp.
359 */ 352 */
360 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 353 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
361 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
362 op->randomitems = NULL; /* So another spell isn't created for this object */ 355 op->randomitems = NULL; /* So another spell isn't created for this object */
363 } 356 }
357
364 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 358 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
365
366 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
367 { 360 {
368 object *tmp;
369
370 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
371 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
372 op->randomitems = NULL; /* So another spell isn't created for this object */ 363 op->randomitems = NULL; /* So another spell isn't created for this object */
373 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
374 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
375 } 366 }
376 367
377 if (QUERY_FLAG (op, FLAG_MONSTER)) 368 if (QUERY_FLAG (op, FLAG_MONSTER))
378 { 369 {
379 if (op->stats.hp > op->stats.maxhp) 370 if (op->stats.hp > op->stats.maxhp)
371 {
380 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 372 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
373 op->stats.maxhp = op->stats.hp;
374 }
381 375
382 /* The archs just need to be updated for this */ 376 /* The archs just need to be updated for this */
383 if (op->move_type == 0) 377 if (op->move_type == 0)
384 op->move_type = MOVE_WALK; 378 op->move_type = MOVE_WALK;
385 } 379 }
… …
408 { 402 {
409 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
410 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
411 } 405 }
412 else 406 else
413 {
414 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
415 }
416 } 408 }
417 } 409 }
418 410
419} 411}
420 412
… …
487 SET_FLAG (op, flag); \ 479 SET_FLAG (op, flag); \
488 else \ 480 else \
489 CLEAR_FLAG (op, flag) \ 481 CLEAR_FLAG (op, flag) \
490 482
491int 483int
492parse_object (object *op, object_thawer & thawer, int map_flags) 484parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 485{
494 bool ismore = 0; 486 bool ismore = 0;
495 object *op_inv = op->inv; 487 object *op_inv = op->inv;
496 488
497 for (;;) 489 for (;;)
498 { 490 {
499 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
500
501 switch (kw)
502 { 492 {
503 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
504 case KW_object: 494 case KW_object:
505 thawer.get (op->name); 495 thawer.get (op->name);
506 496
507 if (op->arch != NULL) 497 if (op->arch)
508 op->arch->name = op->name; 498 op->arch->name = op->name;
509 499
510 break; 500 break;
511 501
512 case KW_uuid: 502 case KW_uuid:
… …
551 */ 541 */
552 archetype *arch = archetype::find (str); 542 archetype *arch = archetype::find (str);
553 543
554 object *tmp; 544 object *tmp;
555 545
556 if (arch != NULL) 546 if (arch)
557 tmp = arch_to_object (arch); 547 tmp = arch_to_object (arch);
558 else 548 else
559 { 549 {
560 tmp = object::create (); 550 tmp = object::create ();
561 /* record the name of the broken object */ 551 /* record the name of the broken object */
552 //TODO: but do not log???
562 tmp->name = str; 553 tmp->name = str;
563 } 554 }
555
556 // decativate the object we, as we are still going
557 // to read the speed value. Objects should be activated
558 // when the map, object or player is completly loaded.
559 tmp->deactivate ();
564 560
565 parse_object (tmp, thawer, map_flags); 561 parse_object (tmp, thawer, map_flags);
566 562
567 if (tmp->arch) 563 if (tmp->arch)
568 { 564 {
… …
601 { 597 {
602 /* This is the actual archetype definition then */ 598 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 599 op->arch = archetype::find (str);
604 600
605 if (op->arch) 601 if (op->arch)
602 {
606 op->arch->clone.copy_to (op); 603 op->arch->clone.copy_to (op);
604 // copy_to activates, this should be fixed properly
605 op->deactivate ();
606 }
607 else if (!arch_init) 607 else if (!arch_init)
608 /* record the name of the broken object */ 608 /* record the name of the broken object */
609 op->name = str; 609 op->name = str;
610 } 610 }
611 } 611 }
… …
615 op->other_arch = archetype::find (thawer.get_str ()); 615 op->other_arch = archetype::find (thawer.get_str ());
616 break; 616 break;
617 617
618 case KW_animation: 618 case KW_animation:
619 { 619 {
620 CLEAR_FLAG (op, FLAG_ANIMATE);
621 op->animation_id = 0;
622
620 const char *str = thawer.get_str (); 623 const char *str = thawer.get_str ();
621
622 if (!str)
623 {
624 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE);
626 }
627 else
628 {
629 op->animation_id = find_animation (str); 624 if (str && (op->animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 625 SET_FLAG (op, FLAG_ANIMATE);
631 }
632 } 626 }
633
634 break; 627 break;
635 628
636 case KW_last_heal: thawer.get (op->last_heal); break; 629 case KW_last_heal: thawer.get (op->last_heal); break;
637 case KW_last_sp: thawer.get (op->last_sp); break; 630 case KW_last_sp: thawer.get (op->last_sp); break;
638 case KW_last_grace: thawer.get (op->last_grace); break; 631 case KW_last_grace: thawer.get (op->last_grace); break;
… …
641 634
642 case KW_speed: 635 case KW_speed:
643 thawer.get (op->speed); 636 thawer.get (op->speed);
644 637
645 //TODO: maybe do in check_object 638 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 639 // removed check for style maps
647 {
648 if (op->speed < 0) 640 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 641 op->speed_left = op->speed_left - rndm ();
650
651 update_ob_speed (op);
652 }
653 642
654 break; 643 break;
655 644
656 case KW_slow_move: 645 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 646 op->move_slow |= MOVE_WALK;
… …
707 case KW_path_denied: thawer.get (op->path_denied); break; 696 case KW_path_denied: thawer.get (op->path_denied); break;
708 case KW_invisible: thawer.get (op->invisible); break; 697 case KW_invisible: thawer.get (op->invisible); break;
709 case KW_magic: thawer.get (op->magic); break; 698 case KW_magic: thawer.get (op->magic); break;
710 case KW_state: thawer.get (op->state); break; 699 case KW_state: thawer.get (op->state); break;
711 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 700 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
712 case KW_material: thawer.get (op->material); break; 701 case KW_material: thawer.get (op->materials); break; //TODO: nuke
713 case KW_materialname: thawer.get (op->materialname); break; 702 case KW_materialname: thawer.get (op->materialname); break;
714 703
715 /* These are the new values */ 704 /* These are the new values */
716 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 705 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
717 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 706 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
811 CLEAR_FLAG (op, FLAG_WIZCAST); 800 CLEAR_FLAG (op, FLAG_WIZCAST);
812 } 801 }
813 break; 802 break;
814 803
815 case KW_friendly: 804 case KW_friendly:
816 GET_FLAG (op, FLAG_FRIENDLY); 805 if (thawer.get_sint32 ())
817 //TODO: move to check_object or so 806 if (op->type != PLAYER)
818 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819 add_friendly_object (op); 807 add_friendly_object (op);
808
820 break; 809 break;
821 810
822 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 811 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 812 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 813 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 814 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
815 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 816 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 817 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 818 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 819 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 820 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 821 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 822 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 823 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 824 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
902 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 891 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
903 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 892 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
904 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 893 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
905 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 894 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
906 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 895 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
896 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
907 897
908 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 898 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 899 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 900 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 901 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
978 add_button_link (op, op->map, thawer.get_sint32 ()); 968 add_button_link (op, op->map, thawer.get_sint32 ());
979 break; 969 break;
980 970
981 case KW_randomitems: 971 case KW_randomitems:
982 op->randomitems = find_treasurelist (thawer.get_str ()); 972 op->randomitems = find_treasurelist (thawer.get_str ());
973 //if (!op->randomitems)
974 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
983 break; 975 break;
984 976
985 case KW_msg: 977 case KW_msg:
986 {
987 thawer.get_ml (KW_endmsg, op->msg); 978 thawer.get_ml (KW_endmsg, op->msg);
988 //TODO: allow longer messages 979 //TODO: allow longer messages
989 if (strlen (op->msg) >= HUGE_BUF) 980 if (strlen (op->msg) >= HUGE_BUF)
990 { 981 {
991 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 982 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
992 op->msg = "ERROR, please report: string too long, winged.\n"; 983 op->msg = "ERROR, please report: string too long, winged.\n";
993 } 984 }
994 }
995 break; 985 break;
996 986
997 case KW_lore: 987 case KW_lore:
998 {
999 shstr msgbuf;
1000
1001 thawer.get_ml (KW_endlore, op->lore); 988 thawer.get_ml (KW_endlore, op->lore);
1002 //TODO: allow longer messages 989 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 990 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 991 * about not overflowing the buffer.
1005 */ 992 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 993 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 994 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 995 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 }
1010 break; 996 break;
1011 997
1012 case KW_editable: 998 case KW_editable:
1013 case KW_editor_folder: 999 case KW_editor_folder:
1014 break; 1000 break;
… …
1031 1017
1032 case KW_EOF: 1018 case KW_EOF:
1033 return LL_EOF; 1019 return LL_EOF;
1034 1020
1035 case KW_ERROR: 1021 case KW_ERROR:
1036 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1037 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1023 //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D
1038
1039 //TODO: skip line, ugly, factor parsing better
1040 if (thawer.last_value)
1041 thawer.line = thawer.last_value;
1042
1043 thawer.line += strlen (thawer.line) + 1;
1044
1045 break; 1024 break;
1046 1025
1047 default: 1026 default:
1048 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1027 if (!thawer.parse_error ("object", op->name))
1028 return false;
1049 break; 1029 break;
1050 } 1030 }
1051 } 1031 }
1052} 1032}
1053 1033
… …
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1043 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset. 1044 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1045 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 * 1046 *
1067 */ 1047 */
1068
1069int 1048int
1070load_object (object_thawer & fp, object *op, int map_flags) 1049load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1050{
1051 coroapi::cede_every (1000); // cede once in a while
1052
1072 return parse_object (op, fp, map_flags); 1053 return parse_object (op, fp, map_flags);
1073} 1054}
1074
1075 1055
1076/* This takes a buffer, scans it for variables, and sets those variables 1056/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1057 * as appropriate in op.
1078 * 1058 *
1079 * This function appears to be used in only 2 places - in crossedit to 1059 * This function appears to be used in only 2 places - in crossedit to
… …
1182 KW_monster, 1162 KW_monster,
1183 KW_friendly, 1163 KW_friendly,
1184 KW_generator, 1164 KW_generator,
1185 KW_is_thrown, 1165 KW_is_thrown,
1186 KW_auto_apply, 1166 KW_auto_apply,
1187 KW_treasure, 1167 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1168 KW_player_sold,
1189 /* 20 */ 1169 /* 20 */
1190 KW_see_invisible, 1170 KW_see_invisible,
1191 KW_can_roll, 1171 KW_can_roll,
1192 KW_overlay_floor, 1172 KW_overlay_floor,
… …
1275 KW_berserk, 1255 KW_berserk,
1276 KW_neutral, 1256 KW_neutral,
1277 /* 100 */ 1257 /* 100 */
1278 KW_no_attack, 1258 KW_no_attack,
1279 KW_no_damage, 1259 KW_no_damage,
1280 KW_NULL, 1260 KW_obj_original,
1281 KW_NULL, 1261 KW_NULL,
1282 KW_activate_on_push, 1262 KW_activate_on_push,
1283 KW_activate_on_release, 1263 KW_activate_on_release,
1284 KW_is_water, 1264 KW_is_water,
1285 KW_use_content_on_gen, 1265 KW_use_content_on_gen,
1286 KW_NULL, 1266 KW_NULL,
1287 KW_is_buildable, 1267 KW_is_buildable,
1288 /* 110 */ 1268 /* 110 */
1269 KW_destroy_on_death,
1270 KW_NULL,
1289 }; 1271 };
1290 1272
1291 int i; 1273 int i;
1292 1274
1293 /* This saves the key/value lists. We do it first so that any 1275 /* This saves the key/value lists. We do it first so that any
1294 * keys that match field names will be overwritten by the loader. 1276 * keys that match field names will be overwritten by the loader.
1295 */ 1277 */
1296 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1278 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1297 { 1279 {
1298 /* Find the field in the opposing member. */ 1280 /* Find the field in the opposing member. */
1299 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1281 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1300 1282
1301 /* If there's no partnering field, or it's got a different value, save our field. */ 1283 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1385 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1386 1368
1387 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1388 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1389 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
1390 CMP_OUT (material); 1372 CMP_OUT2 (material, materials);//TODO: nuke
1391 CMP_OUT (materialname); 1373 CMP_OUT (materialname);
1392 CMP_OUT (value); 1374 CMP_OUT (value);
1393 CMP_OUT (carrying); 1375 CMP_OUT (carrying);
1394 CMP_OUT (weight); 1376 CMP_OUT (weight);
1395 CMP_OUT (invisible); 1377 CMP_OUT (invisible);
… …
1429 CMP_OUT (move_on); 1411 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1412 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1413 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1414 CMP_OUT (move_slow_penalty);
1433 1415
1434 if (!COMPARE_FLAGS (op, tmp)) 1416 if (op->flag != tmp->flag)
1435 for (i = 0; i <= NUM_FLAGS; i++) 1417 for (i = 0; i <= NUM_FLAGS; i++)
1436 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1418 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1419 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1420
1439 /* Save body locations */ 1421 /* Save body locations */
1440 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1422 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (op->body_info[i] != tmp->body_info[i]) 1423 if (op->body_info[i] != tmp->body_info[i])
1442 f.put (body_locations[i].save_name, op->body_info[i]); 1424 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1444 1426
1445/* 1427/*
1446 * Dumps all variables in an object to a file. 1428 * Dumps all variables in an object to a file.
1447 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1429 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1448 * the only place this is not set is when saving the player. 1430 * the only place this is not set is when saving the player.
1449 * If bit 1 of flag is set, don't remove the object after save. As of now,
1450 * all of the callers are setting this.
1451 */ 1431 */
1452
1453void 1432void
1454save_object (object_freezer & fp, object *op, int flag) 1433save_object (object_freezer &fp, object *op, int flag)
1455{ 1434{
1456 archetype *at;
1457 object *tmp, *old;
1458
1459 /* Even if the object does have an owner, it would seem that we should 1435 /* Even if the object does have an owner, it would seem that we should
1460 * still save it. 1436 * still save it.
1461 */ 1437 */
1462 if (op->owner) 1438 if (op->owner)
1463 return; 1439 return;
1464 1440
1465 /* If it is unpaid and we don't want to save those, just return. */ 1441 /* If it is unpaid and we don't want to save those, just return. */
1466 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1442 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1467 return; 1443 return;
1468 1444
1469 if ((at = op->arch) == NULL) 1445 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1470 at = empty_archetype;
1471 1446
1472 fp.put (KW_arch, at->name); 1447 fp.put (KW_arch, at->name);
1473
1474 put (fp, op, &at->clone); 1448 put (fp, op, &at->clone);
1475 1449
1476 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1450 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1477 1451
1478 old = NULL;
1479
1480 if (flag & 2)
1481 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1452 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1482 save_object (fp, tmp, flag); 1453 save_object (fp, tmp, flag);
1483 else
1484 /* Slightly different logic because tmp/op will be removed by
1485 * the save_object we call. So we just keep looking at op->inv
1486 * until there is nothing left. In theory, the variable old
1487 * should not be needed, as recursive loops shouldn't happen.
1488 */
1489 while ((tmp = op->inv) != NULL)
1490 {
1491 if (old == tmp)
1492 {
1493 LOG (llevError, " Recursive loop in inventory\n");
1494 break;
1495 }
1496
1497 save_object (fp, tmp, flag);
1498 old = tmp;
1499 }
1500
1501 if (!(flag & 2))
1502 op->destroy ();
1503 1454
1504 fp.put (op); 1455 fp.put (op);
1505 fprintf (fp, "end\n"); 1456 fp.put (KW_end);
1506} 1457}
1507 1458
1459/////////////////////////////////////////////////////////////////////////////
1460
1461bool load_resource_file (const char *filename)
1462{
1463 object_thawer f (filename);
1464
1465 f.next_kv ();
1466
1467 for (;;)
1468 {
1469 switch (f.kw)
1470 {
1471 case KW_region:
1472 if (!region::load (f))
1473 return false;
1474 break;
1475
1476 case KW_EOF:
1477 return true;
1478
1479 default:
1480 if (!f.parse_error ("resource file"))
1481 return false;
1482 }
1483
1484 f.next_kv ();
1485 }
1486}
1487

Diff Legend

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