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.63 by root, Mon Mar 5 15:36:29 2007 UTC vs.
Revision 1.109 by root, Sun Apr 20 00:44:12 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
34 35
35/* This table is only necessary to convert objects that existed before the 36/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 38 * to go through every mapping looking for every potion, rod, wand, etc
38 * that had a sp set and update to the new value. So this maps the 39 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
252 NULL 253 NULL
253}; 254};
254 255
255extern int arch_init;
256
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 (llevError, "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 /* Firewall 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 */
402 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 404 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
353 } 406 }
354 407
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 408 /* 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) 409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 410 {
411 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 412 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 413 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = NULL; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 415 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 416 value = arch->value * inv->value;
363 } 417 }
364 418
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 419 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 420 {
367 if (op->stats.hp > op->stats.maxhp) 421 if (stats.hp > stats.maxhp)
368 { 422 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 423 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
370 op->stats.maxhp = op->stats.hp; 424 stats.maxhp = stats.hp;
371 } 425 }
372 426
373 /* The archs just need to be updated for this */ 427 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 428 if (move_type == 0)
375 op->move_type = MOVE_WALK; 429 move_type = MOVE_WALK;
376 } 430 }
377 431
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 432 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
379 {
380 /* Object will duplicate it's content as part of the 433 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 434 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 435 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 436 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 437 */
438 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 439 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 440
388 /* Handle player movers. We use move_type for player movers 441 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 442 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 443 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 444 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 445 * are doing, otherwise, set move_type based on maxhp value.
393 */ 446 */
394 if (op->type == PLAYERMOVER) 447 if (type == PLAYERMOVER)
395 { 448 {
396 if (!op->move_type) 449 if (!move_type)
397 { 450 {
398 if (op->stats.maxhp) 451 if (stats.maxhp)
399 { 452 {
400 op->move_type = MOVE_ALL; 453 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 454 stats.maxhp = 0;
402 } 455 }
403 else 456 else
404 op->move_type = MOVE_WALK; 457 move_type = MOVE_WALK;
405 } 458 }
406 } 459 }
407
408} 460}
409 461
410static void 462static void
411set_move (MoveType &mt, const char *str) 463set_move (MoveType &mt, const char *str)
412{ 464{
413 static const struct flagstr { 465 static const struct flagstr {
414 char *name; 466 const char *name;
415 MoveType flags; 467 MoveType flags;
416 } move_flags[] = { 468 } move_flags[] = {
417 { "walk" , MOVE_WALK }, 469 { "walk" , MOVE_WALK },
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 470 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 471 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 472 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 473 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 474 { "boat" , MOVE_BOAT },
475 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 476 { "all" , MOVE_ALL },
424 }; 477 };
425 478
426 if (!str) 479 if (!str)
427 { 480 {
… …
458 511
459 goto next; 512 goto next;
460 } 513 }
461 } 514 }
462 515
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 516 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
464 517
465next: ; 518next: ;
466 } 519 }
467} 520}
468 521
469#define GET_FLAG(op,flag) \ 522#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 523
475bool 524bool
476object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
477{ 526{
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; 527 object *op_inv = inv;
486 528
487 for (;;) 529 for (;;)
488 { 530 {
489 switch (f.kw) 531 switch (f.kw)
490 { 532 {
491 case KW_uuid: 533 case KW_uuid:
492 if (const char *s = f.get_str ()) 534 if (const char *s = f.get_str ())
493 { 535 if (!uuid.parse (s))
494 unsigned int version;
495 unsigned long long seq;
496
497 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
498 { 536 {
499 uuid.seq = seq; 537 f.parse_warn ("unparseable uuid");
500 break; 538 uuid = UUID::gen ();
501 } 539 }
502 }
503
504 uuid = gen_uuid ();
505 break; 540 break;
506 541
507 case KW_oid: 542 case KW_oid:
508 f.get (this, f.get_sint32 ()); 543 f.get (this, f.get_sint32 ());
509 break; 544 break;
… …
515 550
516 case KW_attach: f.get_ornull (attach); break; 551 case KW_attach: f.get_ornull (attach); break;
517 case KW_skill: f.get_ornull (skill); break; 552 case KW_skill: f.get_ornull (skill); break;
518 case KW_race: f.get_ornull (race); break; 553 case KW_race: f.get_ornull (race); break;
519 case KW_slaying: f.get_ornull (slaying); break; 554 case KW_slaying: f.get_ornull (slaying); break;
555 case KW_tag: f.get_ornull (tag); break;
520 556
521 case KW_arch: 557 case KW_arch:
522 { 558 {
523 object *tmp = object::read (f); 559 object *tmp = object::read (f);
524 tmp->deactivate (); 560 tmp->deactivate ();
… …
526 { 562 {
527 // was: insert_ob_in_ob (tmp, op); 563 // was: insert_ob_in_ob (tmp, op);
528 // but manually adding it can improve map loading times a lot 564 // but manually adding it can improve map loading times a lot
529 // also, appending instead of prepending keeps the 565 // also, appending instead of prepending keeps the
530 // save ordering the same between repeated load/saves. 566 // save ordering the same between repeated load/saves.
567 // and finally we do not want any funny effects
531 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 568 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
532 CLEAR_FLAG (tmp, FLAG_REMOVED); 569 CLEAR_FLAG (tmp, FLAG_REMOVED);
533 570
534 if (!op_inv) 571 if (!op_inv)
535 { 572 {
… …
551 } 588 }
552 } 589 }
553 continue; 590 continue;
554 591
555 case KW_other_arch: 592 case KW_other_arch:
593 if (loading_arch == this)
594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
595 else
596 {
556 other_arch = archetype::find (f.get_str ()); 597 other_arch = archetype::find (f.get_str ());
598
599 if (!other_arch)
600 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
601 }
602 break;
603
604 case KW_owner:
605 f.delayed_deref (this, owner, f.get_str ());
557 break; 606 break;
558 607
559 case KW_animation: 608 case KW_animation:
560 { 609 {
561 CLEAR_FLAG (this, FLAG_ANIMATE); 610 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
587 move_slow |= MOVE_WALK; 636 move_slow |= MOVE_WALK;
588 f.get (move_slow_penalty); 637 f.get (move_slow_penalty);
589 break; 638 break;
590 639
591 case KW_face: 640 case KW_face:
592 face = &new_faces[FindFace (f.get_str (), 0)]; 641 face = face_find (f.get_str ());
642 break;
643
644 case KW_sound:
645 sound = sound_find (f.get_str ());
646 if (!sound)
647 f.parse_warn ("sound not found");
648 break;
649
650 case KW_sound_destroy:
651 sound_destroy = sound_find (f.get_str ());
652 if (!sound_destroy)
653 f.parse_warn ("sound not found");
593 break; 654 break;
594 655
595 case KW_x: f.get (x); break; 656 case KW_x: f.get (x); break;
596 case KW_y: f.get (y); break; 657 case KW_y: f.get (y); break;
597 658
… …
724 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 785 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 786 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
726 787
727 break; 788 break;
728 789
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: 790 case KW_friendly:
746 if (f.get_sint32 ()) 791 if (f.get_bool ())
747 if (type != PLAYER) 792 if (type != PLAYER)
748 add_friendly_object (this); 793 add_friendly_object (this);
749 794
750 break; 795 break;
751 796
… …
764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
765 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 810 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 813 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
814 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 826 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 827 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 828 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 829 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 830 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; 831 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; 832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 834 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; 835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 878 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 879 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 880 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 881 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; 882 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
883 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
884 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
838 885
839 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 886 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
840 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 887 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
841 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 888 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
842 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 889 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
878 case KW_glow_radius: f.get (glow_radius); break; 925 case KW_glow_radius: f.get (glow_radius); break;
879 case KW_weapontype: f.get (weapontype); break; 926 case KW_weapontype: f.get (weapontype); break;
880 case KW_tooltype: f.get (tooltype); break; 927 case KW_tooltype: f.get (tooltype); break;
881 case KW_casting_time: f.get (casting_time); break; 928 case KW_casting_time: f.get (casting_time); break;
882 case KW_elevation: f.get (elevation); break; 929 case KW_elevation: f.get (elevation); break;
883 case KW_smoothlevel: f.get (smoothlevel); break; 930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
884 case KW_client_type: f.get (client_type); break; 931 case KW_client_type: f.get (client_type); break;
885 case KW_duration: f.get (duration); break; 932 case KW_duration: f.get (duration); break;
886 case KW_range: f.get (range); break; 933 case KW_range: f.get (range); break;
887 case KW_range_modifier: f.get (range_modifier); break; 934 case KW_range_modifier: f.get (range_modifier); break;
888 case KW_dam_modifier: f.get (dam_modifier); break; 935 case KW_dam_modifier: f.get (dam_modifier); break;
889 case KW_duration_modifier: f.get (duration_modifier); break; 936 case KW_duration_modifier: f.get (duration_modifier); break;
890 937
891 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 938 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
892 //TODO: parse from other include files 939 //TODO: parse from other include files
893 case KW_body_range: f.get (body_info[0]); break; 940 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
894 case KW_body_arm: f.get (body_info[1]); break; 941 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
895 case KW_body_torso: f.get (body_info[2]); break; 942 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
896 case KW_body_head: f.get (body_info[3]); break; 943 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
897 case KW_body_neck: f.get (body_info[4]); break; 944 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
898 case KW_body_skill: f.get (body_info[5]); break; 945 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
899 case KW_body_finger: f.get (body_info[6]); break; 946 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
900 case KW_body_shoulder: f.get (body_info[7]); break; 947 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
901 case KW_body_foot: f.get (body_info[8]); break; 948 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
902 case KW_body_hand: f.get (body_info[9]); break; 949 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
903 case KW_body_wrist: f.get (body_info[10]); break; 950 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
904 case KW_body_waist: f.get (body_info[11]); break; 951 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
952 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
953 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
905 case KW_can_apply: 954 case KW_can_apply:
906 break; 955 break;
907 956
908 case KW_connected: 957 case KW_connected:
909 add_button_link (this, map, f.get_sint32 ()); 958 add_button_link (this, map, f.get_sint32 ());
910 break; 959 break;
911 960
912 case KW_randomitems: 961 case KW_randomitems:
913 randomitems = find_treasurelist (f.get_str ()); 962 if (f.get_str ())
963 {
964 randomitems =
965 loading_arch
966 ? treasurelist::get (f.get_str ())
967 : treasurelist::find (f.get_str ());
968
914 //if (!randomitems) 969 if (!randomitems)
915 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 970 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
971 }
972 else
973 randomitems = 0;
916 break; 974 break;
917 975
918 case KW_msg: 976 case KW_msg:
919 f.get_ml (KW_endmsg, msg); 977 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; 978 break;
927 979
928 case KW_lore: 980 case KW_lore:
929 f.get_ml (KW_endlore, lore); 981 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; 982 break;
938 983
939 case KW_editable: 984 case KW_editable:
940 case KW_editor_folder: 985 case KW_editor_folder:
941 break; 986 break;
942 987
943 case KW_end: 988 case KW_end:
944 check_loaded_object (this);
945
946 if (!arch_init) 989 if (!loading_arch)
947 instantiate (); 990 instantiate ();
948 991
949 f.next (); 992 f.next ();
950 return true; 993 return true;
951 994
… …
977 arch = archetype::find ("earthwall"); 1020 arch = archetype::find ("earthwall");
978 } 1021 }
979 1022
980 assert (arch); //D maybe use exception handling of sorts? 1023 assert (arch); //D maybe use exception handling of sorts?
981 1024
1025 f.next ();
1026
982 object *op = object::create (); 1027 object *op = object::create ();
983 1028
984 op->map = map; 1029 op->map = map;
985 op->arch = arch;
986 arch->clone.copy_to (op); 1030 arch->copy_to (op);
987 // copy_to activates, this should be fixed properly 1031 // copy_to activates, this should be fixed properly
988 op->deactivate (); 1032 op->deactivate ();
989 1033
990 if (!op->parse_kv (f)) 1034 if (!op->parse_kv (f))
991 { 1035 {
992 delete op; 1036 op->destroy (true);
993 return 0; 1037 return 0;
994 } 1038 }
995 1039
1040 op->post_load_check ();
996 return op; 1041 return op;
997} 1042}
998 1043
999/* This takes a buffer, scans it for variables, and sets those variables 1044/* This takes a buffer, scans it for variables, and sets those variables
1000 * as appropriate in op. 1045 * as appropriate in op.
… …
1005int 1050int
1006set_variable (object *op, char *buf) 1051set_variable (object *op, char *buf)
1007{ 1052{
1008 object_thawer f (buf, (AV *)0); 1053 object_thawer f (buf, (AV *)0);
1009 1054
1010 f.kw = KW_arch; // special hack so that parse_kv skips
1011 return op->parse_kv (f); 1055 return op->parse_kv (f);
1012} 1056}
1013 1057
1014/* This returns a string of the integer movement type */ 1058/* This returns a string of the integer movement type */
1015#if 0 1059#if 0
… …
1077 * the 15'th element of this array should match that name. 1121 * 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. 1122 * If an entry is NULL, that is a flag not to loaded/saved.
1079 */ 1123 */
1080 static const keyword flag_names [NUM_FLAGS] = { 1124 static const keyword flag_names [NUM_FLAGS] = {
1081 KW_alive, 1125 KW_alive,
1082 KW_wiz,
1083 KW_NULL, 1126 KW_NULL,
1084 KW_NULL, 1127 KW_NULL,
1085 KW_was_wiz, 1128 KW_NULL,
1129 KW_NULL,
1086 KW_applied, 1130 KW_applied,
1087 KW_unpaid, 1131 KW_unpaid,
1088 KW_can_use_shield, 1132 KW_can_use_shield,
1089 KW_no_pick, 1133 KW_no_pick,
1090 KW_NULL, // walk_on 1134 KW_NULL, // walk_on
… …
1096 KW_monster, 1140 KW_monster,
1097 KW_friendly, 1141 KW_friendly,
1098 KW_generator, 1142 KW_generator,
1099 KW_is_thrown, 1143 KW_is_thrown,
1100 KW_auto_apply, 1144 KW_auto_apply,
1101 KW_NULL, // was KW_treasure 1145 KW_treasure_env,
1102 KW_player_sold, 1146 KW_player_sold,
1103 /* 20 */ 1147 /* 20 */
1104 KW_see_invisible, 1148 KW_see_invisible,
1105 KW_can_roll, 1149 KW_can_roll,
1106 KW_overlay_floor, 1150 KW_overlay_floor,
… …
1167 KW_can_use_skill, 1211 KW_can_use_skill,
1168 KW_been_applied, 1212 KW_been_applied,
1169 /* 80 */ 1213 /* 80 */
1170 KW_has_ready_scroll, 1214 KW_has_ready_scroll,
1171 KW_can_use_rod, 1215 KW_can_use_rod,
1172 KW_NULL, 1216 KW_precious,
1173 KW_can_use_horn, 1217 KW_can_use_horn,
1174 KW_make_invisible, 1218 KW_make_invisible,
1175 KW_inv_locked, 1219 KW_inv_locked,
1176 KW_is_wooded, 1220 KW_is_wooded,
1177 KW_is_hilly, 1221 KW_is_hilly,
… …
1221 1265
1222 /* We don't need to worry about the arch's extra fields - they 1266 /* We don't need to worry about the arch's extra fields - they
1223 * will get taken care of the copy_to method. 1267 * will get taken care of the copy_to method.
1224 */ 1268 */
1225 1269
1226 { 1270 f.put (KW_uuid, op->uuid.c_str ());
1227 char uids[64];
1228 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1229 f.put (KW_uuid, (const char *)uids);
1230 }
1231 1271
1232#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1272#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1233#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1273#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1274
1275 if (object *owner = op->owner)
1276 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1234 1277
1235 CMP_OUT (name); 1278 CMP_OUT (name);
1236 CMP_OUT (name_pl); 1279 CMP_OUT (name_pl);
1237 CMP_OUT (custom_name); 1280 CMP_OUT (custom_name);
1238 CMP_OUT (title); 1281 CMP_OUT (title);
1239 CMP_OUT (race); 1282 CMP_OUT (race);
1240 CMP_OUT (slaying); 1283 CMP_OUT (slaying);
1241 1284 CMP_OUT (tag);
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); 1285 CMP_OUT (other_arch);
1248 CMP_OUT (face); 1286
1287 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1288 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1289
1290 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1291 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1292 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1249 1293
1250 if (op->animation_id != tmp->animation_id) 1294 if (op->animation_id != tmp->animation_id)
1251 if (op->animation_id) 1295 if (op->animation_id)
1252 { 1296 {
1253 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1254 1298
1255 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1256 f.put (KW_is_animated, (sint32) 0); 1300 f.put (KW_is_animated, (sint32)0);
1257 } 1301 }
1258 else 1302 else
1259 f.put (KW_animation, (const char *) 0); 1303 f.put (KW_animation, (const char *)0);
1260 1304
1261 CMP_OUT2 (str, stats.Str); 1305 CMP_OUT2 (str, stats.Str);
1262 CMP_OUT2 (dex, stats.Dex); 1306 CMP_OUT2 (dex, stats.Dex);
1263 CMP_OUT2 (con, stats.Con); 1307 CMP_OUT2 (con, stats.Con);
1264 CMP_OUT2 (wis, stats.Wis); 1308 CMP_OUT2 (wis, stats.Wis);
… …
1295 CMP_OUT (type); 1339 CMP_OUT (type);
1296 CMP_OUT (subtype); 1340 CMP_OUT (subtype);
1297 CMP_OUT (attacktype); 1341 CMP_OUT (attacktype);
1298 1342
1299 for (i = 0; i < NROFATTACKS; i++) 1343 for (i = 0; i < NROFATTACKS; i++)
1300 if (op->resist[i] != tmp->resist[i]) 1344 if (expect_false (op->resist[i] != tmp->resist[i]))
1301 f.put (resist_save[i], op->resist[i]); 1345 f.put (resist_save[i], op->resist[i]);
1302 1346
1303 CMP_OUT (path_attuned); 1347 CMP_OUT (path_attuned);
1304 CMP_OUT (path_repelled); 1348 CMP_OUT (path_repelled);
1305 CMP_OUT (path_denied); 1349 CMP_OUT (path_denied);
… …
1347 CMP_OUT (move_slow); 1391 CMP_OUT (move_slow);
1348 CMP_OUT (move_slow_penalty); 1392 CMP_OUT (move_slow_penalty);
1349 1393
1350 if (op->flag != tmp->flag) 1394 if (op->flag != tmp->flag)
1351 for (i = 0; i <= NUM_FLAGS; i++) 1395 for (i = 0; i <= NUM_FLAGS; i++)
1352 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1396 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1353 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1397 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1354 1398
1355 /* Save body locations */ 1399 // save body locations
1356 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1400 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1357 if (op->body_info[i] != tmp->body_info[i]) 1401 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1358 f.put (body_locations[i].save_name, op->body_info[i]); 1402 f.put (body_locations[i].save_name, op->slot[i].info);
1359} 1403}
1360 1404
1361/* 1405/*
1362 * Dumps all variables in an object to a file. 1406 * 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, 1407 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1364 * the only place this is not set is when saving the player. 1408 * the only place this is not set is when saving the player.
1365 */ 1409 */
1366bool 1410bool
1367object::write (object_freezer &f) 1411object::write (object_freezer &f)
1368{ 1412{
1369 /* Even if the object does have an owner, it would seem that we should
1370 * still save it.
1371 */
1372 if (owner)
1373 return true;
1374
1375 archetype *at = arch ? (archetype *)arch : empty_archetype; 1413 archetype *at = arch ? (archetype *)arch : archetype::empty;
1376 1414
1377 f.put (KW_arch, at->name); 1415 f.put (KW_arch, at->archname);
1378 write_diff (f, this, &at->clone); 1416 write_diff (f, this, at);
1379 1417
1380 for (object *tmp = inv; tmp; tmp = tmp->below) 1418 for (object *tmp = inv; tmp; tmp = tmp->below)
1381 tmp->write (f); 1419 tmp->write (f);
1382 1420
1383 f.put (this); 1421 f.put (this);
… …
1386 return true; 1424 return true;
1387} 1425}
1388 1426
1389///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1390 1428
1429// generic resource file load,
1430// currently supports: region, treasures, archetypes
1431bool
1391bool load_resource_file (const char *filename) 1432load_resource_file_ (const char *filename)
1392{ 1433{
1393 object_thawer f (filename); 1434 object_thawer f (filename);
1394
1395 f.next ();
1396 1435
1397 for (;;) 1436 for (;;)
1398 { 1437 {
1399 switch (f.kw) 1438 switch (f.kw)
1400 { 1439 {
1401 case KW_region: 1440 case KW_region:
1402 if (!region::read (f)) 1441 if (!region::read (f))
1403 return false; 1442 return false;
1404 break; 1443 break;
1405 1444
1445 case KW_treasure:
1446 case KW_treasureone:
1447 if (!treasurelist::read (f))
1448 return false;
1449 break;
1450
1451 case KW_object:
1452 if (!archetype::read (f))
1453 return false;
1454 break;
1455
1406 case KW_EOF: 1456 case KW_EOF:
1407 return true; 1457 return true;
1408 1458
1409 default: 1459 default:
1410 if (!f.parse_error ("resource file")) 1460 if (!f.parse_error ("resource file"))
1411 return false; 1461 return false;
1462
1463 f.next ();
1464 break;
1412 } 1465 }
1413
1414 f.next ();
1415 } 1466 }
1416} 1467}
1417 1468

Diff Legend

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