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.78 by root, Mon May 7 06:01:47 2007 UTC vs.
Revision 1.136 by root, Wed Nov 4 00:02:48 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 */
262void 258void
263object::post_load_check () 259object::post_load_check ()
264{ 260{
265 // as a kind of a hack, we now adjust the range, shield and combat slots 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
266 switch (type) 267 switch (type)
267 { 268 {
268 case BOW: 269 case BOW:
269 case WAND: 270 case WAND:
270 case ROD: 271 case ROD:
271 case HORN: 272 case HORN:
272 case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons
273 case SKILL_TOOL:
274 if (slot [body_range].info != 1) 273 if (slot [body_range].info != -1)
275 { 274 {
276 LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
277 slot [body_range].info = 1; 276 slot [body_range].info = -1;
278 } 277 }
279 break; 278 break;
280 279
281 case WEAPON: 280 case WEAPON:
282 if (slot [body_combat].info != 1) 281 if (slot [body_combat].info != -1)
283 { 282 {
284 LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
285 slot [body_combat].info = 1; 284 slot [body_combat].info = -1;
286 } 285 }
287 break; 286 break;
288 287
289 case SHIELD: 288 case SHIELD:
290 if (slot [body_shield].info != 1) 289 if (slot [body_shield].info != -1)
291 { 290 {
292 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
293 slot [body_shield].info = 1; 292 slot [body_shield].info = -1;
294 } 293 }
295 break; 294 break;
296 295
297 case PLAYER: 296 case PLAYER:
298 if (slot [body_shield].info != 1) 297 if (slot [body_shield].info != 1)
299 { 298 {
300 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
301 slot [body_shield].info = 1; 300 slot [body_shield].info = 1;
302 } 301 }
303 302
304 if (slot [body_combat].info != 1) 303 if (slot [body_combat].info != 1)
305 { 304 {
306 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_combat].info); 305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
307 slot [body_combat].info = 1; 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;
308 } 313 }
309 break; 314 break;
310 } 315 }
311 316
312 /* 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.
… …
316 * 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
317 * 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.
318 * Otherwise, what happens is that the the plural name will lose 323 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 324 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 325 */
321 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 326 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
322 name_pl = 0; 327 name_pl = 0;
323 328
324 if (!name_pl) 329 if (!name_pl)
325 name_pl = name; 330 name_pl = name;
326 331
327 /* objects now have a materialname. try to patch it in */ 332 /* objects now have a materialname. try to patch it in */
328 if (!(is_weapon () && level > 0)) 333 if (!(is_weapon () && level > 0))
329 {
330 if (map != NULL)
331 set_materialname (this, map->difficulty, NULL); 334 set_materialname (this, map ? map->difficulty : 5, 0);
332 else
333 set_materialname (this, 5, NULL);
334 }
335 335
336 /* only do these when program is first run - a bit 336 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 337 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 338 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 339 * not in the ideal fashion.
340 */ 340 */
341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
342 { 342 {
343 if (!skill) 343 if (!skill)
344 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
345 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
346 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 346 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
347 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
348 } 348 }
349 349
350 /* 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
351 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
352 * that may have an old value. 352 * that may have an old value.
… …
358 || type == AMULET || type == GIRDLE 358 || type == AMULET || type == GIRDLE
359 || type == BRACERS || type == CLOAK) 359 || type == BRACERS || type == CLOAK)
360 { 360 {
361 if (last_heal) 361 if (last_heal)
362 { 362 {
363 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
364 gen_sp_armour = last_heal; 364 gen_sp_armour = last_heal;
365 last_heal = 0; 365 last_heal = 0;
366 } 366 }
367 367
368 int ip = calc_item_power (this, 0); 368 int ip = calc_item_power (this, 0);
369 369
370 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
371 if (!item_power && ip) 371 if (!item_power && ip)
372 { 372 {
373 if (ip > 3) 373 if (ip > 3)
374 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
375 375
376 item_power = ip; 376 item_power = ip;
377 } 377 }
378 378
379 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
380 * 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
381 * 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.
382 * 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,
383 * but not the second one. 383 * but not the second one.
384 */ 384 */
385#if 0 //TODO
385 if (ip > 2 * item_power && ip > (item_power + 3)) 386 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 387 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
388#endif
387 } 389 }
388 390
389 /* Old spellcasting object - need to load in the appropiate object */ 391 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
390 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || 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
391 /* 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 */
392 ((type == POTION || type == ALTAR) && stats.sp)) && !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
393 { 404 {
405 // TODO: fix firewall object on map
394 /* 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'
395 * in that spell was stored in sp. 407 * in that spell was stored in sp.
396 */ 408 */
409 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
397 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 410 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
398 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
399 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = 0;
400 } 413 }
401 414
402 /* 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 */
403 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
404 { 417 {
418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
405 object *tmp = get_archetype_by_object_name (slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
406 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
407 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
408 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
409 value = arch->clone.value * inv->value; 423 value = arch->value * inv->value;
410 } 424 }
411 425
412 if (QUERY_FLAG (this, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
413 { 427 {
414 if (stats.hp > stats.maxhp) 428 if (stats.hp > stats.maxhp)
415 { 429 {
416 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
417 stats.maxhp = stats.hp; 431 stats.maxhp = stats.hp;
418 } 432 }
419 433
420 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
421 if (move_type == 0) 435 if (move_type == 0)
422 move_type = MOVE_WALK; 436 move_type = MOVE_WALK;
423 } 437 }
424 438
425 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 439 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
426 {
427 /* Object will duplicate it's content as part of the 440 /* Object will duplicate it's content as part of the
428 * generation process. To do this, we must flag inventory 441 * generation process. To do this, we must flag inventory
429 * so it remains unevaluated concerning the randomitems and 442 * so it remains unevaluated concerning the randomitems and
430 * the living (a demonlord shouldn't cast from inside generator!) 443 * the living (a demonlord shouldn't cast from inside generator!)
431 */ 444 */
445 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
432 flag_inv (this, FLAG_IS_A_TEMPLATE); 446 flag_inv (this, FLAG_IS_A_TEMPLATE);
433 }
434 447
435 /* Handle player movers. We use move_type for player movers 448 /* Handle player movers. We use move_type for player movers
436 * because they operate on their own time (move_on 449 * because they operate on their own time (move_on
437 * would potentially cause them to be triggered when someone steps 450 * would potentially cause them to be triggered when someone steps
438 * 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
439 * are doing, otherwise, set move_type based on maxhp value. 452 * are doing, otherwise, set move_type based on maxhp value.
440 */ 453 */
441 if (type == PLAYERMOVER) 454 if (type == PLAYERMOVER)
442 { 455 {
443 if (!move_type) 456 if (!move_type)
… …
448 stats.maxhp = 0; 461 stats.maxhp = 0;
449 } 462 }
450 else 463 else
451 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
452 } 465 }
466 }
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);
453 } 479 }
454} 480}
455 481
456static void 482static void
457set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
… …
505 531
506 goto next; 532 goto next;
507 } 533 }
508 } 534 }
509 535
510 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);
511 537
512next: ; 538next: ;
513 } 539 }
514} 540}
515 541
516#define GET_FLAG(op,flag) \ 542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
517 if (f.get_sint32 ()) \
518 SET_FLAG (op, flag); \
519 else \
520 CLEAR_FLAG (op, flag) \
521 543
522bool 544bool
523object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
524{ 546{
525 object *op_inv = inv; 547 object *op_inv = inv;
548 key_value *last_kv = key_values;
526 549
527 for (;;) 550 for (;;)
528 { 551 {
529 switch (f.kw) 552 switch (f.kw)
530 { 553 {
531 case KW_uuid: 554 case KW_uuid:
532 if (const char *s = f.get_str ()) 555 if (const char *s = f.get_str ())
533 { 556 if (!uuid.parse (s))
534 unsigned int version;
535 unsigned long long seq;
536
537 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
538 { 557 {
539 uuid.seq = seq; 558 f.parse_warn ("unparseable uuid");
540 break; 559 uuid = UUID::gen ();
541 } 560 }
542 }
543
544 uuid = gen_uuid ();
545 break; 561 break;
546 562
547 case KW_oid: 563 case KW_oid:
548 f.get (this, f.get_sint32 ()); 564 f.get (this, f.get_sint32 ());
549 break; 565 break;
… …
555 571
556 case KW_attach: f.get_ornull (attach); break; 572 case KW_attach: f.get_ornull (attach); break;
557 case KW_skill: f.get_ornull (skill); break; 573 case KW_skill: f.get_ornull (skill); break;
558 case KW_race: f.get_ornull (race); break; 574 case KW_race: f.get_ornull (race); break;
559 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;
560 577
561 case KW_arch: 578 case KW_arch:
562 {
563 object *tmp = object::read (f); 579 if (object *tmp = object::read (f))
564 tmp->deactivate ();
565
566 { 580 {
581 tmp->deactivate ();
582
567 // was: insert_ob_in_ob (tmp, op); 583 // was: insert_ob_in_ob (tmp, op);
568 // but manually adding it can improve map loading times a lot 584 // but manually adding it can improve map loading times a lot
569 // also, appending instead of prepending keeps the 585 // also, appending instead of prepending keeps the
570 // 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
571 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 588 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
572 CLEAR_FLAG (tmp, FLAG_REMOVED); 589 CLEAR_FLAG (tmp, FLAG_REMOVED);
573 590
574 if (!op_inv) 591 if (!op_inv)
575 { 592 {
… …
587 604
588 tmp->below = 0; 605 tmp->below = 0;
589 tmp->env = this; 606 tmp->env = this;
590 op_inv = tmp; 607 op_inv = tmp;
591 } 608 }
592 } 609 else
610 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
611
593 continue; 612 continue;
594 613
595 case KW_other_arch: 614 case KW_other_arch:
596 other_arch =
597 loading_arch 615 if (loading_arch == this)
598 ? archetype::get (f.get_str ()) 616 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
617 else
618 {
599 : archetype::find (f.get_str ()); 619 other_arch = archetype::find (f.get_str ());
600 620
601 if (!other_arch) 621 if (!other_arch)
602 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 ());
603 break; 628 break;
604 629
605 case KW_animation: 630 case KW_animation:
606 { 631 {
607 CLEAR_FLAG (this, FLAG_ANIMATE); 632 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 633 animation_id = 0;
609 634
610 const char *str = f.get_str (); 635 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 636 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 638 }
614 break; 639 break;
615 640
616 case KW_last_heal: f.get (last_heal); break; 641 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 642 case KW_last_sp: f.get (last_sp); break;
… …
634 f.get (move_slow_penalty); 659 f.get (move_slow_penalty);
635 break; 660 break;
636 661
637 case KW_face: 662 case KW_face:
638 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");
639 break; 676 break;
640 677
641 case KW_x: f.get (x); break; 678 case KW_x: f.get (x); break;
642 case KW_y: f.get (y); break; 679 case KW_y: f.get (y); break;
643 680
… …
770 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 807 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
771 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 808 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
772 809
773 break; 810 break;
774 811
775 case KW_wiz:
776 GET_FLAG (this, FLAG_WIZ);
777 //TODO: move to check_object
778 if (QUERY_FLAG (this, FLAG_WIZ))
779 {
780 SET_FLAG (this, FLAG_WAS_WIZ);
781 SET_FLAG (this, FLAG_WIZPASS);
782 SET_FLAG (this, FLAG_WIZCAST);
783 }
784 else
785 {
786 CLEAR_FLAG (this, FLAG_WIZPASS);
787 CLEAR_FLAG (this, FLAG_WIZCAST);
788 }
789 break;
790
791 case KW_friendly: 812 case KW_friendly:
792 if (f.get_sint32 ()) 813 if (f.get_bool ())
793 if (type != PLAYER) 814 if (type != PLAYER)
794 add_friendly_object (this); 815 add_friendly_object (this);
795 816
796 break; 817 break;
797 818
… …
810 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 831 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
811 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;
812 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 833 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
813 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 834 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
814 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;
815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 837 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 838 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 839 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 840 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 841 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
826 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
827 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
828 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
829 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
830 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 852 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
831 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
832 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;
833 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 854 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
834 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
835 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;
836 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;
… …
920 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
921 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
922 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
923 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
924 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
925 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
926 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
927 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
928 case KW_tooltype: f.get (tooltype); break;
929 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
950
951 // elevation is deprecated
930 case KW_elevation: f.get (elevation); break; 952 case KW_elevation: break;
953
931 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;
932 case KW_client_type: f.get (client_type); break; 955 case KW_client_type: f.get (client_type); break;
933 case KW_duration: f.get (duration); break; 956 case KW_duration: f.get (duration); break;
934 case KW_range: f.get (range); break; 957 case KW_range: f.get (range); break;
935 case KW_range_modifier: f.get (range_modifier); break; 958 case KW_range_modifier: f.get (range_modifier); break;
… …
954 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
955 case KW_can_apply: 978 case KW_can_apply:
956 break; 979 break;
957 980
958 case KW_connected: 981 case KW_connected:
959 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
960 break; 988 break;
961 989
962 case KW_randomitems: 990 case KW_randomitems:
963 if (f.get_str ()) 991 if (f.get_str ())
964 { 992 {
… …
966 loading_arch 994 loading_arch
967 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
968 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
969 997
970 if (!randomitems) 998 if (!randomitems)
999 {
971 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1000 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1001 randomitems = treasurelist::get (shstr_none); // avoid crashes
1002 }
972 } 1003 }
973 else 1004 else
974 randomitems = 0; 1005 randomitems = 0;
975 break; 1006 break;
976 1007
977 case KW_msg: 1008 case KW_msg:
978 f.get_ml (KW_endmsg, msg); 1009 f.get_ml (KW_endmsg, msg);
979 //TODO: allow longer messages
980 if (strlen (msg) >= HUGE_BUF)
981 {
982 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
983 msg = "ERROR, please report: string too long, winged.\n";
984 }
985 break; 1010 break;
986 1011
987 case KW_lore: 1012 case KW_lore:
988 f.get_ml (KW_endlore, lore); 1013 f.get_ml (KW_endlore, lore);
989 //TODO: allow longer messages
990 /* Just print a warning so we can be reasonably safe
991 * about not overflowing the buffer.
992 */
993 if (strlen (lore) > (HUGE_BUF / 2))
994 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
995 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
996 break; 1014 break;
997 1015
998 case KW_editable: 1016 case KW_editable:
999 case KW_editor_folder: 1017 case KW_editor_folder:
1000 break; 1018 break;
… …
1005 1023
1006 f.next (); 1024 f.next ();
1007 return true; 1025 return true;
1008 1026
1009 case KW_ERROR: 1027 case KW_ERROR:
1010 set_ob_key_value (this, f.kw_str, f.value, true); 1028 // append as key value pair (do not use kv_set as it prepends)
1029 // we also do not even try to find old values, duplicate keys stay duplicate
1030 {
1031 key_value *kv = new key_value;
1032
1033 kv->next = 0;
1034 kv->key = shstr (f.kw_str);
1035 kv->value = shstr (f.value);
1036
1037 if (!last_kv)
1038 key_values = last_kv = kv;
1039 else
1040 {
1041 while (last_kv->next)
1042 last_kv = last_kv->next;
1043
1044 last_kv->next = kv;
1045 last_kv = kv;
1046 }
1047 }
1011 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1048 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1012 break; 1049 break;
1013 1050
1014 default: 1051 default:
1015 if (!f.parse_error ("object", name)) 1052 if (!f.parse_error ("object", name))
… …
1036 1073
1037 assert (arch); //D maybe use exception handling of sorts? 1074 assert (arch); //D maybe use exception handling of sorts?
1038 1075
1039 f.next (); 1076 f.next ();
1040 1077
1041 object *op = object::create (); 1078 object *op = arch->instance ();
1042
1043 op->map = map; 1079 op->map = map;
1044 arch->clone.copy_to (op);
1045 // copy_to activates, this should be fixed properly 1080 // instance() activates, this should be fixed properly
1046 op->deactivate (); 1081 op->deactivate ();
1047 1082
1048 if (!op->parse_kv (f)) 1083 if (!op->parse_kv (f))
1049 { 1084 {
1050 op->destroy (true); 1085 op->destroy ();
1051 return 0; 1086 return 0;
1052 } 1087 }
1053 1088
1054 op->post_load_check (); 1089 op->post_load_check ();
1055 return op; 1090 return op;
… …
1064int 1099int
1065set_variable (object *op, char *buf) 1100set_variable (object *op, char *buf)
1066{ 1101{
1067 object_thawer f (buf, (AV *)0); 1102 object_thawer f (buf, (AV *)0);
1068 1103
1069 f.next ();
1070 return op->parse_kv (f); 1104 return op->parse_kv (f);
1071} 1105}
1072
1073/* This returns a string of the integer movement type */
1074#if 0
1075// unused function
1076static char *
1077get_string_move_type (MoveType mt)
1078{
1079 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1080 int i, all_count = 0, count;
1081
1082 strcpy (retbuf, "");
1083 strcpy (retbuf_all, " all");
1084
1085 /* Quick check, and probably fairly common */
1086 if (mt == MOVE_ALL)
1087 return retbuf_all + 1;
1088 if (mt == 0)
1089 {
1090 strcpy (retbuf, "0");
1091 return retbuf;
1092 }
1093
1094 /* We basically slide the bits down. Why look at MOVE_ALL?
1095 * because we may want to return a string like 'all -swim',
1096 * and if we just looked at mt, we couldn't get that.
1097 */
1098 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1099 {
1100 if (mt & (1 << count))
1101 {
1102 strcat (retbuf, " ");
1103 strcat (retbuf, move_name[count]);
1104 }
1105 else
1106 {
1107 strcat (retbuf_all, " -");
1108 strcat (retbuf_all, move_name[count]);
1109 all_count++;
1110 }
1111 }
1112 /* Basically, if there is a single negation, return it, eg
1113 * 'all -swim'. But more than that, just return the
1114 * enumerated values. It doesn't make sense to return
1115 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1116 */
1117 if (all_count <= 1)
1118 return retbuf_all + 1;
1119 else
1120 return retbuf + 1;
1121}
1122#endif
1123 1106
1124// compare *op against *tmp and output differences 1107// compare *op against *tmp and output differences
1125static void 1108static void
1126write_diff (object_freezer &f, object *op, object *tmp) 1109write_diff (object_freezer &f, object *op, object *tmp)
1127{ 1110{
… …
1136 * the 15'th element of this array should match that name. 1119 * the 15'th element of this array should match that name.
1137 * If an entry is NULL, that is a flag not to loaded/saved. 1120 * If an entry is NULL, that is a flag not to loaded/saved.
1138 */ 1121 */
1139 static const keyword flag_names [NUM_FLAGS] = { 1122 static const keyword flag_names [NUM_FLAGS] = {
1140 KW_alive, 1123 KW_alive,
1141 KW_wiz,
1142 KW_NULL, 1124 KW_NULL,
1143 KW_NULL, 1125 KW_NULL,
1144 KW_was_wiz, 1126 KW_NULL,
1127 KW_NULL,
1145 KW_applied, 1128 KW_applied,
1146 KW_unpaid, 1129 KW_unpaid,
1147 KW_can_use_shield, 1130 KW_can_use_shield,
1148 KW_no_pick, 1131 KW_no_pick,
1149 KW_NULL, // walk_on 1132 KW_NULL, // walk_on
… …
1261 /* 110 */ 1244 /* 110 */
1262 KW_destroy_on_death, 1245 KW_destroy_on_death,
1263 KW_NULL, 1246 KW_NULL,
1264 }; 1247 };
1265 1248
1266 int i;
1267
1268 /* This saves the key/value lists. We do it first so that any 1249 /* This saves the key/value lists. We do it first so that any
1269 * keys that match field names will be overwritten by the loader. 1250 * keys that match field names will be overwritten by the loader.
1270 */ 1251 */
1271 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1252 for (key_value *kv = op->key_values; kv; kv = kv->next)
1272 { 1253 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1273 /* Find the field in the opposing member. */ 1254 f.put (kv->key, kv->value);
1274 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1275
1276 /* If there's no partnering field, or it's got a different value, save our field. */
1277 if (!arch_field || my_field->value != arch_field->value)
1278 f.put (my_field->key, my_field->value);
1279 }
1280 1255
1281 /* We don't need to worry about the arch's extra fields - they 1256 /* We don't need to worry about the arch's extra fields - they
1282 * will get taken care of the copy_to method. 1257 * will get taken care of the copy_to method.
1283 */ 1258 */
1284 1259
1285 { 1260 if (op->uuid)
1286 char uids[64]; 1261 f.put (KW_uuid, op->uuid.c_str ());
1287 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1288 f.put (KW_uuid, (const char *)uids);
1289 }
1290 1262
1291#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1263#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1292#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1265
1266 if (object *owner = op->owner)
1267 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1293 1268
1294 CMP_OUT (name); 1269 CMP_OUT (name);
1295 CMP_OUT (name_pl); 1270 CMP_OUT (name_pl);
1296 CMP_OUT (custom_name); 1271 CMP_OUT (custom_name);
1297 CMP_OUT (title); 1272 CMP_OUT (title);
1298 CMP_OUT (race); 1273 CMP_OUT (race);
1274 CMP_OUT (skill);
1299 CMP_OUT (slaying); 1275 CMP_OUT (slaying);
1300 1276 CMP_OUT (tag);
1301 if (op->msg != tmp->msg)
1302 f.put (KW_msg, KW_endmsg, op->msg);
1303 if (op->lore != tmp->lore)
1304 f.put (KW_lore, KW_endlore, op->lore);
1305
1306 CMP_OUT (other_arch); 1277 CMP_OUT (other_arch);
1307 1278
1279 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1280 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1281
1308 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1282 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1283 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1284 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1309 1285
1310 if (op->animation_id != tmp->animation_id) 1286 if (op->animation_id != tmp->animation_id)
1311 if (op->animation_id) 1287 if (op->has_anim ())
1288 f.put (KW_animation, op->anim ().name);
1289 else
1312 { 1290 {
1313 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1291 f.put (KW_animation, (const char *)0);
1314 1292 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1315 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1316 f.put (KW_is_animated, (sint32) 0);
1317 } 1293 }
1318 else
1319 f.put (KW_animation, (const char *) 0);
1320 1294
1321 CMP_OUT2 (str, stats.Str); 1295 CMP_OUT2 (str, stats.Str);
1322 CMP_OUT2 (dex, stats.Dex); 1296 CMP_OUT2 (dex, stats.Dex);
1323 CMP_OUT2 (con, stats.Con); 1297 CMP_OUT2 (con, stats.Con);
1324 CMP_OUT2 (wis, stats.Wis); 1298 CMP_OUT2 (wis, stats.Wis);
… …
1354 CMP_OUT (direction); 1328 CMP_OUT (direction);
1355 CMP_OUT (type); 1329 CMP_OUT (type);
1356 CMP_OUT (subtype); 1330 CMP_OUT (subtype);
1357 CMP_OUT (attacktype); 1331 CMP_OUT (attacktype);
1358 1332
1359 for (i = 0; i < NROFATTACKS; i++) 1333 for (int i = 0; i < NROFATTACKS; i++)
1360 if (op->resist[i] != tmp->resist[i]) 1334 if (expect_false (op->resist[i] != tmp->resist[i]))
1361 f.put (resist_save[i], op->resist[i]); 1335 f.put (resist_save[i], op->resist[i]);
1362 1336
1363 CMP_OUT (path_attuned); 1337 CMP_OUT (path_attuned);
1364 CMP_OUT (path_repelled); 1338 CMP_OUT (path_repelled);
1365 CMP_OUT (path_denied); 1339 CMP_OUT (path_denied);
… …
1375 CMP_OUT (last_sp); 1349 CMP_OUT (last_sp);
1376 CMP_OUT (last_grace); 1350 CMP_OUT (last_grace);
1377 CMP_OUT (last_eat); 1351 CMP_OUT (last_eat);
1378 CMP_OUT (glow_radius); 1352 CMP_OUT (glow_radius);
1379 1353
1380 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1354 if (op->flag [FLAG_IS_LINKED])
1355 if (auto (ol, op->find_link ()))
1381 f.put (KW_connected, i); 1356 f.put (KW_connected, ol->id);
1382 1357
1383 CMP_OUT (randomitems); 1358 CMP_OUT (randomitems);
1384 CMP_OUT2 (container, weight_limit); 1359 CMP_OUT2 (container, weight_limit);
1385 1360
1386 CMP_OUT (run_away); 1361 CMP_OUT (run_away);
1387 CMP_OUT (pick_up); 1362 CMP_OUT (pick_up);
1388 CMP_OUT (will_apply); 1363 CMP_OUT (will_apply);
1389 CMP_OUT (smoothlevel); 1364 CMP_OUT (smoothlevel);
1390 CMP_OUT (weapontype); 1365 CMP_OUT (weapontype);
1391 CMP_OUT (tooltype);
1392 CMP_OUT (elevation);
1393 CMP_OUT (client_type); 1366 CMP_OUT (client_type);
1394 CMP_OUT (item_power); 1367 CMP_OUT (item_power);
1395 CMP_OUT (duration); 1368 CMP_OUT (duration);
1396 CMP_OUT (range); 1369 CMP_OUT (range);
1397 CMP_OUT (range_modifier); 1370 CMP_OUT (range_modifier);
… …
1406 CMP_OUT (move_off); 1379 CMP_OUT (move_off);
1407 CMP_OUT (move_slow); 1380 CMP_OUT (move_slow);
1408 CMP_OUT (move_slow_penalty); 1381 CMP_OUT (move_slow_penalty);
1409 1382
1410 if (op->flag != tmp->flag) 1383 if (op->flag != tmp->flag)
1411 for (i = 0; i <= NUM_FLAGS; i++) 1384 for (int i = 0; i <= NUM_FLAGS; i++)
1412 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1385 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1413 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1386 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1414 1387
1415 // save body locations 1388 // save body locations
1416 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1389 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1417 if (op->slot[i].info != tmp->slot[i].info) 1390 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1418 f.put (body_locations[i].save_name, op->slot[i].info); 1391 f.put (body_locations[i].save_name, op->slot[i].info);
1419} 1392}
1420 1393
1421/* 1394/*
1422 * Dumps all variables in an object to a file. 1395 * Dumps all variables in an object to a file.
… …
1424 * the only place this is not set is when saving the player. 1397 * the only place this is not set is when saving the player.
1425 */ 1398 */
1426bool 1399bool
1427object::write (object_freezer &f) 1400object::write (object_freezer &f)
1428{ 1401{
1429 /* Even if the object does have an owner, it would seem that we should 1402 if (is_arch ())
1430 * still save it. 1403 {
1431 */ 1404 f.put (KW_object, arch->archname);
1432 if (owner) 1405 write_diff (f, this, archetype::empty);
1433 return true; 1406 }
1434 1407 else
1435 archetype *at = arch ? (archetype *)arch : empty_archetype; 1408 {
1436
1437 f.put (KW_arch, at->name); 1409 f.put (KW_arch, arch->archname);
1438 write_diff (f, this, &at->clone); 1410 write_diff (f, this, arch);
1411 }
1439 1412
1440 for (object *tmp = inv; tmp; tmp = tmp->below) 1413 for (object *tmp = inv; tmp; tmp = tmp->below)
1441 tmp->write (f); 1414 tmp->write (f);
1442 1415
1443 f.put (this); 1416 f.put (this);
… …
1448 1421
1449///////////////////////////////////////////////////////////////////////////// 1422/////////////////////////////////////////////////////////////////////////////
1450 1423
1451// generic resource file load, 1424// generic resource file load,
1452// currently supports: region, treasures, archetypes 1425// currently supports: region, treasures, archetypes
1426bool
1453bool load_resource_file (const char *filename) 1427load_resource_file_ (const char *filename)
1454{ 1428{
1455 object_thawer f (filename); 1429 object_thawer f (filename);
1456
1457 bool success = false;
1458 bool seen_arch = false;
1459
1460 f.next ();
1461 1430
1462 for (;;) 1431 for (;;)
1463 { 1432 {
1464 switch (f.kw) 1433 switch (f.kw)
1465 { 1434 {
1466 case KW_region: 1435 case KW_region:
1467 if (!region::read (f)) 1436 if (!region::read (f))
1468 goto finish; 1437 return false;
1469 break; 1438 break;
1470 1439
1471 case KW_treasure: 1440 case KW_treasure:
1472 case KW_treasureone: 1441 case KW_treasureone:
1473 if (!treasurelist::read (f)) 1442 if (!treasurelist::read (f))
1474 goto finish; 1443 return false;
1475 break; 1444 break;
1476 1445
1477 case KW_object: 1446 case KW_object:
1478 seen_arch = true;
1479 if (!archetype::read (f)) 1447 if (!archetype::read (f))
1480 goto finish; 1448 return false;
1481 break; 1449 break;
1482 1450
1483 case KW_EOF: 1451 case KW_EOF:
1484 success = true; 1452 return true;
1485 goto finish;
1486 1453
1487 default: 1454 default:
1488 if (!f.parse_error ("resource file")) 1455 if (!f.parse_error ("resource file"))
1489 goto finish; 1456 return false;
1490 1457
1491 f.next (); 1458 f.next ();
1492 break; 1459 break;
1493 } 1460 }
1494 } 1461 }
1495
1496finish:
1497 if (seen_arch)
1498 init_archetype_pointers ();
1499
1500 return success;
1501} 1462}
1502 1463

Diff Legend

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