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

Diff Legend

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