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.62 by root, Mon Feb 19 19:10:31 2007 UTC vs.
Revision 1.81 by root, Mon May 14 21:32:26 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 *
… …
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 32
33///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
34
35/* Maps the MOVE_* values to names */
36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
37 34
38/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
39 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
40 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
41 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
253 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
254 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
255 NULL 252 NULL
256}; 253};
257 254
258extern int arch_init; 255extern bool loading_arch;
259 256
260/* 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
261 * 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
262 * 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
263 * 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.
264 */ 261 */
265static void 262void
266check_loaded_object (object *op) 263object::post_load_check ()
267{ 264{
265 switch (type)
266 {
267 case BOW:
268 case WAND:
269 case ROD:
270 case HORN:
271 if (slot [body_range].info != -1)
272 {
273 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
274 slot [body_range].info = -1;
275 }
276 break;
277
278 case WEAPON:
279 if (slot [body_combat].info != -1)
280 {
281 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
282 slot [body_combat].info = -1;
283 }
284 break;
285
286 case SHIELD:
287 if (slot [body_shield].info != -1)
288 {
289 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
290 slot [body_shield].info = -1;
291 }
292 break;
293
294 case PLAYER:
295 if (slot [body_shield].info != 1)
296 {
297 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
298 slot [body_shield].info = 1;
299 }
300
301 if (slot [body_combat].info != 1)
302 {
303 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
304 slot [body_combat].info = 1;
305 }
306
307 if (slot [body_range].info != 1)
308 {
309 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
310 slot [body_range].info = 1;
311 }
312 break;
313 }
314
268 /* We do some specialised handling to handle legacy cases of name_pl. 315 /* 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 - 316 * 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 pluralised), but works to 317 * 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 318 * 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 319 * 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. 320 * 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 321 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 322 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 323 */
277 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 324 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
278 op->name_pl = 0; 325 name_pl = 0;
279 326
280 if (!op->name_pl) 327 if (!name_pl)
281 op->name_pl = op->name; 328 name_pl = name;
282 329
283 /* objects now have a materialname. try to patch it in */ 330 /* objects now have a materialname. try to patch it in */
284 if (!(op->is_weapon () && op->level > 0)) 331 if (!(is_weapon () && level > 0))
285 { 332 set_materialname (this, map ? map->difficulty : 5, 0);
286 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL);
288 else
289 set_materialname (op, 5, NULL);
290 }
291 333
292 /* only do these when program is first run - a bit 334 /* only do these when program is first run - a bit
293 * excessive to do this at every run - most of this is 335 * excessive to do this at every run - most of this is
294 * really just to catch any errors - program will still run, but 336 * really just to catch any errors - program will still run, but
295 * not in the ideal fashion. 337 * not in the ideal fashion.
296 */ 338 */
297 if ((op->type == WEAPON || op->type == BOW) && arch_init) 339 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
298 { 340 {
299 if (!op->skill) 341 if (!skill)
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 342 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
301 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 343 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 344 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
303 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 345 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
304 } 346 }
305 347
306 /* We changed last_heal to gen_sp_armour, which is what it 348 /* We changed last_heal to gen_sp_armour, which is what it
307 * really does for many objects. Need to catch any in maps 349 * really does for many objects. Need to catch any in maps
308 * that may have an old value. 350 * that may have an old value.
309 */ 351 */
310 if (op->type == WEAPON 352 if (type == WEAPON
311 || op->type == ARMOUR || op->type == HELMET 353 || type == ARMOUR || type == HELMET
312 || op->type == SHIELD || op->type == RING 354 || type == SHIELD || type == RING
313 || op->type == BOOTS || op->type == GLOVES 355 || type == BOOTS || type == GLOVES
314 || op->type == AMULET || op->type == GIRDLE 356 || type == AMULET || type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK) 357 || type == BRACERS || type == CLOAK)
316 { 358 {
317 if (op->last_heal) 359 if (last_heal)
318 { 360 {
319 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 361 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
320 op->gen_sp_armour = op->last_heal; 362 gen_sp_armour = last_heal;
321 op->last_heal = 0; 363 last_heal = 0;
322 } 364 }
323 365
324 int ip = calc_item_power (op, 0); 366 int ip = calc_item_power (this, 0);
325 367
326 /* Legacy objects from before item power was in the game */ 368 /* Legacy objects from before item power was in the game */
327 if (!op->item_power && ip) 369 if (!item_power && ip)
328 { 370 {
329 if (ip > 3) 371 if (ip > 3)
330 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 372 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
331 373
332 op->item_power = ip; 374 item_power = ip;
333 } 375 }
334 376
335 /* Check for possibly bogus values. Has to meet both these criteria - 377 /* Check for possibly bogus values. Has to meet both these criteria -
336 * something that has item_power 1 is probably just fine if our calculated 378 * something that has item_power 1 is probably just fine if our calculated
337 * value is 1 or 2 - these values are small enough that hard to be precise. 379 * value is 1 or 2 - these values are small enough that hard to be precise.
338 * similarly, it item_power is 0, the first check will always pass, 380 * similarly, it item_power is 0, the first check will always pass,
339 * but not the second one. 381 * but not the second one.
340 */ 382 */
341 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 383 if (ip > 2 * item_power && ip > (item_power + 3))
342 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 384 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
343 } 385 }
344 386
345 /* Old spellcasting object - need to load in the appropiate object */ 387 /* Old spellcasting object - need to load in the appropiate object */
346 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
347 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 389 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
348 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 390 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
349 { 391 {
350 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 392 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
351 * in that spell was stored in sp. 393 * in that spell was stored in sp.
352 */ 394 */
353 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 395 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
354 insert_ob_in_ob (tmp, op); 396 insert_ob_in_ob (tmp, this);
355 op->randomitems = NULL; /* So another spell isn't created for this object */ 397 randomitems = NULL; /* So another spell isn't created for this object */
356 } 398 }
357 399
358 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 400 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 401 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
360 { 402 {
361 object *tmp = get_archetype_by_object_name (op->slaying); 403 object *tmp = get_archetype_by_object_name (slaying);
362 insert_ob_in_ob (tmp, op); 404 insert_ob_in_ob (tmp, this);
363 op->randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
364 /* without this, value is all screwed up */ 406 /* without this, value is all screwed up */
365 op->value = op->arch->clone.value * op->inv->value; 407 value = arch->clone.value * inv->value;
366 } 408 }
367 409
368 if (QUERY_FLAG (op, FLAG_MONSTER)) 410 if (QUERY_FLAG (this, FLAG_MONSTER))
369 { 411 {
370 if (op->stats.hp > op->stats.maxhp) 412 if (stats.hp > stats.maxhp)
371 { 413 {
372 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 414 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
373 op->stats.maxhp = op->stats.hp; 415 stats.maxhp = stats.hp;
374 } 416 }
375 417
376 /* The archs just need to be updated for this */ 418 /* The archs just need to be updated for this */
377 if (op->move_type == 0) 419 if (move_type == 0)
378 op->move_type = MOVE_WALK; 420 move_type = MOVE_WALK;
379 } 421 }
380 422
381 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 423 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
382 { 424 {
383 /* Object will duplicate it's content as part of the 425 /* Object will duplicate it's content as part of the
384 * generation process. To do this, we must flag inventory 426 * generation process. To do this, we must flag inventory
385 * so it remains unevaluated concerning the randomitems and 427 * so it remains unevaluated concerning the randomitems and
386 * the living (a demonlord shouldn't cast from inside generator!) 428 * the living (a demonlord shouldn't cast from inside generator!)
387 */ 429 */
388 flag_inv (op, FLAG_IS_A_TEMPLATE); 430 flag_inv (this, FLAG_IS_A_TEMPLATE);
389 } 431 }
390 432
391 /* Handle player movers. We use move_type for player movers 433 /* Handle player movers. We use move_type for player movers
392 * because they operate on their own time (move_on 434 * because they operate on their own time (move_on
393 * would potentially cause them to be triggered when someone steps 435 * would potentially cause them to be triggered when someone steps
394 * on them). If move_type is set, presume person knows what they 436 * on them). If move_type is set, presume person knows what they
395 * are doing, otherwise, set move_type based on maxhp value. 437 * are doing, otherwise, set move_type based on maxhp value.
396 */ 438 */
397 if (op->type == PLAYERMOVER) 439 if (type == PLAYERMOVER)
398 { 440 {
399 if (!op->move_type) 441 if (!move_type)
400 { 442 {
401 if (op->stats.maxhp) 443 if (stats.maxhp)
402 { 444 {
403 op->move_type = MOVE_ALL; 445 move_type = MOVE_ALL;
404 op->stats.maxhp = 0; 446 stats.maxhp = 0;
405 } 447 }
406 else 448 else
407 op->move_type = MOVE_WALK; 449 move_type = MOVE_WALK;
408 } 450 }
409 } 451 }
410
411} 452}
412 453
413static void 454static void
414set_move (MoveType & mt, const char *str) 455set_move (MoveType &mt, const char *str)
415{ 456{
457 static const struct flagstr {
458 const char *name;
459 MoveType flags;
460 } move_flags[] = {
461 { "walk" , MOVE_WALK },
462 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
463 { "fly_low" , MOVE_FLY_LOW },
464 { "fly_high", MOVE_FLY_HIGH },
465 { "swim" , MOVE_SWIM },
466 { "boat" , MOVE_BOAT },
467 { "ship" , MOVE_SHIP },
468 { "all" , MOVE_ALL },
469 };
470
416 if (!str) 471 if (!str)
417 { 472 {
418 mt = 0; 473 mt = 0;
419 return; 474 return;
420 } 475 }
… …
427 482
428 mt = 0; 483 mt = 0;
429 484
430 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 485 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
431 { 486 {
432 if (!strcasecmp (str, "all")) 487 bool negate = 0;
433 mt |= MOVE_ALL; 488
434 else 489 if (*str == '-')
435 { 490 {
436 int i, negate = 0; 491 negate = 1;
492 str++;
493 }
437 494
438 if (*str == '-') 495 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
496 {
497 if (!strcmp (f->name, str))
439 { 498 {
440 negate = 1;
441 str++;
442 }
443
444 for (i = 0; move_name[i]; i++)
445 {
446 if (!strcasecmp (move_name[i], str))
447 {
448 if (negate) 499 if (negate)
449 mt &= ~(1 << i); 500 mt &= ~f->flags;
450 else
451 mt |= (1 << i);
452
453 break;
454 }
455 }
456
457 if (!move_name[i])
458 {
459 /* fly is a special case - covers both fly_low and
460 * fly_high - since it doesn't match to a specific
461 * single bit, have to special case it.
462 */
463 if (!strcasecmp (str, "flying"))
464 {
465 if (negate)
466 mt &= ~MOVE_FLYING;
467 else
468 mt |= MOVE_FLYING;
469 }
470 else 501 else
471 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); 502 mt |= f->flags;
503
504 goto next;
472 } 505 }
473 } 506 }
507
508 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
509
510next: ;
474 } 511 }
475} 512}
476 513
477#define GET_FLAG(op,flag) \ 514#define GET_FLAG(op,flag) \
478 if (f.get_sint32 ()) \ 515 if (f.get_sint32 ()) \
… …
481 CLEAR_FLAG (op, flag) \ 518 CLEAR_FLAG (op, flag) \
482 519
483bool 520bool
484object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
485{ 522{
486 assert (f.kw == KW_object || f.kw == KW_arch);
487
488 if (f.kw == KW_object)
489 f.get (name); // preset name from object name
490
491 f.next ();
492
493 object *op_inv = inv; 523 object *op_inv = inv;
494 524
495 for (;;) 525 for (;;)
496 { 526 {
497 switch (f.kw) 527 switch (f.kw)
… …
559 } 589 }
560 } 590 }
561 continue; 591 continue;
562 592
563 case KW_other_arch: 593 case KW_other_arch:
594 other_arch =
595 loading_arch
596 ? archetype::get (f.get_str ())
564 other_arch = archetype::find (f.get_str ()); 597 : archetype::find (f.get_str ());
598
599 if (!other_arch)
600 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
565 break; 601 break;
566 602
567 case KW_animation: 603 case KW_animation:
568 { 604 {
569 CLEAR_FLAG (this, FLAG_ANIMATE); 605 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
595 move_slow |= MOVE_WALK; 631 move_slow |= MOVE_WALK;
596 f.get (move_slow_penalty); 632 f.get (move_slow_penalty);
597 break; 633 break;
598 634
599 case KW_face: 635 case KW_face:
600 face = &new_faces[FindFace (f.get_str (), 0)]; 636 face = face_find (f.get_str ());
601 break; 637 break;
602 638
603 case KW_x: f.get (x); break; 639 case KW_x: f.get (x); break;
604 case KW_y: f.get (y); break; 640 case KW_y: f.get (y); break;
605 641
… …
841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 877 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 878 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 879 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 880 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
845 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 881 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
882 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
883 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
846 884
847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 885 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 886 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 887 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 888 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
886 case KW_glow_radius: f.get (glow_radius); break; 924 case KW_glow_radius: f.get (glow_radius); break;
887 case KW_weapontype: f.get (weapontype); break; 925 case KW_weapontype: f.get (weapontype); break;
888 case KW_tooltype: f.get (tooltype); break; 926 case KW_tooltype: f.get (tooltype); break;
889 case KW_casting_time: f.get (casting_time); break; 927 case KW_casting_time: f.get (casting_time); break;
890 case KW_elevation: f.get (elevation); break; 928 case KW_elevation: f.get (elevation); break;
891 case KW_smoothlevel: f.get (smoothlevel); break; 929 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
892 case KW_client_type: f.get (client_type); break; 930 case KW_client_type: f.get (client_type); break;
893 case KW_duration: f.get (duration); break; 931 case KW_duration: f.get (duration); break;
894 case KW_range: f.get (range); break; 932 case KW_range: f.get (range); break;
895 case KW_range_modifier: f.get (range_modifier); break; 933 case KW_range_modifier: f.get (range_modifier); break;
896 case KW_dam_modifier: f.get (dam_modifier); break; 934 case KW_dam_modifier: f.get (dam_modifier); break;
897 case KW_duration_modifier: f.get (duration_modifier); break; 935 case KW_duration_modifier: f.get (duration_modifier); break;
898 936
899 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 937 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
900 //TODO: parse from other include files 938 //TODO: parse from other include files
901 case KW_body_range: f.get (body_info[0]); break; 939 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
902 case KW_body_arm: f.get (body_info[1]); break; 940 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
903 case KW_body_torso: f.get (body_info[2]); break; 941 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
904 case KW_body_head: f.get (body_info[3]); break; 942 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
905 case KW_body_neck: f.get (body_info[4]); break; 943 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
906 case KW_body_skill: f.get (body_info[5]); break; 944 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
907 case KW_body_finger: f.get (body_info[6]); break; 945 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
908 case KW_body_shoulder: f.get (body_info[7]); break; 946 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
909 case KW_body_foot: f.get (body_info[8]); break; 947 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
910 case KW_body_hand: f.get (body_info[9]); break; 948 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
911 case KW_body_wrist: f.get (body_info[10]); break; 949 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
912 case KW_body_waist: f.get (body_info[11]); break; 950 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
951 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
952 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
913 case KW_can_apply: 953 case KW_can_apply:
914 break; 954 break;
915 955
916 case KW_connected: 956 case KW_connected:
917 add_button_link (this, map, f.get_sint32 ()); 957 add_button_link (this, map, f.get_sint32 ());
918 break; 958 break;
919 959
920 case KW_randomitems: 960 case KW_randomitems:
921 randomitems = find_treasurelist (f.get_str ()); 961 if (f.get_str ())
962 {
963 randomitems =
964 loading_arch
965 ? treasurelist::get (f.get_str ())
966 : treasurelist::find (f.get_str ());
967
922 //if (!randomitems) 968 if (!randomitems)
923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 969 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
970 }
971 else
972 randomitems = 0;
924 break; 973 break;
925 974
926 case KW_msg: 975 case KW_msg:
927 f.get_ml (KW_endmsg, msg); 976 f.get_ml (KW_endmsg, msg);
928 //TODO: allow longer messages 977 //TODO: allow longer messages
… …
947 case KW_editable: 996 case KW_editable:
948 case KW_editor_folder: 997 case KW_editor_folder:
949 break; 998 break;
950 999
951 case KW_end: 1000 case KW_end:
952 check_loaded_object (this);
953
954 if (!arch_init) 1001 if (!loading_arch)
955 instantiate (); 1002 instantiate ();
956 1003
957 f.next (); 1004 f.next ();
958 return true; 1005 return true;
959 1006
… …
985 arch = archetype::find ("earthwall"); 1032 arch = archetype::find ("earthwall");
986 } 1033 }
987 1034
988 assert (arch); //D maybe use exception handling of sorts? 1035 assert (arch); //D maybe use exception handling of sorts?
989 1036
1037 f.next ();
1038
990 object *op = object::create (); 1039 object *op = object::create ();
991 1040
992 op->map = map; 1041 op->map = map;
993 op->arch = arch;
994 arch->clone.copy_to (op); 1042 arch->clone.copy_to (op);
995 // copy_to activates, this should be fixed properly 1043 // copy_to activates, this should be fixed properly
996 op->deactivate (); 1044 op->deactivate ();
997 1045
998 if (!op->parse_kv (f)) 1046 if (!op->parse_kv (f))
999 { 1047 {
1000 delete op; 1048 op->destroy (true);
1001 return 0; 1049 return 0;
1002 } 1050 }
1003 1051
1052 op->post_load_check ();
1004 return op; 1053 return op;
1005} 1054}
1006 1055
1007/* 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
1008 * as appropriate in op. 1057 * as appropriate in op.
… …
1013int 1062int
1014set_variable (object *op, char *buf) 1063set_variable (object *op, char *buf)
1015{ 1064{
1016 object_thawer f (buf, (AV *)0); 1065 object_thawer f (buf, (AV *)0);
1017 1066
1018 f.kw = KW_arch; // special hack so that parse_kv skips 1067 f.next ();
1019 return op->parse_kv (f); 1068 return op->parse_kv (f);
1020} 1069}
1021 1070
1022/* This returns a string of the integer movement type */ 1071/* This returns a string of the integer movement type */
1023#if 0 1072#if 0
… …
1104 KW_monster, 1153 KW_monster,
1105 KW_friendly, 1154 KW_friendly,
1106 KW_generator, 1155 KW_generator,
1107 KW_is_thrown, 1156 KW_is_thrown,
1108 KW_auto_apply, 1157 KW_auto_apply,
1109 KW_NULL, // was KW_treasure 1158 KW_treasure_env,
1110 KW_player_sold, 1159 KW_player_sold,
1111 /* 20 */ 1160 /* 20 */
1112 KW_see_invisible, 1161 KW_see_invisible,
1113 KW_can_roll, 1162 KW_can_roll,
1114 KW_overlay_floor, 1163 KW_overlay_floor,
… …
1175 KW_can_use_skill, 1224 KW_can_use_skill,
1176 KW_been_applied, 1225 KW_been_applied,
1177 /* 80 */ 1226 /* 80 */
1178 KW_has_ready_scroll, 1227 KW_has_ready_scroll,
1179 KW_can_use_rod, 1228 KW_can_use_rod,
1180 KW_NULL, 1229 KW_precious,
1181 KW_can_use_horn, 1230 KW_can_use_horn,
1182 KW_make_invisible, 1231 KW_make_invisible,
1183 KW_inv_locked, 1232 KW_inv_locked,
1184 KW_is_wooded, 1233 KW_is_wooded,
1185 KW_is_hilly, 1234 KW_is_hilly,
… …
1251 f.put (KW_msg, KW_endmsg, op->msg); 1300 f.put (KW_msg, KW_endmsg, op->msg);
1252 if (op->lore != tmp->lore) 1301 if (op->lore != tmp->lore)
1253 f.put (KW_lore, KW_endlore, op->lore); 1302 f.put (KW_lore, KW_endlore, op->lore);
1254 1303
1255 CMP_OUT (other_arch); 1304 CMP_OUT (other_arch);
1256 CMP_OUT (face); 1305
1306 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1257 1307
1258 if (op->animation_id != tmp->animation_id) 1308 if (op->animation_id != tmp->animation_id)
1259 if (op->animation_id) 1309 if (op->animation_id)
1260 { 1310 {
1261 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1311 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1358 if (op->flag != tmp->flag) 1408 if (op->flag != tmp->flag)
1359 for (i = 0; i <= NUM_FLAGS; i++) 1409 for (i = 0; i <= NUM_FLAGS; i++)
1360 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1410 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1361 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1411 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1362 1412
1363 /* Save body locations */ 1413 // save body locations
1364 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1414 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1365 if (op->body_info[i] != tmp->body_info[i]) 1415 if (op->slot[i].info != tmp->slot[i].info)
1366 f.put (body_locations[i].save_name, op->body_info[i]); 1416 f.put (body_locations[i].save_name, op->slot[i].info);
1367} 1417}
1368 1418
1369/* 1419/*
1370 * Dumps all variables in an object to a file. 1420 * Dumps all variables in an object to a file.
1371 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1421 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1394 return true; 1444 return true;
1395} 1445}
1396 1446
1397///////////////////////////////////////////////////////////////////////////// 1447/////////////////////////////////////////////////////////////////////////////
1398 1448
1449// generic resource file load,
1450// currently supports: region, treasures, archetypes
1399bool load_resource_file (const char *filename) 1451bool load_resource_file (const char *filename)
1400{ 1452{
1401 object_thawer f (filename); 1453 object_thawer f (filename);
1454
1455 bool success = false;
1456 bool seen_arch = false;
1402 1457
1403 f.next (); 1458 f.next ();
1404 1459
1405 for (;;) 1460 for (;;)
1406 { 1461 {
1407 switch (f.kw) 1462 switch (f.kw)
1408 { 1463 {
1409 case KW_region: 1464 case KW_region:
1410 if (!region::read (f)) 1465 if (!region::read (f))
1411 return false; 1466 goto finish;
1467 break;
1468
1469 case KW_treasure:
1470 case KW_treasureone:
1471 if (!treasurelist::read (f))
1472 goto finish;
1473 break;
1474
1475 case KW_object:
1476 seen_arch = true;
1477 if (!archetype::read (f))
1478 goto finish;
1412 break; 1479 break;
1413 1480
1414 case KW_EOF: 1481 case KW_EOF:
1415 return true; 1482 success = true;
1483 goto finish;
1416 1484
1417 default: 1485 default:
1418 if (!f.parse_error ("resource file")) 1486 if (!f.parse_error ("resource file"))
1419 return false; 1487 goto finish;
1488
1489 f.next ();
1490 break;
1420 } 1491 }
1421
1422 f.next ();
1423 } 1492 }
1493
1494finish:
1495 if (seen_arch)
1496 init_archetype_pointers ();
1497
1498 return success;
1424} 1499}
1425 1500

Diff Legend

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