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.65 by root, Wed Mar 14 04:12:27 2007 UTC vs.
Revision 1.94 by root, Tue Jul 31 20:03:33 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
250 "spell_cause_rabies", /* 204 */ 249 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 250 "spell_glyph", /* 205 */
252 NULL 251 NULL
253}; 252};
254 253
255extern int arch_init; 254extern bool loading_arch;
256 255
257/* This function checks the object after it has been loaded (when we 256/* 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 257 * 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 258 * 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. 259 * to check for objects to make sure there are no common errors.
261 */ 260 */
262static void 261void
263check_loaded_object (object *op) 262object::post_load_check ()
264{ 263{
264 if (type >= NUM_TYPES)
265 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0;
268 }
269
270 switch (type)
271 {
272 case BOW:
273 case WAND:
274 case ROD:
275 case HORN:
276 if (slot [body_range].info != -1)
277 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1;
280 }
281 break;
282
283 case WEAPON:
284 if (slot [body_combat].info != -1)
285 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1;
288 }
289 break;
290
291 case SHIELD:
292 if (slot [body_shield].info != -1)
293 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1;
296 }
297 break;
298
299 case PLAYER:
300 if (slot [body_shield].info != 1)
301 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1;
304 }
305
306 if (slot [body_combat].info != 1)
307 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1;
310 }
311
312 if (slot [body_range].info != 1)
313 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1;
316 }
317 break;
318 }
319
265 /* We do some specialised handling to handle legacy cases of name_pl. 320 /* 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 - 321 * 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 322 * 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 323 * 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 324 * 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. 325 * 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 326 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 328 */
274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
275 op->name_pl = 0; 330 name_pl = 0;
276 331
277 if (!op->name_pl) 332 if (!name_pl)
278 op->name_pl = op->name; 333 name_pl = name;
279 334
280 /* objects now have a materialname. try to patch it in */ 335 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 336 if (!(is_weapon () && level > 0))
282 { 337 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 338
289 /* only do these when program is first run - a bit 339 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 340 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 341 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 342 * not in the ideal fashion.
293 */ 343 */
294 if ((op->type == WEAPON || op->type == BOW) && arch_init) 344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 345 {
296 if (!op->skill) 346 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
298 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 349 (!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); 350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
301 } 351 }
302 352
303 /* We changed last_heal to gen_sp_armour, which is what it 353 /* We changed last_heal to gen_sp_armour, which is what it
304 * really does for many objects. Need to catch any in maps 354 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 355 * that may have an old value.
306 */ 356 */
307 if (op->type == WEAPON 357 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 358 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 359 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 360 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 361 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 362 || type == BRACERS || type == CLOAK)
313 { 363 {
314 if (op->last_heal) 364 if (last_heal)
315 { 365 {
316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
317 op->gen_sp_armour = op->last_heal; 367 gen_sp_armour = last_heal;
318 op->last_heal = 0; 368 last_heal = 0;
319 } 369 }
320 370
321 int ip = calc_item_power (op, 0); 371 int ip = calc_item_power (this, 0);
322 372
323 /* Legacy objects from before item power was in the game */ 373 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 374 if (!item_power && ip)
325 { 375 {
326 if (ip > 3) 376 if (ip > 3)
327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
328 378
329 op->item_power = ip; 379 item_power = ip;
330 } 380 }
331 381
332 /* Check for possibly bogus values. Has to meet both these criteria - 382 /* 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 383 * 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. 384 * 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, 385 * similarly, it item_power is 0, the first check will always pass,
336 * but not the second one. 386 * but not the second one.
337 */ 387 */
388#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 389 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); 390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif
340 } 392 }
341 393
342 /* Old spellcasting object - need to load in the appropiate object */ 394 /* 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 || 395 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 */ 396 /* 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) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
346 { 398 {
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 400 * in that spell was stored in sp.
349 */ 401 */
350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 403 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
353 } 405 }
354 406
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 407 /* 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) 408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 409 {
358 object *tmp = get_archetype_by_object_name (op->slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 411 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 414 value = arch->value * inv->value;
363 } 415 }
364 416
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 418 {
367 if (op->stats.hp > op->stats.maxhp) 419 if (stats.hp > stats.maxhp)
368 { 420 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 421 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; 422 stats.maxhp = stats.hp;
371 } 423 }
372 424
373 /* The archs just need to be updated for this */ 425 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 426 if (move_type == 0)
375 op->move_type = MOVE_WALK; 427 move_type = MOVE_WALK;
376 } 428 }
377 429
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
379 { 431 {
380 /* Object will duplicate it's content as part of the 432 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 433 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 434 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 435 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 436 */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 437 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 } 438 }
387 439
388 /* Handle player movers. We use move_type for player movers 440 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 441 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 442 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 443 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 444 * are doing, otherwise, set move_type based on maxhp value.
393 */ 445 */
394 if (op->type == PLAYERMOVER) 446 if (type == PLAYERMOVER)
395 { 447 {
396 if (!op->move_type) 448 if (!move_type)
397 { 449 {
398 if (op->stats.maxhp) 450 if (stats.maxhp)
399 { 451 {
400 op->move_type = MOVE_ALL; 452 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 453 stats.maxhp = 0;
402 } 454 }
403 else 455 else
404 op->move_type = MOVE_WALK; 456 move_type = MOVE_WALK;
405 } 457 }
406 } 458 }
407
408} 459}
409 460
410static void 461static void
411set_move (MoveType &mt, const char *str) 462set_move (MoveType &mt, const char *str)
412{ 463{
413 static const struct flagstr { 464 static const struct flagstr {
414 char *name; 465 const char *name;
415 MoveType flags; 466 MoveType flags;
416 } move_flags[] = { 467 } move_flags[] = {
417 { "walk" , MOVE_WALK }, 468 { "walk" , MOVE_WALK },
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 469 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 470 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 471 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 472 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 473 { "boat" , MOVE_BOAT },
474 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 475 { "all" , MOVE_ALL },
424 }; 476 };
425 477
426 if (!str) 478 if (!str)
427 { 479 {
… …
464 516
465next: ; 517next: ;
466 } 518 }
467} 519}
468 520
469#define GET_FLAG(op,flag) \ 521#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 522
475bool 523bool
476object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
477{ 525{
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; 526 object *op_inv = inv;
486 527
487 for (;;) 528 for (;;)
488 { 529 {
489 switch (f.kw) 530 switch (f.kw)
… …
551 } 592 }
552 } 593 }
553 continue; 594 continue;
554 595
555 case KW_other_arch: 596 case KW_other_arch:
597 other_arch =
598 loading_arch
599 ? archetype::get (f.get_str ())
556 other_arch = archetype::find (f.get_str ()); 600 : archetype::find (f.get_str ());
601
602 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
557 break; 604 break;
558 605
559 case KW_animation: 606 case KW_animation:
560 { 607 {
561 CLEAR_FLAG (this, FLAG_ANIMATE); 608 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
588 f.get (move_slow_penalty); 635 f.get (move_slow_penalty);
589 break; 636 break;
590 637
591 case KW_face: 638 case KW_face:
592 face = face_find (f.get_str ()); 639 face = face_find (f.get_str ());
640 break;
641
642 case KW_sound:
643 sound = sound_find (f.get_str ());
644 if (!sound)
645 {
646 //TODO: really fall back to face name?
647 char face[128];
648 snprintf (face, 128, "sound/%s", f.get_str ());
649 sound = face_find (face);
650 }
593 break; 651 break;
594 652
595 case KW_x: f.get (x); break; 653 case KW_x: f.get (x); break;
596 case KW_y: f.get (y); break; 654 case KW_y: f.get (y); break;
597 655
… …
724 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 782 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 783 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
726 784
727 break; 785 break;
728 786
729 case KW_wiz:
730 GET_FLAG (this, FLAG_WIZ);
731 //TODO: move to check_object
732 if (QUERY_FLAG (this, FLAG_WIZ))
733 {
734 SET_FLAG (this, FLAG_WAS_WIZ);
735 SET_FLAG (this, FLAG_WIZPASS);
736 SET_FLAG (this, FLAG_WIZCAST);
737 }
738 else
739 {
740 CLEAR_FLAG (this, FLAG_WIZPASS);
741 CLEAR_FLAG (this, FLAG_WIZCAST);
742 }
743 break;
744
745 case KW_friendly: 787 case KW_friendly:
746 if (f.get_sint32 ()) 788 if (f.get_bool ())
747 if (type != PLAYER) 789 if (type != PLAYER)
748 add_friendly_object (this); 790 add_friendly_object (this);
749 791
750 break; 792 break;
751 793
… …
780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 822 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 823 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 824 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 825 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 826 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
785 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
786 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 827 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
787 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 828 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 829 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 830 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
790 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 831 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 874 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 875 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 876 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 877 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; 878 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
879 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
880 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
838 881
839 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 882 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
840 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 883 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
841 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 884 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
842 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 885 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
888 case KW_dam_modifier: f.get (dam_modifier); break; 931 case KW_dam_modifier: f.get (dam_modifier); break;
889 case KW_duration_modifier: f.get (duration_modifier); break; 932 case KW_duration_modifier: f.get (duration_modifier); break;
890 933
891 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 934 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
892 //TODO: parse from other include files 935 //TODO: parse from other include files
893 case KW_body_range: f.get (body_info[0]); break; 936 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
894 case KW_body_arm: f.get (body_info[1]); break; 937 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
895 case KW_body_torso: f.get (body_info[2]); break; 938 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
896 case KW_body_head: f.get (body_info[3]); break; 939 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
897 case KW_body_neck: f.get (body_info[4]); break; 940 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
898 case KW_body_skill: f.get (body_info[5]); break; 941 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
899 case KW_body_finger: f.get (body_info[6]); break; 942 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
900 case KW_body_shoulder: f.get (body_info[7]); break; 943 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
901 case KW_body_foot: f.get (body_info[8]); break; 944 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
902 case KW_body_hand: f.get (body_info[9]); break; 945 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
903 case KW_body_wrist: f.get (body_info[10]); break; 946 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
904 case KW_body_waist: f.get (body_info[11]); break; 947 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
948 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
949 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
905 case KW_can_apply: 950 case KW_can_apply:
906 break; 951 break;
907 952
908 case KW_connected: 953 case KW_connected:
909 add_button_link (this, map, f.get_sint32 ()); 954 add_button_link (this, map, f.get_sint32 ());
910 break; 955 break;
911 956
912 case KW_randomitems: 957 case KW_randomitems:
913 randomitems = find_treasurelist (f.get_str ()); 958 if (f.get_str ())
959 {
960 randomitems =
961 loading_arch
962 ? treasurelist::get (f.get_str ())
963 : treasurelist::find (f.get_str ());
964
914 //if (!randomitems) 965 if (!randomitems)
915 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 966 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
967 }
968 else
969 randomitems = 0;
916 break; 970 break;
917 971
918 case KW_msg: 972 case KW_msg:
919 f.get_ml (KW_endmsg, msg); 973 f.get_ml (KW_endmsg, msg);
920 //TODO: allow longer messages
921 if (strlen (msg) >= HUGE_BUF)
922 {
923 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
924 msg = "ERROR, please report: string too long, winged.\n";
925 }
926 break; 974 break;
927 975
928 case KW_lore: 976 case KW_lore:
929 f.get_ml (KW_endlore, lore); 977 f.get_ml (KW_endlore, lore);
930 //TODO: allow longer messages
931 /* Just print a warning so we can be reasonably safe
932 * about not overflowing the buffer.
933 */
934 if (strlen (lore) > (HUGE_BUF / 2))
935 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
936 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
937 break; 978 break;
938 979
939 case KW_editable: 980 case KW_editable:
940 case KW_editor_folder: 981 case KW_editor_folder:
941 break; 982 break;
942 983
943 case KW_end: 984 case KW_end:
944 check_loaded_object (this);
945
946 if (!arch_init) 985 if (!loading_arch)
947 instantiate (); 986 instantiate ();
948 987
949 f.next (); 988 f.next ();
950 return true; 989 return true;
951 990
… …
977 arch = archetype::find ("earthwall"); 1016 arch = archetype::find ("earthwall");
978 } 1017 }
979 1018
980 assert (arch); //D maybe use exception handling of sorts? 1019 assert (arch); //D maybe use exception handling of sorts?
981 1020
1021 f.next ();
1022
982 object *op = object::create (); 1023 object *op = object::create ();
983 1024
984 op->map = map; 1025 op->map = map;
985 op->arch = arch;
986 arch->clone.copy_to (op); 1026 arch->copy_to (op);
987 // copy_to activates, this should be fixed properly 1027 // copy_to activates, this should be fixed properly
988 op->deactivate (); 1028 op->deactivate ();
989 1029
990 if (!op->parse_kv (f)) 1030 if (!op->parse_kv (f))
991 { 1031 {
992 delete op; 1032 op->destroy (true);
993 return 0; 1033 return 0;
994 } 1034 }
995 1035
1036 op->post_load_check ();
996 return op; 1037 return op;
997} 1038}
998 1039
999/* This takes a buffer, scans it for variables, and sets those variables 1040/* This takes a buffer, scans it for variables, and sets those variables
1000 * as appropriate in op. 1041 * as appropriate in op.
… …
1005int 1046int
1006set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1007{ 1048{
1008 object_thawer f (buf, (AV *)0); 1049 object_thawer f (buf, (AV *)0);
1009 1050
1010 f.kw = KW_arch; // special hack so that parse_kv skips 1051 f.next ();
1011 return op->parse_kv (f); 1052 return op->parse_kv (f);
1012} 1053}
1013 1054
1014/* This returns a string of the integer movement type */ 1055/* This returns a string of the integer movement type */
1015#if 0 1056#if 0
… …
1077 * the 15'th element of this array should match that name. 1118 * the 15'th element of this array should match that name.
1078 * If an entry is NULL, that is a flag not to loaded/saved. 1119 * If an entry is NULL, that is a flag not to loaded/saved.
1079 */ 1120 */
1080 static const keyword flag_names [NUM_FLAGS] = { 1121 static const keyword flag_names [NUM_FLAGS] = {
1081 KW_alive, 1122 KW_alive,
1082 KW_wiz,
1083 KW_NULL, 1123 KW_NULL,
1084 KW_NULL, 1124 KW_NULL,
1085 KW_was_wiz, 1125 KW_NULL,
1126 KW_NULL,
1086 KW_applied, 1127 KW_applied,
1087 KW_unpaid, 1128 KW_unpaid,
1088 KW_can_use_shield, 1129 KW_can_use_shield,
1089 KW_no_pick, 1130 KW_no_pick,
1090 KW_NULL, // walk_on 1131 KW_NULL, // walk_on
… …
1096 KW_monster, 1137 KW_monster,
1097 KW_friendly, 1138 KW_friendly,
1098 KW_generator, 1139 KW_generator,
1099 KW_is_thrown, 1140 KW_is_thrown,
1100 KW_auto_apply, 1141 KW_auto_apply,
1101 KW_NULL, // was KW_treasure 1142 KW_treasure_env,
1102 KW_player_sold, 1143 KW_player_sold,
1103 /* 20 */ 1144 /* 20 */
1104 KW_see_invisible, 1145 KW_see_invisible,
1105 KW_can_roll, 1146 KW_can_roll,
1106 KW_overlay_floor, 1147 KW_overlay_floor,
… …
1167 KW_can_use_skill, 1208 KW_can_use_skill,
1168 KW_been_applied, 1209 KW_been_applied,
1169 /* 80 */ 1210 /* 80 */
1170 KW_has_ready_scroll, 1211 KW_has_ready_scroll,
1171 KW_can_use_rod, 1212 KW_can_use_rod,
1172 KW_NULL, 1213 KW_precious,
1173 KW_can_use_horn, 1214 KW_can_use_horn,
1174 KW_make_invisible, 1215 KW_make_invisible,
1175 KW_inv_locked, 1216 KW_inv_locked,
1176 KW_is_wooded, 1217 KW_is_wooded,
1177 KW_is_hilly, 1218 KW_is_hilly,
… …
1236 CMP_OUT (name_pl); 1277 CMP_OUT (name_pl);
1237 CMP_OUT (custom_name); 1278 CMP_OUT (custom_name);
1238 CMP_OUT (title); 1279 CMP_OUT (title);
1239 CMP_OUT (race); 1280 CMP_OUT (race);
1240 CMP_OUT (slaying); 1281 CMP_OUT (slaying);
1241
1242 if (op->msg != tmp->msg)
1243 f.put (KW_msg, KW_endmsg, op->msg);
1244 if (op->lore != tmp->lore)
1245 f.put (KW_lore, KW_endlore, op->lore);
1246
1247 CMP_OUT (other_arch); 1282 CMP_OUT (other_arch);
1248 CMP_OUT (face); 1283
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1285 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1286
1287 if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0);
1288 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1249 1289
1250 if (op->animation_id != tmp->animation_id) 1290 if (op->animation_id != tmp->animation_id)
1251 if (op->animation_id) 1291 if (op->animation_id)
1252 { 1292 {
1253 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1254 1294
1255 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1295 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1256 f.put (KW_is_animated, (sint32) 0); 1296 f.put (KW_is_animated, (sint32)0);
1257 } 1297 }
1258 else 1298 else
1259 f.put (KW_animation, (const char *) 0); 1299 f.put (KW_animation, (const char *)0);
1260 1300
1261 CMP_OUT2 (str, stats.Str); 1301 CMP_OUT2 (str, stats.Str);
1262 CMP_OUT2 (dex, stats.Dex); 1302 CMP_OUT2 (dex, stats.Dex);
1263 CMP_OUT2 (con, stats.Con); 1303 CMP_OUT2 (con, stats.Con);
1264 CMP_OUT2 (wis, stats.Wis); 1304 CMP_OUT2 (wis, stats.Wis);
… …
1350 if (op->flag != tmp->flag) 1390 if (op->flag != tmp->flag)
1351 for (i = 0; i <= NUM_FLAGS; i++) 1391 for (i = 0; i <= NUM_FLAGS; i++)
1352 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1392 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1353 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1393 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1354 1394
1355 /* Save body locations */ 1395 // save body locations
1356 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1357 if (op->body_info[i] != tmp->body_info[i]) 1397 if (op->slot[i].info != tmp->slot[i].info)
1358 f.put (body_locations[i].save_name, op->body_info[i]); 1398 f.put (body_locations[i].save_name, op->slot[i].info);
1359} 1399}
1360 1400
1361/* 1401/*
1362 * Dumps all variables in an object to a file. 1402 * 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, 1403 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1372 if (owner) 1412 if (owner)
1373 return true; 1413 return true;
1374 1414
1375 archetype *at = arch ? (archetype *)arch : empty_archetype; 1415 archetype *at = arch ? (archetype *)arch : empty_archetype;
1376 1416
1377 f.put (KW_arch, at->name); 1417 f.put (KW_arch, at->archname);
1378 write_diff (f, this, &at->clone); 1418 write_diff (f, this, at);
1379 1419
1380 for (object *tmp = inv; tmp; tmp = tmp->below) 1420 for (object *tmp = inv; tmp; tmp = tmp->below)
1381 tmp->write (f); 1421 tmp->write (f);
1382 1422
1383 f.put (this); 1423 f.put (this);
… …
1386 return true; 1426 return true;
1387} 1427}
1388 1428
1389///////////////////////////////////////////////////////////////////////////// 1429/////////////////////////////////////////////////////////////////////////////
1390 1430
1431// generic resource file load,
1432// currently supports: region, treasures, archetypes
1391bool load_resource_file (const char *filename) 1433bool load_resource_file (const char *filename)
1392{ 1434{
1393 object_thawer f (filename); 1435 object_thawer f (filename);
1436
1437 bool success = false;
1438 bool seen_arch = false;
1394 1439
1395 f.next (); 1440 f.next ();
1396 1441
1397 for (;;) 1442 for (;;)
1398 { 1443 {
1399 switch (f.kw) 1444 switch (f.kw)
1400 { 1445 {
1401 case KW_region: 1446 case KW_region:
1402 if (!region::read (f)) 1447 if (!region::read (f))
1403 return false; 1448 goto finish;
1449 break;
1450
1451 case KW_treasure:
1452 case KW_treasureone:
1453 if (!treasurelist::read (f))
1454 goto finish;
1455 break;
1456
1457 case KW_object:
1458 seen_arch = true;
1459 if (!archetype::read (f))
1460 goto finish;
1404 break; 1461 break;
1405 1462
1406 case KW_EOF: 1463 case KW_EOF:
1407 return true; 1464 success = true;
1465 goto finish;
1408 1466
1409 default: 1467 default:
1410 if (!f.parse_error ("resource file")) 1468 if (!f.parse_error ("resource file"))
1411 return false; 1469 goto finish;
1470
1471 f.next ();
1472 break;
1412 } 1473 }
1413
1414 f.next ();
1415 } 1474 }
1475
1476finish:
1477 if (seen_arch)
1478 init_archetype_pointers ();
1479
1480 return success;
1416} 1481}
1417 1482

Diff Legend

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