ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.62 by root, Mon Feb 19 19:10:31 2007 UTC vs.
Revision 1.93 by root, Tue Jul 31 17:33:14 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. */
… …
29#include <global.h> 28#include <global.h>
30#include <loader.h> 29#include <loader.h>
31#include <sproto.h> 30#include <sproto.h>
32 31
33///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
34
35/* Maps the MOVE_* values to names */
36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
37 33
38/* This table is only necessary to convert objects that existed before the 34/* This table is only necessary to convert objects that existed before the
39 * spell object conversion to the new object. It was not practical 35 * spell object conversion to the new object. It was not practical
40 * to go through every mapping looking for every potion, rod, wand, etc 36 * 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 37 * that had a sp set and update to the new value. So this maps the
… …
253 "spell_cause_rabies", /* 204 */ 249 "spell_cause_rabies", /* 204 */
254 "spell_glyph", /* 205 */ 250 "spell_glyph", /* 205 */
255 NULL 251 NULL
256}; 252};
257 253
258extern int arch_init; 254extern bool loading_arch;
259 255
260/* 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
261 * 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
262 * 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
263 * 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.
264 */ 260 */
265static void 261void
266check_loaded_object (object *op) 262object::post_load_check ()
267{ 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
268 /* 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.
269 * 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 -
270 * 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
271 * 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
272 * 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
273 * 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.
274 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 328 */
277 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)
278 op->name_pl = 0; 330 name_pl = 0;
279 331
280 if (!op->name_pl) 332 if (!name_pl)
281 op->name_pl = op->name; 333 name_pl = name;
282 334
283 /* objects now have a materialname. try to patch it in */ 335 /* objects now have a materialname. try to patch it in */
284 if (!(op->is_weapon () && op->level > 0)) 336 if (!(is_weapon () && level > 0))
285 { 337 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 338
292 /* only do these when program is first run - a bit 339 /* only do these when program is first run - a bit
293 * excessive to do this at every run - most of this is 340 * excessive to do this at every run - most of this is
294 * really just to catch any errors - program will still run, but 341 * really just to catch any errors - program will still run, but
295 * not in the ideal fashion. 342 * not in the ideal fashion.
296 */ 343 */
297 if ((op->type == WEAPON || op->type == BOW) && arch_init) 344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
298 { 345 {
299 if (!op->skill) 346 if (!skill)
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
301 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) ||
302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 349 (!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); 350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
304 } 351 }
305 352
306 /* 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
307 * really does for many objects. Need to catch any in maps 354 * really does for many objects. Need to catch any in maps
308 * that may have an old value. 355 * that may have an old value.
309 */ 356 */
310 if (op->type == WEAPON 357 if (type == WEAPON
311 || op->type == ARMOUR || op->type == HELMET 358 || type == ARMOUR || type == HELMET
312 || op->type == SHIELD || op->type == RING 359 || type == SHIELD || type == RING
313 || op->type == BOOTS || op->type == GLOVES 360 || type == BOOTS || type == GLOVES
314 || op->type == AMULET || op->type == GIRDLE 361 || type == AMULET || type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK) 362 || type == BRACERS || type == CLOAK)
316 { 363 {
317 if (op->last_heal) 364 if (last_heal)
318 { 365 {
319 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 ());
320 op->gen_sp_armour = op->last_heal; 367 gen_sp_armour = last_heal;
321 op->last_heal = 0; 368 last_heal = 0;
322 } 369 }
323 370
324 int ip = calc_item_power (op, 0); 371 int ip = calc_item_power (this, 0);
325 372
326 /* Legacy objects from before item power was in the game */ 373 /* Legacy objects from before item power was in the game */
327 if (!op->item_power && ip) 374 if (!item_power && ip)
328 { 375 {
329 if (ip > 3) 376 if (ip > 3)
330 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);
331 378
332 op->item_power = ip; 379 item_power = ip;
333 } 380 }
334 381
335 /* Check for possibly bogus values. Has to meet both these criteria - 382 /* 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 383 * 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. 384 * 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, 385 * similarly, it item_power is 0, the first check will always pass,
339 * but not the second one. 386 * but not the second one.
340 */ 387 */
388#if 0 //TODO
341 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 389 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); 390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif
343 } 392 }
344 393
345 /* Old spellcasting object - need to load in the appropiate object */ 394 /* 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 || 395 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 */ 396 /* 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) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
349 { 398 {
350 /* 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'
351 * in that spell was stored in sp. 400 * in that spell was stored in sp.
352 */ 401 */
353 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]);
354 insert_ob_in_ob (tmp, op); 403 insert_ob_in_ob (tmp, this);
355 op->randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
356 } 405 }
357 406
358 /* 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 */
359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
360 { 409 {
361 object *tmp = get_archetype_by_object_name (op->slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
362 insert_ob_in_ob (tmp, op); 411 insert_ob_in_ob (tmp, this);
363 op->randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
364 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
365 op->value = op->arch->clone.value * op->inv->value; 414 value = arch->value * inv->value;
366 } 415 }
367 416
368 if (QUERY_FLAG (op, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
369 { 418 {
370 if (op->stats.hp > op->stats.maxhp) 419 if (stats.hp > stats.maxhp)
371 { 420 {
372 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);
373 op->stats.maxhp = op->stats.hp; 422 stats.maxhp = stats.hp;
374 } 423 }
375 424
376 /* The archs just need to be updated for this */ 425 /* The archs just need to be updated for this */
377 if (op->move_type == 0) 426 if (move_type == 0)
378 op->move_type = MOVE_WALK; 427 move_type = MOVE_WALK;
379 } 428 }
380 429
381 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)
382 { 431 {
383 /* Object will duplicate it's content as part of the 432 /* Object will duplicate it's content as part of the
384 * generation process. To do this, we must flag inventory 433 * generation process. To do this, we must flag inventory
385 * so it remains unevaluated concerning the randomitems and 434 * so it remains unevaluated concerning the randomitems and
386 * the living (a demonlord shouldn't cast from inside generator!) 435 * the living (a demonlord shouldn't cast from inside generator!)
387 */ 436 */
388 flag_inv (op, FLAG_IS_A_TEMPLATE); 437 flag_inv (this, FLAG_IS_A_TEMPLATE);
389 } 438 }
390 439
391 /* Handle player movers. We use move_type for player movers 440 /* Handle player movers. We use move_type for player movers
392 * because they operate on their own time (move_on 441 * because they operate on their own time (move_on
393 * would potentially cause them to be triggered when someone steps 442 * would potentially cause them to be triggered when someone steps
394 * 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
395 * are doing, otherwise, set move_type based on maxhp value. 444 * are doing, otherwise, set move_type based on maxhp value.
396 */ 445 */
397 if (op->type == PLAYERMOVER) 446 if (type == PLAYERMOVER)
398 { 447 {
399 if (!op->move_type) 448 if (!move_type)
400 { 449 {
401 if (op->stats.maxhp) 450 if (stats.maxhp)
402 { 451 {
403 op->move_type = MOVE_ALL; 452 move_type = MOVE_ALL;
404 op->stats.maxhp = 0; 453 stats.maxhp = 0;
405 } 454 }
406 else 455 else
407 op->move_type = MOVE_WALK; 456 move_type = MOVE_WALK;
408 } 457 }
409 } 458 }
410
411} 459}
412 460
413static void 461static void
414set_move (MoveType & mt, const char *str) 462set_move (MoveType &mt, const char *str)
415{ 463{
464 static const struct flagstr {
465 const char *name;
466 MoveType flags;
467 } move_flags[] = {
468 { "walk" , MOVE_WALK },
469 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
470 { "fly_low" , MOVE_FLY_LOW },
471 { "fly_high", MOVE_FLY_HIGH },
472 { "swim" , MOVE_SWIM },
473 { "boat" , MOVE_BOAT },
474 { "ship" , MOVE_SHIP },
475 { "all" , MOVE_ALL },
476 };
477
416 if (!str) 478 if (!str)
417 { 479 {
418 mt = 0; 480 mt = 0;
419 return; 481 return;
420 } 482 }
… …
427 489
428 mt = 0; 490 mt = 0;
429 491
430 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 492 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
431 { 493 {
432 if (!strcasecmp (str, "all")) 494 bool negate = 0;
433 mt |= MOVE_ALL; 495
434 else 496 if (*str == '-')
435 { 497 {
436 int i, negate = 0; 498 negate = 1;
499 str++;
500 }
437 501
438 if (*str == '-') 502 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
503 {
504 if (!strcmp (f->name, str))
439 { 505 {
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) 506 if (negate)
449 mt &= ~(1 << i); 507 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 508 else
471 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); 509 mt |= f->flags;
510
511 goto next;
472 } 512 }
473 } 513 }
514
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
516
517next: ;
474 } 518 }
475} 519}
476 520
477#define GET_FLAG(op,flag) \ 521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
478 if (f.get_sint32 ()) \
479 SET_FLAG (op, flag); \
480 else \
481 CLEAR_FLAG (op, flag) \
482 522
483bool 523bool
484object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
485{ 525{
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; 526 object *op_inv = inv;
494 527
495 for (;;) 528 for (;;)
496 { 529 {
497 switch (f.kw) 530 switch (f.kw)
… …
559 } 592 }
560 } 593 }
561 continue; 594 continue;
562 595
563 case KW_other_arch: 596 case KW_other_arch:
597 other_arch =
598 loading_arch
599 ? archetype::get (f.get_str ())
564 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 ());
565 break; 604 break;
566 605
567 case KW_animation: 606 case KW_animation:
568 { 607 {
569 CLEAR_FLAG (this, FLAG_ANIMATE); 608 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
595 move_slow |= MOVE_WALK; 634 move_slow |= MOVE_WALK;
596 f.get (move_slow_penalty); 635 f.get (move_slow_penalty);
597 break; 636 break;
598 637
599 case KW_face: 638 case KW_face:
600 face = &new_faces[FindFace (f.get_str (), 0)]; 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 sound = face_find (f.get_str ());//TODO: really fall back to face name?
601 break; 646 break;
602 647
603 case KW_x: f.get (x); break; 648 case KW_x: f.get (x); break;
604 case KW_y: f.get (y); break; 649 case KW_y: f.get (y); break;
605 650
… …
732 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 777 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
733 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 778 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
734 779
735 break; 780 break;
736 781
737 case KW_wiz:
738 GET_FLAG (this, FLAG_WIZ);
739 //TODO: move to check_object
740 if (QUERY_FLAG (this, FLAG_WIZ))
741 {
742 SET_FLAG (this, FLAG_WAS_WIZ);
743 SET_FLAG (this, FLAG_WIZPASS);
744 SET_FLAG (this, FLAG_WIZCAST);
745 }
746 else
747 {
748 CLEAR_FLAG (this, FLAG_WIZPASS);
749 CLEAR_FLAG (this, FLAG_WIZCAST);
750 }
751 break;
752
753 case KW_friendly: 782 case KW_friendly:
754 if (f.get_sint32 ()) 783 if (f.get_bool ())
755 if (type != PLAYER) 784 if (type != PLAYER)
756 add_friendly_object (this); 785 add_friendly_object (this);
757 786
758 break; 787 break;
759 788
… …
788 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 817 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
789 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 818 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
790 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 819 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
791 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 820 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
792 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 821 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
793 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
794 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 822 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
795 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 823 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
796 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 824 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
797 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 825 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
798 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 826 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 869 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 870 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 871 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 872 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; 873 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
874 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
875 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
846 876
847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 877 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 878 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 879 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 880 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
886 case KW_glow_radius: f.get (glow_radius); break; 916 case KW_glow_radius: f.get (glow_radius); break;
887 case KW_weapontype: f.get (weapontype); break; 917 case KW_weapontype: f.get (weapontype); break;
888 case KW_tooltype: f.get (tooltype); break; 918 case KW_tooltype: f.get (tooltype); break;
889 case KW_casting_time: f.get (casting_time); break; 919 case KW_casting_time: f.get (casting_time); break;
890 case KW_elevation: f.get (elevation); break; 920 case KW_elevation: f.get (elevation); break;
891 case KW_smoothlevel: f.get (smoothlevel); break; 921 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
892 case KW_client_type: f.get (client_type); break; 922 case KW_client_type: f.get (client_type); break;
893 case KW_duration: f.get (duration); break; 923 case KW_duration: f.get (duration); break;
894 case KW_range: f.get (range); break; 924 case KW_range: f.get (range); break;
895 case KW_range_modifier: f.get (range_modifier); break; 925 case KW_range_modifier: f.get (range_modifier); break;
896 case KW_dam_modifier: f.get (dam_modifier); break; 926 case KW_dam_modifier: f.get (dam_modifier); break;
897 case KW_duration_modifier: f.get (duration_modifier); break; 927 case KW_duration_modifier: f.get (duration_modifier); break;
898 928
899 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 929 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
900 //TODO: parse from other include files 930 //TODO: parse from other include files
901 case KW_body_range: f.get (body_info[0]); break; 931 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
902 case KW_body_arm: f.get (body_info[1]); break; 932 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
903 case KW_body_torso: f.get (body_info[2]); break; 933 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
904 case KW_body_head: f.get (body_info[3]); break; 934 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
905 case KW_body_neck: f.get (body_info[4]); break; 935 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
906 case KW_body_skill: f.get (body_info[5]); break; 936 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
907 case KW_body_finger: f.get (body_info[6]); break; 937 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
908 case KW_body_shoulder: f.get (body_info[7]); break; 938 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
909 case KW_body_foot: f.get (body_info[8]); break; 939 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
910 case KW_body_hand: f.get (body_info[9]); break; 940 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
911 case KW_body_wrist: f.get (body_info[10]); break; 941 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
912 case KW_body_waist: f.get (body_info[11]); break; 942 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
943 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
944 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
913 case KW_can_apply: 945 case KW_can_apply:
914 break; 946 break;
915 947
916 case KW_connected: 948 case KW_connected:
917 add_button_link (this, map, f.get_sint32 ()); 949 add_button_link (this, map, f.get_sint32 ());
918 break; 950 break;
919 951
920 case KW_randomitems: 952 case KW_randomitems:
921 randomitems = find_treasurelist (f.get_str ()); 953 if (f.get_str ())
954 {
955 randomitems =
956 loading_arch
957 ? treasurelist::get (f.get_str ())
958 : treasurelist::find (f.get_str ());
959
922 //if (!randomitems) 960 if (!randomitems)
923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 961 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
962 }
963 else
964 randomitems = 0;
924 break; 965 break;
925 966
926 case KW_msg: 967 case KW_msg:
927 f.get_ml (KW_endmsg, msg); 968 f.get_ml (KW_endmsg, msg);
928 //TODO: allow longer messages
929 if (strlen (msg) >= HUGE_BUF)
930 {
931 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
932 msg = "ERROR, please report: string too long, winged.\n";
933 }
934 break; 969 break;
935 970
936 case KW_lore: 971 case KW_lore:
937 f.get_ml (KW_endlore, lore); 972 f.get_ml (KW_endlore, lore);
938 //TODO: allow longer messages
939 /* Just print a warning so we can be reasonably safe
940 * about not overflowing the buffer.
941 */
942 if (strlen (lore) > (HUGE_BUF / 2))
943 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
944 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
945 break; 973 break;
946 974
947 case KW_editable: 975 case KW_editable:
948 case KW_editor_folder: 976 case KW_editor_folder:
949 break; 977 break;
950 978
951 case KW_end: 979 case KW_end:
952 check_loaded_object (this);
953
954 if (!arch_init) 980 if (!loading_arch)
955 instantiate (); 981 instantiate ();
956 982
957 f.next (); 983 f.next ();
958 return true; 984 return true;
959 985
… …
985 arch = archetype::find ("earthwall"); 1011 arch = archetype::find ("earthwall");
986 } 1012 }
987 1013
988 assert (arch); //D maybe use exception handling of sorts? 1014 assert (arch); //D maybe use exception handling of sorts?
989 1015
1016 f.next ();
1017
990 object *op = object::create (); 1018 object *op = object::create ();
991 1019
992 op->map = map; 1020 op->map = map;
993 op->arch = arch;
994 arch->clone.copy_to (op); 1021 arch->copy_to (op);
995 // copy_to activates, this should be fixed properly 1022 // copy_to activates, this should be fixed properly
996 op->deactivate (); 1023 op->deactivate ();
997 1024
998 if (!op->parse_kv (f)) 1025 if (!op->parse_kv (f))
999 { 1026 {
1000 delete op; 1027 op->destroy (true);
1001 return 0; 1028 return 0;
1002 } 1029 }
1003 1030
1031 op->post_load_check ();
1004 return op; 1032 return op;
1005} 1033}
1006 1034
1007/* This takes a buffer, scans it for variables, and sets those variables 1035/* This takes a buffer, scans it for variables, and sets those variables
1008 * as appropriate in op. 1036 * as appropriate in op.
… …
1013int 1041int
1014set_variable (object *op, char *buf) 1042set_variable (object *op, char *buf)
1015{ 1043{
1016 object_thawer f (buf, (AV *)0); 1044 object_thawer f (buf, (AV *)0);
1017 1045
1018 f.kw = KW_arch; // special hack so that parse_kv skips 1046 f.next ();
1019 return op->parse_kv (f); 1047 return op->parse_kv (f);
1020} 1048}
1021 1049
1022/* This returns a string of the integer movement type */ 1050/* This returns a string of the integer movement type */
1023#if 0 1051#if 0
… …
1085 * the 15'th element of this array should match that name. 1113 * the 15'th element of this array should match that name.
1086 * If an entry is NULL, that is a flag not to loaded/saved. 1114 * If an entry is NULL, that is a flag not to loaded/saved.
1087 */ 1115 */
1088 static const keyword flag_names [NUM_FLAGS] = { 1116 static const keyword flag_names [NUM_FLAGS] = {
1089 KW_alive, 1117 KW_alive,
1090 KW_wiz,
1091 KW_NULL, 1118 KW_NULL,
1092 KW_NULL, 1119 KW_NULL,
1093 KW_was_wiz, 1120 KW_NULL,
1121 KW_NULL,
1094 KW_applied, 1122 KW_applied,
1095 KW_unpaid, 1123 KW_unpaid,
1096 KW_can_use_shield, 1124 KW_can_use_shield,
1097 KW_no_pick, 1125 KW_no_pick,
1098 KW_NULL, // walk_on 1126 KW_NULL, // walk_on
… …
1104 KW_monster, 1132 KW_monster,
1105 KW_friendly, 1133 KW_friendly,
1106 KW_generator, 1134 KW_generator,
1107 KW_is_thrown, 1135 KW_is_thrown,
1108 KW_auto_apply, 1136 KW_auto_apply,
1109 KW_NULL, // was KW_treasure 1137 KW_treasure_env,
1110 KW_player_sold, 1138 KW_player_sold,
1111 /* 20 */ 1139 /* 20 */
1112 KW_see_invisible, 1140 KW_see_invisible,
1113 KW_can_roll, 1141 KW_can_roll,
1114 KW_overlay_floor, 1142 KW_overlay_floor,
… …
1175 KW_can_use_skill, 1203 KW_can_use_skill,
1176 KW_been_applied, 1204 KW_been_applied,
1177 /* 80 */ 1205 /* 80 */
1178 KW_has_ready_scroll, 1206 KW_has_ready_scroll,
1179 KW_can_use_rod, 1207 KW_can_use_rod,
1180 KW_NULL, 1208 KW_precious,
1181 KW_can_use_horn, 1209 KW_can_use_horn,
1182 KW_make_invisible, 1210 KW_make_invisible,
1183 KW_inv_locked, 1211 KW_inv_locked,
1184 KW_is_wooded, 1212 KW_is_wooded,
1185 KW_is_hilly, 1213 KW_is_hilly,
… …
1244 CMP_OUT (name_pl); 1272 CMP_OUT (name_pl);
1245 CMP_OUT (custom_name); 1273 CMP_OUT (custom_name);
1246 CMP_OUT (title); 1274 CMP_OUT (title);
1247 CMP_OUT (race); 1275 CMP_OUT (race);
1248 CMP_OUT (slaying); 1276 CMP_OUT (slaying);
1249
1250 if (op->msg != tmp->msg)
1251 f.put (KW_msg, KW_endmsg, op->msg);
1252 if (op->lore != tmp->lore)
1253 f.put (KW_lore, KW_endlore, op->lore);
1254
1255 CMP_OUT (other_arch); 1277 CMP_OUT (other_arch);
1256 CMP_OUT (face); 1278
1279 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1280 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1281
1282 if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0);
1283 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1257 1284
1258 if (op->animation_id != tmp->animation_id) 1285 if (op->animation_id != tmp->animation_id)
1259 if (op->animation_id) 1286 if (op->animation_id)
1260 { 1287 {
1261 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1288 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1262 1289
1263 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1290 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1264 f.put (KW_is_animated, (sint32) 0); 1291 f.put (KW_is_animated, (sint32)0);
1265 } 1292 }
1266 else 1293 else
1267 f.put (KW_animation, (const char *) 0); 1294 f.put (KW_animation, (const char *)0);
1268 1295
1269 CMP_OUT2 (str, stats.Str); 1296 CMP_OUT2 (str, stats.Str);
1270 CMP_OUT2 (dex, stats.Dex); 1297 CMP_OUT2 (dex, stats.Dex);
1271 CMP_OUT2 (con, stats.Con); 1298 CMP_OUT2 (con, stats.Con);
1272 CMP_OUT2 (wis, stats.Wis); 1299 CMP_OUT2 (wis, stats.Wis);
… …
1358 if (op->flag != tmp->flag) 1385 if (op->flag != tmp->flag)
1359 for (i = 0; i <= NUM_FLAGS; i++) 1386 for (i = 0; i <= NUM_FLAGS; i++)
1360 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1387 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1361 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1388 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1362 1389
1363 /* Save body locations */ 1390 // save body locations
1364 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1391 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1365 if (op->body_info[i] != tmp->body_info[i]) 1392 if (op->slot[i].info != tmp->slot[i].info)
1366 f.put (body_locations[i].save_name, op->body_info[i]); 1393 f.put (body_locations[i].save_name, op->slot[i].info);
1367} 1394}
1368 1395
1369/* 1396/*
1370 * Dumps all variables in an object to a file. 1397 * Dumps all variables in an object to a file.
1371 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1398 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1380 if (owner) 1407 if (owner)
1381 return true; 1408 return true;
1382 1409
1383 archetype *at = arch ? (archetype *)arch : empty_archetype; 1410 archetype *at = arch ? (archetype *)arch : empty_archetype;
1384 1411
1385 f.put (KW_arch, at->name); 1412 f.put (KW_arch, at->archname);
1386 write_diff (f, this, &at->clone); 1413 write_diff (f, this, at);
1387 1414
1388 for (object *tmp = inv; tmp; tmp = tmp->below) 1415 for (object *tmp = inv; tmp; tmp = tmp->below)
1389 tmp->write (f); 1416 tmp->write (f);
1390 1417
1391 f.put (this); 1418 f.put (this);
… …
1394 return true; 1421 return true;
1395} 1422}
1396 1423
1397///////////////////////////////////////////////////////////////////////////// 1424/////////////////////////////////////////////////////////////////////////////
1398 1425
1426// generic resource file load,
1427// currently supports: region, treasures, archetypes
1399bool load_resource_file (const char *filename) 1428bool load_resource_file (const char *filename)
1400{ 1429{
1401 object_thawer f (filename); 1430 object_thawer f (filename);
1431
1432 bool success = false;
1433 bool seen_arch = false;
1402 1434
1403 f.next (); 1435 f.next ();
1404 1436
1405 for (;;) 1437 for (;;)
1406 { 1438 {
1407 switch (f.kw) 1439 switch (f.kw)
1408 { 1440 {
1409 case KW_region: 1441 case KW_region:
1410 if (!region::read (f)) 1442 if (!region::read (f))
1411 return false; 1443 goto finish;
1444 break;
1445
1446 case KW_treasure:
1447 case KW_treasureone:
1448 if (!treasurelist::read (f))
1449 goto finish;
1450 break;
1451
1452 case KW_object:
1453 seen_arch = true;
1454 if (!archetype::read (f))
1455 goto finish;
1412 break; 1456 break;
1413 1457
1414 case KW_EOF: 1458 case KW_EOF:
1415 return true; 1459 success = true;
1460 goto finish;
1416 1461
1417 default: 1462 default:
1418 if (!f.parse_error ("resource file")) 1463 if (!f.parse_error ("resource file"))
1419 return false; 1464 goto finish;
1465
1466 f.next ();
1467 break;
1420 } 1468 }
1421
1422 f.next ();
1423 } 1469 }
1470
1471finish:
1472 if (seen_arch)
1473 init_archetype_pointers ();
1474
1475 return success;
1424} 1476}
1425 1477

Diff Legend

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