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

Diff Legend

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