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.75 by root, Sat May 5 04:40:40 2007 UTC vs.
Revision 1.134 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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,2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30
31extern archetype *loading_arch;
34 32
35/* This table is only necessary to convert objects that existed before the 33/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 34 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 35 * 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 36 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 166 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 167 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 168 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 169 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 170 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 171 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 172 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 173 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 174 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 175 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 176 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 248 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 249 "spell_glyph", /* 205 */
252 NULL 250 NULL
253}; 251};
254 252
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 253/* 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 254 * 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 255 * 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. 256 * to check for objects to make sure there are no common errors.
261 */ 257 */
262static void 258void
263check_loaded_object (object *op) 259object::post_load_check ()
264{ 260{
261 if (type >= NUM_TYPES)
262 {
263 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
264 type = 0;
265 }
266
267 switch (type)
268 {
269 case BOW:
270 case WAND:
271 case ROD:
272 case HORN:
273 if (slot [body_range].info != -1)
274 {
275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
276 slot [body_range].info = -1;
277 }
278 break;
279
280 case WEAPON:
281 if (slot [body_combat].info != -1)
282 {
283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
284 slot [body_combat].info = -1;
285 }
286 break;
287
288 case SHIELD:
289 if (slot [body_shield].info != -1)
290 {
291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
292 slot [body_shield].info = -1;
293 }
294 break;
295
296 case PLAYER:
297 if (slot [body_shield].info != 1)
298 {
299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
300 slot [body_shield].info = 1;
301 }
302
303 if (slot [body_combat].info != 1)
304 {
305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
306 slot [body_combat].info = 1;
307 }
308
309 if (slot [body_range].info != 1)
310 {
311 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
312 slot [body_range].info = 1;
313 }
314 break;
315 }
316
265 /* We do some specialised handling to handle legacy cases of name_pl. 317 /* 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 - 318 * 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 319 * 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 320 * 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 321 * 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. 322 * 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 323 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 324 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 325 */
274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 326 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
275 op->name_pl = 0; 327 name_pl = 0;
276 328
277 if (!op->name_pl) 329 if (!name_pl)
278 op->name_pl = op->name; 330 name_pl = name;
279 331
280 /* objects now have a materialname. try to patch it in */ 332 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 333 if (!(is_weapon () && level > 0))
282 { 334 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 335
289 /* only do these when program is first run - a bit 336 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 337 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 338 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 339 * not in the ideal fashion.
293 */ 340 */
294 if ((op->type == WEAPON || op->type == BOW) && loading_arch) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 342 {
296 if (!op->skill) 343 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
298 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 346 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
301 } 348 }
302 349
303 /* We changed last_heal to gen_sp_armour, which is what it 350 /* We changed last_heal to gen_sp_armour, which is what it
304 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 352 * that may have an old value.
306 */ 353 */
307 if (op->type == WEAPON 354 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 355 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 356 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 357 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 358 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 359 || type == BRACERS || type == CLOAK)
313 { 360 {
314 if (op->last_heal) 361 if (last_heal)
315 { 362 {
316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
317 op->gen_sp_armour = op->last_heal; 364 gen_sp_armour = last_heal;
318 op->last_heal = 0; 365 last_heal = 0;
319 } 366 }
320 367
321 int ip = calc_item_power (op, 0); 368 int ip = calc_item_power (this, 0);
322 369
323 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 371 if (!item_power && ip)
325 { 372 {
326 if (ip > 3) 373 if (ip > 3)
327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
328 375
329 op->item_power = ip; 376 item_power = ip;
330 } 377 }
331 378
332 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
333 * something that has item_power 1 is probably just fine if our calculated 380 * something that has item_power 1 is probably just fine if our calculated
334 * value is 1 or 2 - these values are small enough that hard to be precise. 381 * value is 1 or 2 - these values are small enough that hard to be precise.
335 * similarly, it item_power is 0, the first check will always pass, 382 * similarly, it item_power is 0, the first check will always pass,
336 * but not the second one. 383 * but not the second one.
337 */ 384 */
385#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 386 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); 387 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
388#endif
340 } 389 }
341 390
342 /* Old spellcasting object - need to load in the appropiate object */ 391 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 392 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
393 if ((type == ROD
394 || type == WAND
395 || type == SCROLL
396 || type == HORN
397 || type == FIREWALL
344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 398 /* 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 && !loading_arch) 399 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
400 && !inv
401 && !loading_arch
402 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
403 // TODO: at least one watchout-comments is redundant - investigate/remove
346 { 404 {
405 // TODO: fix firewall object on map
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 406 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 407 * in that spell was stored in sp.
349 */ 408 */
409 //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]); 410 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 411 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = 0;
353 } 413 }
354 414
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 415 /* 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 && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 417 {
418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 420 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 423 value = arch->value * inv->value;
363 } 424 }
364 425
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 427 {
367 if (op->stats.hp > op->stats.maxhp) 428 if (stats.hp > stats.maxhp)
368 { 429 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
370 op->stats.maxhp = op->stats.hp; 431 stats.maxhp = stats.hp;
371 } 432 }
372 433
373 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 435 if (move_type == 0)
375 op->move_type = MOVE_WALK; 436 move_type = MOVE_WALK;
376 } 437 }
377 438
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 439 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 440 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 441 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 442 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 443 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 444 */
445 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 446 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 447
388 /* Handle player movers. We use move_type for player movers 448 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 449 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 450 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 451 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 452 * are doing, otherwise, set move_type based on maxhp value.
393 */ 453 */
394 if (op->type == PLAYERMOVER) 454 if (type == PLAYERMOVER)
395 { 455 {
396 if (!op->move_type) 456 if (!move_type)
397 { 457 {
398 if (op->stats.maxhp) 458 if (stats.maxhp)
399 { 459 {
400 op->move_type = MOVE_ALL; 460 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 461 stats.maxhp = 0;
402 } 462 }
403 else 463 else
404 op->move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
405 } 465 }
406 } 466 }
407 467
468 // if the object has an animation, try to provide a default face
469 if (has_anim ())
470 {
471 const animation &anim_ob = anim ();
472
473 if (anim_speed)
474 // if this item is time-animated, force the last frame
475 animate_object (this, 0);
476 else if (flag [FLAG_MONSTER])
477 // if it is a monster, set appropriate facing
478 animate_object (this, direction);
479 }
408} 480}
409 481
410static void 482static void
411set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
412{ 484{
… …
459 531
460 goto next; 532 goto next;
461 } 533 }
462 } 534 }
463 535
464 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 536 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
465 537
466next: ; 538next: ;
467 } 539 }
468} 540}
469 541
470#define GET_FLAG(op,flag) \ 542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
471 if (f.get_sint32 ()) \
472 SET_FLAG (op, flag); \
473 else \
474 CLEAR_FLAG (op, flag) \
475 543
476bool 544bool
477object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
478{ 546{
479 object *op_inv = inv; 547 object *op_inv = inv;
548 key_value *last_kv = key_values;
480 549
481 for (;;) 550 for (;;)
482 { 551 {
483 switch (f.kw) 552 switch (f.kw)
484 { 553 {
485 case KW_uuid: 554 case KW_uuid:
486 if (const char *s = f.get_str ()) 555 if (const char *s = f.get_str ())
487 { 556 if (!uuid.parse (s))
488 unsigned int version;
489 unsigned long long seq;
490
491 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
492 { 557 {
493 uuid.seq = seq; 558 f.parse_warn ("unparseable uuid");
494 break; 559 uuid = UUID::gen ();
495 } 560 }
496 }
497
498 uuid = gen_uuid ();
499 break; 561 break;
500 562
501 case KW_oid: 563 case KW_oid:
502 f.get (this, f.get_sint32 ()); 564 f.get (this, f.get_sint32 ());
503 break; 565 break;
… …
509 571
510 case KW_attach: f.get_ornull (attach); break; 572 case KW_attach: f.get_ornull (attach); break;
511 case KW_skill: f.get_ornull (skill); break; 573 case KW_skill: f.get_ornull (skill); break;
512 case KW_race: f.get_ornull (race); break; 574 case KW_race: f.get_ornull (race); break;
513 case KW_slaying: f.get_ornull (slaying); break; 575 case KW_slaying: f.get_ornull (slaying); break;
576 case KW_tag: f.get_ornull (tag); break;
514 577
515 case KW_arch: 578 case KW_arch:
516 {
517 object *tmp = object::read (f); 579 if (object *tmp = object::read (f))
518 tmp->deactivate ();
519
520 { 580 {
581 tmp->deactivate ();
582
521 // was: insert_ob_in_ob (tmp, op); 583 // was: insert_ob_in_ob (tmp, op);
522 // but manually adding it can improve map loading times a lot 584 // but manually adding it can improve map loading times a lot
523 // also, appending instead of prepending keeps the 585 // also, appending instead of prepending keeps the
524 // save ordering the same between repeated load/saves. 586 // save ordering the same between repeated load/saves.
587 // and finally we do not want any funny effects
525 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 588 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
526 CLEAR_FLAG (tmp, FLAG_REMOVED); 589 CLEAR_FLAG (tmp, FLAG_REMOVED);
527 590
528 if (!op_inv) 591 if (!op_inv)
529 { 592 {
… …
541 604
542 tmp->below = 0; 605 tmp->below = 0;
543 tmp->env = this; 606 tmp->env = this;
544 op_inv = tmp; 607 op_inv = tmp;
545 } 608 }
546 } 609 else
610 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
611
547 continue; 612 continue;
548 613
549 case KW_other_arch: 614 case KW_other_arch:
550 other_arch =
551 loading_arch 615 if (loading_arch == this)
552 ? archetype::get (f.get_str ()) 616 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
617 else
618 {
553 : archetype::find (f.get_str ()); 619 other_arch = archetype::find (f.get_str ());
554 620
555 if (!other_arch) 621 if (!other_arch)
556 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 622 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
623 }
624 break;
625
626 case KW_owner:
627 f.delayed_deref (this, owner, f.get_str ());
557 break; 628 break;
558 629
559 case KW_animation: 630 case KW_animation:
560 { 631 {
561 CLEAR_FLAG (this, FLAG_ANIMATE); 632 CLEAR_FLAG (this, FLAG_ANIMATE);
562 animation_id = 0; 633 animation_id = 0;
563 634
564 const char *str = f.get_str (); 635 const char *str = f.get_str ();
565 if (str && (animation_id = find_animation (str))) 636 if (str && (animation_id = find_animation (str)))
566 SET_FLAG (this, FLAG_ANIMATE); 637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
567 } 638 }
568 break; 639 break;
569 640
570 case KW_last_heal: f.get (last_heal); break; 641 case KW_last_heal: f.get (last_heal); break;
571 case KW_last_sp: f.get (last_sp); break; 642 case KW_last_sp: f.get (last_sp); break;
… …
588 f.get (move_slow_penalty); 659 f.get (move_slow_penalty);
589 break; 660 break;
590 661
591 case KW_face: 662 case KW_face:
592 face = face_find (f.get_str ()); 663 face = face_find (f.get_str ());
664 break;
665
666 case KW_sound:
667 sound = sound_find (f.get_str ());
668 if (!sound)
669 f.parse_warn ("sound not found");
670 break;
671
672 case KW_sound_destroy:
673 sound_destroy = sound_find (f.get_str ());
674 if (!sound_destroy)
675 f.parse_warn ("sound not found");
593 break; 676 break;
594 677
595 case KW_x: f.get (x); break; 678 case KW_x: f.get (x); break;
596 case KW_y: f.get (y); break; 679 case KW_y: f.get (y); break;
597 680
… …
724 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 807 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 808 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
726 809
727 break; 810 break;
728 811
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: 812 case KW_friendly:
746 if (f.get_sint32 ()) 813 if (f.get_bool ())
747 if (type != PLAYER) 814 if (type != PLAYER)
748 add_friendly_object (this); 815 add_friendly_object (this);
749 816
750 break; 817 break;
751 818
… …
764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 831 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; 832 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 833 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 834 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 835 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
836 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 837 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 838 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 839 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 840 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 841 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 852 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; 853 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; 854 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 856 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; 857 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
874 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
875 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
876 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
877 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
878 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
879 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
880 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
881 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
882 case KW_tooltype: f.get (tooltype); break;
883 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
950
951 // elevation is deprecated
884 case KW_elevation: f.get (elevation); break; 952 case KW_elevation: break;
953
885 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 954 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
886 case KW_client_type: f.get (client_type); break; 955 case KW_client_type: f.get (client_type); break;
887 case KW_duration: f.get (duration); break; 956 case KW_duration: f.get (duration); break;
888 case KW_range: f.get (range); break; 957 case KW_range: f.get (range); break;
889 case KW_range_modifier: f.get (range_modifier); break; 958 case KW_range_modifier: f.get (range_modifier); break;
890 case KW_dam_modifier: f.get (dam_modifier); break; 959 case KW_dam_modifier: f.get (dam_modifier); break;
891 case KW_duration_modifier: f.get (duration_modifier); break; 960 case KW_duration_modifier: f.get (duration_modifier); break;
892 961
893 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 962 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
894 //TODO: parse from other include files 963 //TODO: parse from other include files
895 case KW_body_range: f.get (body_info[0]); break; 964 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
896 case KW_body_arm: f.get (body_info[1]); break; 965 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
897 case KW_body_torso: f.get (body_info[2]); break; 966 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
898 case KW_body_head: f.get (body_info[3]); break; 967 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
899 case KW_body_neck: f.get (body_info[4]); break; 968 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
900 case KW_body_skill: f.get (body_info[5]); break; 969 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
901 case KW_body_finger: f.get (body_info[6]); break; 970 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
902 case KW_body_shoulder: f.get (body_info[7]); break; 971 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
903 case KW_body_foot: f.get (body_info[8]); break; 972 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
904 case KW_body_hand: f.get (body_info[9]); break; 973 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
905 case KW_body_wrist: f.get (body_info[10]); break; 974 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
906 case KW_body_waist: f.get (body_info[11]); break; 975 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
976 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
907 case KW_can_apply: 978 case KW_can_apply:
908 break; 979 break;
909 980
910 case KW_connected: 981 case KW_connected:
911 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
912 break; 988 break;
913 989
914 case KW_randomitems: 990 case KW_randomitems:
915 if (f.get_str ()) 991 if (f.get_str ())
916 { 992 {
… …
926 randomitems = 0; 1002 randomitems = 0;
927 break; 1003 break;
928 1004
929 case KW_msg: 1005 case KW_msg:
930 f.get_ml (KW_endmsg, msg); 1006 f.get_ml (KW_endmsg, msg);
931 //TODO: allow longer messages
932 if (strlen (msg) >= HUGE_BUF)
933 {
934 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
935 msg = "ERROR, please report: string too long, winged.\n";
936 }
937 break; 1007 break;
938 1008
939 case KW_lore: 1009 case KW_lore:
940 f.get_ml (KW_endlore, lore); 1010 f.get_ml (KW_endlore, lore);
941 //TODO: allow longer messages
942 /* Just print a warning so we can be reasonably safe
943 * about not overflowing the buffer.
944 */
945 if (strlen (lore) > (HUGE_BUF / 2))
946 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
947 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
948 break; 1011 break;
949 1012
950 case KW_editable: 1013 case KW_editable:
951 case KW_editor_folder: 1014 case KW_editor_folder:
952 break; 1015 break;
953 1016
954 case KW_end: 1017 case KW_end:
955 check_loaded_object (this);
956
957 if (!loading_arch) 1018 if (!loading_arch)
958 instantiate (); 1019 instantiate ();
959 1020
960 f.next (); 1021 f.next ();
961 return true; 1022 return true;
962 1023
963 case KW_ERROR: 1024 case KW_ERROR:
964 set_ob_key_value (this, f.kw_str, f.value, true); 1025 // append as key value pair (do not use kv_set as it prepends)
1026 // we also do not even try to find old values, duplicate keys stay duplicate
1027 {
1028 key_value *kv = new key_value;
1029
1030 kv->next = 0;
1031 kv->key = shstr (f.kw_str);
1032 kv->value = shstr (f.value);
1033
1034 if (!last_kv)
1035 key_values = last_kv = kv;
1036 else
1037 {
1038 while (last_kv->next)
1039 last_kv = last_kv->next;
1040
1041 last_kv->next = kv;
1042 last_kv = kv;
1043 }
1044 }
965 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1045 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
966 break; 1046 break;
967 1047
968 default: 1048 default:
969 if (!f.parse_error ("object", name)) 1049 if (!f.parse_error ("object", name))
… …
990 1070
991 assert (arch); //D maybe use exception handling of sorts? 1071 assert (arch); //D maybe use exception handling of sorts?
992 1072
993 f.next (); 1073 f.next ();
994 1074
995 object *op = object::create (); 1075 object *op = arch->instance ();
996
997 op->map = map; 1076 op->map = map;
998 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 1077 // instance() activates, this should be fixed properly
1000 op->deactivate (); 1078 op->deactivate ();
1001 1079
1002 if (!op->parse_kv (f)) 1080 if (!op->parse_kv (f))
1003 { 1081 {
1004 op->destroy (true); 1082 op->destroy ();
1005 return 0; 1083 return 0;
1006 } 1084 }
1007 1085
1086 op->post_load_check ();
1008 return op; 1087 return op;
1009} 1088}
1010 1089
1011/* This takes a buffer, scans it for variables, and sets those variables 1090/* This takes a buffer, scans it for variables, and sets those variables
1012 * as appropriate in op. 1091 * as appropriate in op.
… …
1017int 1096int
1018set_variable (object *op, char *buf) 1097set_variable (object *op, char *buf)
1019{ 1098{
1020 object_thawer f (buf, (AV *)0); 1099 object_thawer f (buf, (AV *)0);
1021 1100
1022 f.next ();
1023 return op->parse_kv (f); 1101 return op->parse_kv (f);
1024} 1102}
1025 1103
1026/* This returns a string of the integer movement type */ 1104/* This returns a string of the integer movement type */
1027#if 0 1105#if 0
… …
1089 * the 15'th element of this array should match that name. 1167 * the 15'th element of this array should match that name.
1090 * If an entry is NULL, that is a flag not to loaded/saved. 1168 * If an entry is NULL, that is a flag not to loaded/saved.
1091 */ 1169 */
1092 static const keyword flag_names [NUM_FLAGS] = { 1170 static const keyword flag_names [NUM_FLAGS] = {
1093 KW_alive, 1171 KW_alive,
1094 KW_wiz,
1095 KW_NULL, 1172 KW_NULL,
1096 KW_NULL, 1173 KW_NULL,
1097 KW_was_wiz, 1174 KW_NULL,
1175 KW_NULL,
1098 KW_applied, 1176 KW_applied,
1099 KW_unpaid, 1177 KW_unpaid,
1100 KW_can_use_shield, 1178 KW_can_use_shield,
1101 KW_no_pick, 1179 KW_no_pick,
1102 KW_NULL, // walk_on 1180 KW_NULL, // walk_on
… …
1214 /* 110 */ 1292 /* 110 */
1215 KW_destroy_on_death, 1293 KW_destroy_on_death,
1216 KW_NULL, 1294 KW_NULL,
1217 }; 1295 };
1218 1296
1219 int i;
1220
1221 /* This saves the key/value lists. We do it first so that any 1297 /* This saves the key/value lists. We do it first so that any
1222 * keys that match field names will be overwritten by the loader. 1298 * keys that match field names will be overwritten by the loader.
1223 */ 1299 */
1224 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1300 for (key_value *kv = op->key_values; kv; kv = kv->next)
1225 { 1301 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1226 /* Find the field in the opposing member. */ 1302 f.put (kv->key, kv->value);
1227 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1228
1229 /* If there's no partnering field, or it's got a different value, save our field. */
1230 if (!arch_field || my_field->value != arch_field->value)
1231 f.put (my_field->key, my_field->value);
1232 }
1233 1303
1234 /* We don't need to worry about the arch's extra fields - they 1304 /* We don't need to worry about the arch's extra fields - they
1235 * will get taken care of the copy_to method. 1305 * will get taken care of the copy_to method.
1236 */ 1306 */
1237 1307
1238 { 1308 if (op->uuid)
1239 char uids[64]; 1309 f.put (KW_uuid, op->uuid.c_str ());
1240 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1241 f.put (KW_uuid, (const char *)uids);
1242 }
1243 1310
1244#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1311#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1245#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1312#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1313
1314 if (object *owner = op->owner)
1315 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1246 1316
1247 CMP_OUT (name); 1317 CMP_OUT (name);
1248 CMP_OUT (name_pl); 1318 CMP_OUT (name_pl);
1249 CMP_OUT (custom_name); 1319 CMP_OUT (custom_name);
1250 CMP_OUT (title); 1320 CMP_OUT (title);
1251 CMP_OUT (race); 1321 CMP_OUT (race);
1322 CMP_OUT (skill);
1252 CMP_OUT (slaying); 1323 CMP_OUT (slaying);
1253 1324 CMP_OUT (tag);
1254 if (op->msg != tmp->msg)
1255 f.put (KW_msg, KW_endmsg, op->msg);
1256 if (op->lore != tmp->lore)
1257 f.put (KW_lore, KW_endlore, op->lore);
1258
1259 CMP_OUT (other_arch); 1325 CMP_OUT (other_arch);
1260 1326
1327 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1328 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1329
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1330 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1331 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1332 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1262 1333
1263 if (op->animation_id != tmp->animation_id) 1334 if (op->animation_id != tmp->animation_id)
1264 if (op->animation_id) 1335 if (op->has_anim ())
1336 f.put (KW_animation, op->anim ().name);
1337 else
1265 { 1338 {
1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1339 f.put (KW_animation, (const char *)0);
1267 1340 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1268 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1269 f.put (KW_is_animated, (sint32) 0);
1270 } 1341 }
1271 else
1272 f.put (KW_animation, (const char *) 0);
1273 1342
1274 CMP_OUT2 (str, stats.Str); 1343 CMP_OUT2 (str, stats.Str);
1275 CMP_OUT2 (dex, stats.Dex); 1344 CMP_OUT2 (dex, stats.Dex);
1276 CMP_OUT2 (con, stats.Con); 1345 CMP_OUT2 (con, stats.Con);
1277 CMP_OUT2 (wis, stats.Wis); 1346 CMP_OUT2 (wis, stats.Wis);
… …
1307 CMP_OUT (direction); 1376 CMP_OUT (direction);
1308 CMP_OUT (type); 1377 CMP_OUT (type);
1309 CMP_OUT (subtype); 1378 CMP_OUT (subtype);
1310 CMP_OUT (attacktype); 1379 CMP_OUT (attacktype);
1311 1380
1312 for (i = 0; i < NROFATTACKS; i++) 1381 for (int i = 0; i < NROFATTACKS; i++)
1313 if (op->resist[i] != tmp->resist[i]) 1382 if (expect_false (op->resist[i] != tmp->resist[i]))
1314 f.put (resist_save[i], op->resist[i]); 1383 f.put (resist_save[i], op->resist[i]);
1315 1384
1316 CMP_OUT (path_attuned); 1385 CMP_OUT (path_attuned);
1317 CMP_OUT (path_repelled); 1386 CMP_OUT (path_repelled);
1318 CMP_OUT (path_denied); 1387 CMP_OUT (path_denied);
… …
1328 CMP_OUT (last_sp); 1397 CMP_OUT (last_sp);
1329 CMP_OUT (last_grace); 1398 CMP_OUT (last_grace);
1330 CMP_OUT (last_eat); 1399 CMP_OUT (last_eat);
1331 CMP_OUT (glow_radius); 1400 CMP_OUT (glow_radius);
1332 1401
1333 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1402 if (op->flag [FLAG_IS_LINKED])
1403 if (auto (ol, op->find_link ()))
1334 f.put (KW_connected, i); 1404 f.put (KW_connected, ol->id);
1335 1405
1336 CMP_OUT (randomitems); 1406 CMP_OUT (randomitems);
1337 CMP_OUT2 (container, weight_limit); 1407 CMP_OUT2 (container, weight_limit);
1338 1408
1339 CMP_OUT (run_away); 1409 CMP_OUT (run_away);
1340 CMP_OUT (pick_up); 1410 CMP_OUT (pick_up);
1341 CMP_OUT (will_apply); 1411 CMP_OUT (will_apply);
1342 CMP_OUT (smoothlevel); 1412 CMP_OUT (smoothlevel);
1343 CMP_OUT (weapontype); 1413 CMP_OUT (weapontype);
1344 CMP_OUT (tooltype);
1345 CMP_OUT (elevation);
1346 CMP_OUT (client_type); 1414 CMP_OUT (client_type);
1347 CMP_OUT (item_power); 1415 CMP_OUT (item_power);
1348 CMP_OUT (duration); 1416 CMP_OUT (duration);
1349 CMP_OUT (range); 1417 CMP_OUT (range);
1350 CMP_OUT (range_modifier); 1418 CMP_OUT (range_modifier);
… …
1359 CMP_OUT (move_off); 1427 CMP_OUT (move_off);
1360 CMP_OUT (move_slow); 1428 CMP_OUT (move_slow);
1361 CMP_OUT (move_slow_penalty); 1429 CMP_OUT (move_slow_penalty);
1362 1430
1363 if (op->flag != tmp->flag) 1431 if (op->flag != tmp->flag)
1364 for (i = 0; i <= NUM_FLAGS; i++) 1432 for (int i = 0; i <= NUM_FLAGS; i++)
1365 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1433 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1366 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1434 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1367 1435
1368 /* Save body locations */ 1436 // save body locations
1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1437 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1370 if (op->body_info[i] != tmp->body_info[i]) 1438 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1371 f.put (body_locations[i].save_name, op->body_info[i]); 1439 f.put (body_locations[i].save_name, op->slot[i].info);
1372} 1440}
1373 1441
1374/* 1442/*
1375 * Dumps all variables in an object to a file. 1443 * Dumps all variables in an object to a file.
1376 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1444 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1377 * the only place this is not set is when saving the player. 1445 * the only place this is not set is when saving the player.
1378 */ 1446 */
1379bool 1447bool
1380object::write (object_freezer &f) 1448object::write (object_freezer &f)
1381{ 1449{
1382 /* Even if the object does have an owner, it would seem that we should 1450 if (is_arch ())
1383 * still save it. 1451 {
1384 */ 1452 f.put (KW_object, arch->archname);
1385 if (owner) 1453 write_diff (f, this, archetype::empty);
1386 return true; 1454 }
1387 1455 else
1388 archetype *at = arch ? (archetype *)arch : empty_archetype; 1456 {
1389
1390 f.put (KW_arch, at->name); 1457 f.put (KW_arch, arch->archname);
1391 write_diff (f, this, &at->clone); 1458 write_diff (f, this, arch);
1459 }
1392 1460
1393 for (object *tmp = inv; tmp; tmp = tmp->below) 1461 for (object *tmp = inv; tmp; tmp = tmp->below)
1394 tmp->write (f); 1462 tmp->write (f);
1395 1463
1396 f.put (this); 1464 f.put (this);
… …
1401 1469
1402///////////////////////////////////////////////////////////////////////////// 1470/////////////////////////////////////////////////////////////////////////////
1403 1471
1404// generic resource file load, 1472// generic resource file load,
1405// currently supports: region, treasures, archetypes 1473// currently supports: region, treasures, archetypes
1474bool
1406bool load_resource_file (const char *filename) 1475load_resource_file_ (const char *filename)
1407{ 1476{
1408 object_thawer f (filename); 1477 object_thawer f (filename);
1409
1410 bool success = false;
1411 bool seen_arch = false;
1412
1413 f.next ();
1414 1478
1415 for (;;) 1479 for (;;)
1416 { 1480 {
1417 switch (f.kw) 1481 switch (f.kw)
1418 { 1482 {
1419 case KW_region: 1483 case KW_region:
1420 if (!region::read (f)) 1484 if (!region::read (f))
1421 goto finish; 1485 return false;
1422 break; 1486 break;
1423 1487
1424 case KW_treasure: 1488 case KW_treasure:
1425 case KW_treasureone: 1489 case KW_treasureone:
1426 if (!treasurelist::read (f)) 1490 if (!treasurelist::read (f))
1427 goto finish; 1491 return false;
1428 break; 1492 break;
1429 1493
1430 case KW_object: 1494 case KW_object:
1431 seen_arch = true;
1432 if (!archetype::read (f)) 1495 if (!archetype::read (f))
1433 goto finish; 1496 return false;
1434 break; 1497 break;
1435 1498
1436 case KW_EOF: 1499 case KW_EOF:
1437 success = true; 1500 return true;
1438 goto finish;
1439 1501
1440 default: 1502 default:
1441 if (!f.parse_error ("resource file")) 1503 if (!f.parse_error ("resource file"))
1442 goto finish; 1504 return false;
1443 1505
1444 f.next (); 1506 f.next ();
1445 break; 1507 break;
1446 } 1508 }
1447 } 1509 }
1448
1449finish:
1450 if (seen_arch)
1451 init_archetype_pointers ();
1452
1453 return success;
1454} 1510}
1455 1511

Diff Legend

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