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.68 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.85 by root, Sat May 26 15:44:02 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
257/* This function checks the object after it has been loaded (when we 257/* This function checks the object after it has been loaded (when we
258 * get the 'end' in the input stream). This function can be used to 258 * get the 'end' in the input stream). This function can be used to
259 * deal with legacy objects where fields may have changed. It can also be used 259 * deal with legacy objects where fields may have changed. It can also be used
260 * to check for objects to make sure there are no common errors. 260 * to check for objects to make sure there are no common errors.
261 */ 261 */
262static void 262void
263check_loaded_object (object *op) 263object::post_load_check ()
264{ 264{
265 if (type >= NUM_TYPES)
266 {
267 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
268 type = 0;
269 }
270
271 switch (type)
272 {
273 case BOW:
274 case WAND:
275 case ROD:
276 case HORN:
277 if (slot [body_range].info != -1)
278 {
279 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
280 slot [body_range].info = -1;
281 }
282 break;
283
284 case WEAPON:
285 if (slot [body_combat].info != -1)
286 {
287 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
288 slot [body_combat].info = -1;
289 }
290 break;
291
292 case SHIELD:
293 if (slot [body_shield].info != -1)
294 {
295 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
296 slot [body_shield].info = -1;
297 }
298 break;
299
300 case PLAYER:
301 if (slot [body_shield].info != 1)
302 {
303 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
304 slot [body_shield].info = 1;
305 }
306
307 if (slot [body_combat].info != 1)
308 {
309 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
310 slot [body_combat].info = 1;
311 }
312
313 if (slot [body_range].info != 1)
314 {
315 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
316 slot [body_range].info = 1;
317 }
318 break;
319 }
320
265 /* We do some specialised handling to handle legacy cases of name_pl. 321 /* We do some specialised handling to handle legacy cases of name_pl.
266 * If the object doesn't have a name_pl, we just use the object name - 322 * If the object doesn't have a name_pl, we just use the object name -
267 * this isn't perfect (things won't be properly pluralised), but works to 323 * this isn't perfect (things won't be properly pluralised), but works to
268 * that degree (5 heart is still quite understandable). But the case we 324 * that degree (5 heart is still quite understandable). But the case we
269 * also have to catch is if this object is not using the normal name for 325 * also have to catch is if this object is not using the normal name for
270 * the object. In that case, we also want to use the loaded name. 326 * the object. In that case, we also want to use the loaded name.
271 * Otherwise, what happens is that the the plural name will lose 327 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 328 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 329 */
274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 330 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
275 op->name_pl = 0; 331 name_pl = 0;
276 332
277 if (!op->name_pl) 333 if (!name_pl)
278 op->name_pl = op->name; 334 name_pl = name;
279 335
280 /* objects now have a materialname. try to patch it in */ 336 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 337 if (!(is_weapon () && level > 0))
282 { 338 set_materialname (this, map ? map->difficulty : 5, 0);
283 if (op->map != NULL)
284 set_materialname (op, op->map->difficulty, NULL);
285 else
286 set_materialname (op, 5, NULL);
287 }
288 339
289 /* only do these when program is first run - a bit 340 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 341 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 342 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 343 * not in the ideal fashion.
293 */ 344 */
294 if ((op->type == WEAPON || op->type == BOW) && loading_arch) 345 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 346 {
296 if (!op->skill) 347 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 348 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
298 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 349 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 350 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 351 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
301 } 352 }
302 353
303 /* We changed last_heal to gen_sp_armour, which is what it 354 /* We changed last_heal to gen_sp_armour, which is what it
304 * really does for many objects. Need to catch any in maps 355 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 356 * that may have an old value.
306 */ 357 */
307 if (op->type == WEAPON 358 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 359 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 360 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 361 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 362 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 363 || type == BRACERS || type == CLOAK)
313 { 364 {
314 if (op->last_heal) 365 if (last_heal)
315 { 366 {
316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 367 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
317 op->gen_sp_armour = op->last_heal; 368 gen_sp_armour = last_heal;
318 op->last_heal = 0; 369 last_heal = 0;
319 } 370 }
320 371
321 int ip = calc_item_power (op, 0); 372 int ip = calc_item_power (this, 0);
322 373
323 /* Legacy objects from before item power was in the game */ 374 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 375 if (!item_power && ip)
325 { 376 {
326 if (ip > 3) 377 if (ip > 3)
327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 378 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
328 379
329 op->item_power = ip; 380 item_power = ip;
330 } 381 }
331 382
332 /* Check for possibly bogus values. Has to meet both these criteria - 383 /* Check for possibly bogus values. Has to meet both these criteria -
333 * something that has item_power 1 is probably just fine if our calculated 384 * something that has item_power 1 is probably just fine if our calculated
334 * value is 1 or 2 - these values are small enough that hard to be precise. 385 * value is 1 or 2 - these values are small enough that hard to be precise.
335 * similarly, it item_power is 0, the first check will always pass, 386 * similarly, it item_power is 0, the first check will always pass,
336 * but not the second one. 387 * but not the second one.
337 */ 388 */
389#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 390 if (ip > 2 * item_power && ip > (item_power + 3))
339 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 391 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
392#endif
340 } 393 }
341 394
342 /* Old spellcasting object - need to load in the appropiate object */ 395 /* Old spellcasting object - need to load in the appropiate object */
343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
344 /* 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 */
345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch) 398 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
346 { 399 {
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 400 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 401 * in that spell was stored in sp.
349 */ 402 */
350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 404 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
353 } 406 }
354 407
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
356 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch) 409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 410 {
358 object *tmp = get_archetype_by_object_name (op->slaying); 411 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 412 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 413 randomitems = NULL; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 414 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 415 value = arch->clone.value * inv->value;
363 } 416 }
364 417
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 418 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 419 {
367 if (op->stats.hp > op->stats.maxhp) 420 if (stats.hp > stats.maxhp)
368 { 421 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 422 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
370 op->stats.maxhp = op->stats.hp; 423 stats.maxhp = stats.hp;
371 } 424 }
372 425
373 /* The archs just need to be updated for this */ 426 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 427 if (move_type == 0)
375 op->move_type = MOVE_WALK; 428 move_type = MOVE_WALK;
376 } 429 }
377 430
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 431 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
379 { 432 {
380 /* Object will duplicate it's content as part of the 433 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 434 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 435 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 436 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 437 */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 438 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 } 439 }
387 440
388 /* Handle player movers. We use move_type for player movers 441 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 442 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 443 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 444 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 445 * are doing, otherwise, set move_type based on maxhp value.
393 */ 446 */
394 if (op->type == PLAYERMOVER) 447 if (type == PLAYERMOVER)
395 { 448 {
396 if (!op->move_type) 449 if (!move_type)
397 { 450 {
398 if (op->stats.maxhp) 451 if (stats.maxhp)
399 { 452 {
400 op->move_type = MOVE_ALL; 453 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 454 stats.maxhp = 0;
402 } 455 }
403 else 456 else
404 op->move_type = MOVE_WALK; 457 move_type = MOVE_WALK;
405 } 458 }
406 } 459 }
407
408} 460}
409 461
410static void 462static void
411set_move (MoveType &mt, const char *str) 463set_move (MoveType &mt, const char *str)
412{ 464{
… …
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 470 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 471 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 472 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 473 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 474 { "boat" , MOVE_BOAT },
475 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 476 { "all" , MOVE_ALL },
424 }; 477 };
425 478
426 if (!str) 479 if (!str)
427 { 480 {
… …
464 517
465next: ; 518next: ;
466 } 519 }
467} 520}
468 521
469#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
470 if (f.get_sint32 ()) \
471 SET_FLAG (op, flag); \
472 else \
473 CLEAR_FLAG (op, flag) \
474 523
475bool 524bool
476object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
477{ 526{
478 assert (f.kw == KW_object || f.kw == KW_arch);
479
480 if (f.kw == KW_object)
481 f.get (name); // preset name from object name
482
483 f.next ();
484
485 object *op_inv = inv; 527 object *op_inv = inv;
486 528
487 for (;;) 529 for (;;)
488 { 530 {
489 switch (f.kw) 531 switch (f.kw)
… …
730 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 772 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
731 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 773 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
732 774
733 break; 775 break;
734 776
735 case KW_wiz:
736 GET_FLAG (this, FLAG_WIZ);
737 //TODO: move to check_object
738 if (QUERY_FLAG (this, FLAG_WIZ))
739 {
740 SET_FLAG (this, FLAG_WAS_WIZ);
741 SET_FLAG (this, FLAG_WIZPASS);
742 SET_FLAG (this, FLAG_WIZCAST);
743 }
744 else
745 {
746 CLEAR_FLAG (this, FLAG_WIZPASS);
747 CLEAR_FLAG (this, FLAG_WIZCAST);
748 }
749 break;
750
751 case KW_friendly: 777 case KW_friendly:
752 if (f.get_sint32 ()) 778 if (f.get_bool ())
753 if (type != PLAYER) 779 if (type != PLAYER)
754 add_friendly_object (this); 780 add_friendly_object (this);
755 781
756 break; 782 break;
757 783
… …
786 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 812 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
787 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 813 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
788 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 814 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
789 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 815 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
790 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 816 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
791 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
792 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 817 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
793 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 818 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
794 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 819 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
795 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 820 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
796 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 821 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
839 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 864 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
840 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 865 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
841 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 866 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
842 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 867 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
843 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 868 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
869 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
870 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
844 871
845 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 872 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
846 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 873 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
847 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 874 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
848 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 875 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
894 case KW_dam_modifier: f.get (dam_modifier); break; 921 case KW_dam_modifier: f.get (dam_modifier); break;
895 case KW_duration_modifier: f.get (duration_modifier); break; 922 case KW_duration_modifier: f.get (duration_modifier); break;
896 923
897 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 924 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
898 //TODO: parse from other include files 925 //TODO: parse from other include files
899 case KW_body_range: f.get (body_info[0]); break; 926 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
900 case KW_body_arm: f.get (body_info[1]); break; 927 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
901 case KW_body_torso: f.get (body_info[2]); break; 928 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
902 case KW_body_head: f.get (body_info[3]); break; 929 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
903 case KW_body_neck: f.get (body_info[4]); break; 930 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
904 case KW_body_skill: f.get (body_info[5]); break; 931 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
905 case KW_body_finger: f.get (body_info[6]); break; 932 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
906 case KW_body_shoulder: f.get (body_info[7]); break; 933 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
907 case KW_body_foot: f.get (body_info[8]); break; 934 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
908 case KW_body_hand: f.get (body_info[9]); break; 935 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
909 case KW_body_wrist: f.get (body_info[10]); break; 936 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
910 case KW_body_waist: f.get (body_info[11]); break; 937 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
938 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
939 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
911 case KW_can_apply: 940 case KW_can_apply:
912 break; 941 break;
913 942
914 case KW_connected: 943 case KW_connected:
915 add_button_link (this, map, f.get_sint32 ()); 944 add_button_link (this, map, f.get_sint32 ());
… …
924 : treasurelist::find (f.get_str ()); 953 : treasurelist::find (f.get_str ());
925 954
926 if (!randomitems) 955 if (!randomitems)
927 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 956 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
928 } 957 }
958 else
959 randomitems = 0;
929 break; 960 break;
930 961
931 case KW_msg: 962 case KW_msg:
932 f.get_ml (KW_endmsg, msg); 963 f.get_ml (KW_endmsg, msg);
933 //TODO: allow longer messages 964 //TODO: allow longer messages
… …
952 case KW_editable: 983 case KW_editable:
953 case KW_editor_folder: 984 case KW_editor_folder:
954 break; 985 break;
955 986
956 case KW_end: 987 case KW_end:
957 check_loaded_object (this);
958
959 if (!loading_arch) 988 if (!loading_arch)
960 instantiate (); 989 instantiate ();
961 990
962 f.next (); 991 f.next ();
963 return true; 992 return true;
… …
990 arch = archetype::find ("earthwall"); 1019 arch = archetype::find ("earthwall");
991 } 1020 }
992 1021
993 assert (arch); //D maybe use exception handling of sorts? 1022 assert (arch); //D maybe use exception handling of sorts?
994 1023
1024 f.next ();
1025
995 object *op = object::create (); 1026 object *op = object::create ();
996 1027
997 op->map = map; 1028 op->map = map;
998 arch->clone.copy_to (op); 1029 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 1030 // copy_to activates, this should be fixed properly
… …
1003 { 1034 {
1004 op->destroy (true); 1035 op->destroy (true);
1005 return 0; 1036 return 0;
1006 } 1037 }
1007 1038
1039 op->post_load_check ();
1008 return op; 1040 return op;
1009} 1041}
1010 1042
1011/* This takes a buffer, scans it for variables, and sets those variables 1043/* This takes a buffer, scans it for variables, and sets those variables
1012 * as appropriate in op. 1044 * as appropriate in op.
… …
1017int 1049int
1018set_variable (object *op, char *buf) 1050set_variable (object *op, char *buf)
1019{ 1051{
1020 object_thawer f (buf, (AV *)0); 1052 object_thawer f (buf, (AV *)0);
1021 1053
1022 f.kw = KW_arch; // special hack so that parse_kv skips 1054 f.next ();
1023 return op->parse_kv (f); 1055 return op->parse_kv (f);
1024} 1056}
1025 1057
1026/* This returns a string of the integer movement type */ 1058/* This returns a string of the integer movement type */
1027#if 0 1059#if 0
… …
1089 * the 15'th element of this array should match that name. 1121 * the 15'th element of this array should match that name.
1090 * If an entry is NULL, that is a flag not to loaded/saved. 1122 * If an entry is NULL, that is a flag not to loaded/saved.
1091 */ 1123 */
1092 static const keyword flag_names [NUM_FLAGS] = { 1124 static const keyword flag_names [NUM_FLAGS] = {
1093 KW_alive, 1125 KW_alive,
1094 KW_wiz,
1095 KW_NULL, 1126 KW_NULL,
1096 KW_NULL, 1127 KW_NULL,
1097 KW_was_wiz, 1128 KW_NULL,
1129 KW_NULL,
1098 KW_applied, 1130 KW_applied,
1099 KW_unpaid, 1131 KW_unpaid,
1100 KW_can_use_shield, 1132 KW_can_use_shield,
1101 KW_no_pick, 1133 KW_no_pick,
1102 KW_NULL, // walk_on 1134 KW_NULL, // walk_on
… …
1108 KW_monster, 1140 KW_monster,
1109 KW_friendly, 1141 KW_friendly,
1110 KW_generator, 1142 KW_generator,
1111 KW_is_thrown, 1143 KW_is_thrown,
1112 KW_auto_apply, 1144 KW_auto_apply,
1113 KW_NULL, // was KW_treasure 1145 KW_treasure_env,
1114 KW_player_sold, 1146 KW_player_sold,
1115 /* 20 */ 1147 /* 20 */
1116 KW_see_invisible, 1148 KW_see_invisible,
1117 KW_can_roll, 1149 KW_can_roll,
1118 KW_overlay_floor, 1150 KW_overlay_floor,
… …
1179 KW_can_use_skill, 1211 KW_can_use_skill,
1180 KW_been_applied, 1212 KW_been_applied,
1181 /* 80 */ 1213 /* 80 */
1182 KW_has_ready_scroll, 1214 KW_has_ready_scroll,
1183 KW_can_use_rod, 1215 KW_can_use_rod,
1184 KW_NULL, 1216 KW_precious,
1185 KW_can_use_horn, 1217 KW_can_use_horn,
1186 KW_make_invisible, 1218 KW_make_invisible,
1187 KW_inv_locked, 1219 KW_inv_locked,
1188 KW_is_wooded, 1220 KW_is_wooded,
1189 KW_is_hilly, 1221 KW_is_hilly,
… …
1363 if (op->flag != tmp->flag) 1395 if (op->flag != tmp->flag)
1364 for (i = 0; i <= NUM_FLAGS; i++) 1396 for (i = 0; i <= NUM_FLAGS; i++)
1365 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1397 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1366 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1398 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1367 1399
1368 /* Save body locations */ 1400 // save body locations
1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1370 if (op->body_info[i] != tmp->body_info[i]) 1402 if (op->slot[i].info != tmp->slot[i].info)
1371 f.put (body_locations[i].save_name, op->body_info[i]); 1403 f.put (body_locations[i].save_name, op->slot[i].info);
1372} 1404}
1373 1405
1374/* 1406/*
1375 * Dumps all variables in an object to a file. 1407 * Dumps all variables in an object to a file.
1376 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1408 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1399 return true; 1431 return true;
1400} 1432}
1401 1433
1402///////////////////////////////////////////////////////////////////////////// 1434/////////////////////////////////////////////////////////////////////////////
1403 1435
1436// generic resource file load,
1437// currently supports: region, treasures, archetypes
1404bool load_resource_file (const char *filename) 1438bool load_resource_file (const char *filename)
1405{ 1439{
1406 object_thawer f (filename); 1440 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1407 1444
1408 f.next (); 1445 f.next ();
1409 1446
1410 for (;;) 1447 for (;;)
1411 { 1448 {
1412 switch (f.kw) 1449 switch (f.kw)
1413 { 1450 {
1414 case KW_region: 1451 case KW_region:
1415 if (!region::read (f)) 1452 if (!region::read (f))
1416 return false; 1453 goto finish;
1454 break;
1455
1456 case KW_treasure:
1457 case KW_treasureone:
1458 if (!treasurelist::read (f))
1459 goto finish;
1460 break;
1461
1462 case KW_object:
1463 seen_arch = true;
1464 if (!archetype::read (f))
1465 goto finish;
1417 break; 1466 break;
1418 1467
1419 case KW_EOF: 1468 case KW_EOF:
1420 return true; 1469 success = true;
1470 goto finish;
1421 1471
1422 default: 1472 default:
1423 if (!f.parse_error ("resource file")) 1473 if (!f.parse_error ("resource file"))
1424 return false; 1474 goto finish;
1475
1476 f.next ();
1477 break;
1425 } 1478 }
1426
1427 f.next ();
1428 } 1479 }
1480
1481finish:
1482 if (seen_arch)
1483 init_archetype_pointers ();
1484
1485 return success;
1429} 1486}
1430 1487

Diff Legend

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