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

Diff Legend

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