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.68 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.118 by elmex, Sun Aug 31 15:49:13 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
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, "%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, "%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, "%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, "%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, "%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, "%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, "%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, "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 ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 346 LOG (llevError, "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, "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, "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 spellcasting object - need to load in the appropiate object */
343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 391 if ((type == ROD
392 || type == WAND
393 || type == SCROLL
394 || type == HORN
395 || type == FIREWALL
344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch) 397 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
398 && !inv
399 && !loading_arch
400 && !randomitems) // by elmex: not _any_ rod or horn we find on a map, which has randomitems is an old spellcasting
401 // object. For instance lythanders pipe got it's spell in the treasurelist in the randomitems,
402 // same goes for normal rods.
346 { 403 {
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 404 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 405 * in that spell was stored in sp.
349 */ 406 */
407 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]); 408 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 409 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */
353 } 410 }
354 411
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 412 /* 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) 413 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 414 {
415 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 416 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 417 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 418 randomitems = 0; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 419 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 420 value = arch->value * inv->value;
363 } 421 }
364 422
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 423 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 424 {
367 if (op->stats.hp > op->stats.maxhp) 425 if (stats.hp > stats.maxhp)
368 { 426 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 427 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
370 op->stats.maxhp = op->stats.hp; 428 stats.maxhp = stats.hp;
371 } 429 }
372 430
373 /* The archs just need to be updated for this */ 431 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 432 if (move_type == 0)
375 op->move_type = MOVE_WALK; 433 move_type = MOVE_WALK;
376 } 434 }
377 435
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 436 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 437 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 438 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 439 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 440 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 441 */
442 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 443 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 444
388 /* Handle player movers. We use move_type for player movers 445 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 446 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 447 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 448 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 449 * are doing, otherwise, set move_type based on maxhp value.
393 */ 450 */
394 if (op->type == PLAYERMOVER) 451 if (type == PLAYERMOVER)
395 { 452 {
396 if (!op->move_type) 453 if (!move_type)
397 { 454 {
398 if (op->stats.maxhp) 455 if (stats.maxhp)
399 { 456 {
400 op->move_type = MOVE_ALL; 457 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 458 stats.maxhp = 0;
402 } 459 }
403 else 460 else
404 op->move_type = MOVE_WALK; 461 move_type = MOVE_WALK;
405 } 462 }
406 } 463 }
407
408} 464}
409 465
410static void 466static void
411set_move (MoveType &mt, const char *str) 467set_move (MoveType &mt, const char *str)
412{ 468{
… …
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 474 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 475 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 476 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 477 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 478 { "boat" , MOVE_BOAT },
479 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 480 { "all" , MOVE_ALL },
424 }; 481 };
425 482
426 if (!str) 483 if (!str)
427 { 484 {
… …
458 515
459 goto next; 516 goto next;
460 } 517 }
461 } 518 }
462 519
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 520 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
464 521
465next: ; 522next: ;
466 } 523 }
467} 524}
468 525
469#define GET_FLAG(op,flag) \ 526#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
470 if (f.get_sint32 ()) \
471 SET_FLAG (op, flag); \
472 else \
473 CLEAR_FLAG (op, flag) \
474 527
475bool 528bool
476object::parse_kv (object_thawer &f) 529object::parse_kv (object_thawer &f)
477{ 530{
478 assert (f.kw == KW_object || f.kw == KW_arch);
479
480 if (f.kw == KW_object)
481 f.get (name); // preset name from object name
482
483 f.next ();
484
485 object *op_inv = inv; 531 object *op_inv = inv;
532 key_value *last_kv = key_values;
486 533
487 for (;;) 534 for (;;)
488 { 535 {
489 switch (f.kw) 536 switch (f.kw)
490 { 537 {
491 case KW_uuid: 538 case KW_uuid:
492 if (const char *s = f.get_str ()) 539 if (const char *s = f.get_str ())
493 { 540 if (!uuid.parse (s))
494 unsigned int version;
495 unsigned long long seq;
496
497 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
498 { 541 {
499 uuid.seq = seq; 542 f.parse_warn ("unparseable uuid");
500 break; 543 uuid = UUID::gen ();
501 } 544 }
502 }
503
504 uuid = gen_uuid ();
505 break; 545 break;
506 546
507 case KW_oid: 547 case KW_oid:
508 f.get (this, f.get_sint32 ()); 548 f.get (this, f.get_sint32 ());
509 break; 549 break;
… …
515 555
516 case KW_attach: f.get_ornull (attach); break; 556 case KW_attach: f.get_ornull (attach); break;
517 case KW_skill: f.get_ornull (skill); break; 557 case KW_skill: f.get_ornull (skill); break;
518 case KW_race: f.get_ornull (race); break; 558 case KW_race: f.get_ornull (race); break;
519 case KW_slaying: f.get_ornull (slaying); break; 559 case KW_slaying: f.get_ornull (slaying); break;
560 case KW_tag: f.get_ornull (tag); break;
520 561
521 case KW_arch: 562 case KW_arch:
522 { 563 {
523 object *tmp = object::read (f); 564 object *tmp = object::read (f);
524 tmp->deactivate (); 565 tmp->deactivate ();
… …
526 { 567 {
527 // was: insert_ob_in_ob (tmp, op); 568 // was: insert_ob_in_ob (tmp, op);
528 // but manually adding it can improve map loading times a lot 569 // but manually adding it can improve map loading times a lot
529 // also, appending instead of prepending keeps the 570 // also, appending instead of prepending keeps the
530 // save ordering the same between repeated load/saves. 571 // save ordering the same between repeated load/saves.
572 // and finally we do not want any funny effects
531 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
532 CLEAR_FLAG (tmp, FLAG_REMOVED); 574 CLEAR_FLAG (tmp, FLAG_REMOVED);
533 575
534 if (!op_inv) 576 if (!op_inv)
535 { 577 {
… …
551 } 593 }
552 } 594 }
553 continue; 595 continue;
554 596
555 case KW_other_arch: 597 case KW_other_arch:
556 other_arch =
557 loading_arch 598 if (loading_arch == this)
558 ? archetype::get (f.get_str ()) 599 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
600 else
601 {
559 : archetype::find (f.get_str ()); 602 other_arch = archetype::find (f.get_str ());
560 603
561 if (!other_arch) 604 if (!other_arch)
562 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 605 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
606 }
607 break;
608
609 case KW_owner:
610 f.delayed_deref (this, owner, f.get_str ());
563 break; 611 break;
564 612
565 case KW_animation: 613 case KW_animation:
566 { 614 {
567 CLEAR_FLAG (this, FLAG_ANIMATE); 615 CLEAR_FLAG (this, FLAG_ANIMATE);
568 animation_id = 0; 616 animation_id = 0;
569 617
570 const char *str = f.get_str (); 618 const char *str = f.get_str ();
571 if (str && (animation_id = find_animation (str))) 619 if (str && (animation_id = find_animation (str)))
572 SET_FLAG (this, FLAG_ANIMATE); 620 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
573 } 621 }
574 break; 622 break;
575 623
576 case KW_last_heal: f.get (last_heal); break; 624 case KW_last_heal: f.get (last_heal); break;
577 case KW_last_sp: f.get (last_sp); break; 625 case KW_last_sp: f.get (last_sp); break;
… …
594 f.get (move_slow_penalty); 642 f.get (move_slow_penalty);
595 break; 643 break;
596 644
597 case KW_face: 645 case KW_face:
598 face = face_find (f.get_str ()); 646 face = face_find (f.get_str ());
647 break;
648
649 case KW_sound:
650 sound = sound_find (f.get_str ());
651 if (!sound)
652 f.parse_warn ("sound not found");
653 break;
654
655 case KW_sound_destroy:
656 sound_destroy = sound_find (f.get_str ());
657 if (!sound_destroy)
658 f.parse_warn ("sound not found");
599 break; 659 break;
600 660
601 case KW_x: f.get (x); break; 661 case KW_x: f.get (x); break;
602 case KW_y: f.get (y); break; 662 case KW_y: f.get (y); break;
603 663
… …
730 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 790 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
731 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 791 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
732 792
733 break; 793 break;
734 794
735 case KW_wiz:
736 GET_FLAG (this, FLAG_WIZ);
737 //TODO: move to check_object
738 if (QUERY_FLAG (this, FLAG_WIZ))
739 {
740 SET_FLAG (this, FLAG_WAS_WIZ);
741 SET_FLAG (this, FLAG_WIZPASS);
742 SET_FLAG (this, FLAG_WIZCAST);
743 }
744 else
745 {
746 CLEAR_FLAG (this, FLAG_WIZPASS);
747 CLEAR_FLAG (this, FLAG_WIZCAST);
748 }
749 break;
750
751 case KW_friendly: 795 case KW_friendly:
752 if (f.get_sint32 ()) 796 if (f.get_bool ())
753 if (type != PLAYER) 797 if (type != PLAYER)
754 add_friendly_object (this); 798 add_friendly_object (this);
755 799
756 break; 800 break;
757 801
… …
770 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 814 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
771 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 815 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
772 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 816 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
773 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 817 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
774 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 818 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
819 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
775 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 820 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
776 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 821 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
777 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 822 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
778 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 823 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
779 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 824 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
786 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 831 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
787 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 832 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
788 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 833 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
789 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 834 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
790 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 835 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
791 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
792 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 836 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
793 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 837 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
794 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 838 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
795 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 839 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
796 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 840 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
839 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 883 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
840 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 884 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
841 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 885 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
842 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 886 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
843 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 887 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
888 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
889 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
844 890
845 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 891 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
846 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 892 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
847 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 893 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
848 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 894 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
883 case KW_expmul: f.get (expmul); break; 929 case KW_expmul: f.get (expmul); break;
884 case KW_glow_radius: f.get (glow_radius); break; 930 case KW_glow_radius: f.get (glow_radius); break;
885 case KW_weapontype: f.get (weapontype); break; 931 case KW_weapontype: f.get (weapontype); break;
886 case KW_tooltype: f.get (tooltype); break; 932 case KW_tooltype: f.get (tooltype); break;
887 case KW_casting_time: f.get (casting_time); break; 933 case KW_casting_time: f.get (casting_time); break;
934
935 // elevation is deprecated
888 case KW_elevation: f.get (elevation); break; 936 case KW_elevation: break;
937
889 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 938 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
890 case KW_client_type: f.get (client_type); break; 939 case KW_client_type: f.get (client_type); break;
891 case KW_duration: f.get (duration); break; 940 case KW_duration: f.get (duration); break;
892 case KW_range: f.get (range); break; 941 case KW_range: f.get (range); break;
893 case KW_range_modifier: f.get (range_modifier); break; 942 case KW_range_modifier: f.get (range_modifier); break;
894 case KW_dam_modifier: f.get (dam_modifier); break; 943 case KW_dam_modifier: f.get (dam_modifier); break;
895 case KW_duration_modifier: f.get (duration_modifier); break; 944 case KW_duration_modifier: f.get (duration_modifier); break;
896 945
897 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 946 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
898 //TODO: parse from other include files 947 //TODO: parse from other include files
899 case KW_body_range: f.get (body_info[0]); break; 948 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
900 case KW_body_arm: f.get (body_info[1]); break; 949 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
901 case KW_body_torso: f.get (body_info[2]); break; 950 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
902 case KW_body_head: f.get (body_info[3]); break; 951 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
903 case KW_body_neck: f.get (body_info[4]); break; 952 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
904 case KW_body_skill: f.get (body_info[5]); break; 953 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
905 case KW_body_finger: f.get (body_info[6]); break; 954 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
906 case KW_body_shoulder: f.get (body_info[7]); break; 955 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
907 case KW_body_foot: f.get (body_info[8]); break; 956 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
908 case KW_body_hand: f.get (body_info[9]); break; 957 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
909 case KW_body_wrist: f.get (body_info[10]); break; 958 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
910 case KW_body_waist: f.get (body_info[11]); break; 959 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
960 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
961 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
911 case KW_can_apply: 962 case KW_can_apply:
912 break; 963 break;
913 964
914 case KW_connected: 965 case KW_connected:
915 add_button_link (this, map, f.get_sint32 ()); 966 add_button_link (this, map, f.get_sint32 ());
… …
924 : treasurelist::find (f.get_str ()); 975 : treasurelist::find (f.get_str ());
925 976
926 if (!randomitems) 977 if (!randomitems)
927 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 978 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
928 } 979 }
980 else
981 randomitems = 0;
929 break; 982 break;
930 983
931 case KW_msg: 984 case KW_msg:
932 f.get_ml (KW_endmsg, msg); 985 f.get_ml (KW_endmsg, msg);
933 //TODO: allow longer messages
934 if (strlen (msg) >= HUGE_BUF)
935 {
936 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
937 msg = "ERROR, please report: string too long, winged.\n";
938 }
939 break; 986 break;
940 987
941 case KW_lore: 988 case KW_lore:
942 f.get_ml (KW_endlore, lore); 989 f.get_ml (KW_endlore, lore);
943 //TODO: allow longer messages
944 /* Just print a warning so we can be reasonably safe
945 * about not overflowing the buffer.
946 */
947 if (strlen (lore) > (HUGE_BUF / 2))
948 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
949 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
950 break; 990 break;
951 991
952 case KW_editable: 992 case KW_editable:
953 case KW_editor_folder: 993 case KW_editor_folder:
954 break; 994 break;
955 995
956 case KW_end: 996 case KW_end:
957 check_loaded_object (this);
958
959 if (!loading_arch) 997 if (!loading_arch)
960 instantiate (); 998 instantiate ();
961 999
962 f.next (); 1000 f.next ();
963 return true; 1001 return true;
964 1002
965 case KW_ERROR: 1003 case KW_ERROR:
966 set_ob_key_value (this, f.kw_str, f.value, true); 1004 // append as key value pair (do not use kv_set as it prepends)
1005 // we also do not even try to find old values, duplicate keys stay duplicate
1006 {
1007 key_value *kv = new key_value;
1008
1009 kv->next = 0;
1010 kv->key = shstr (f.kw_str);
1011 kv->value = shstr (f.value);
1012
1013 if (!last_kv)
1014 key_values = last_kv = kv;
1015 else
1016 {
1017 while (last_kv->next)
1018 last_kv = last_kv->next;
1019
1020 last_kv->next = kv;
1021 last_kv = kv;
1022 }
1023 }
967 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1024 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
968 break; 1025 break;
969 1026
970 default: 1027 default:
971 if (!f.parse_error ("object", name)) 1028 if (!f.parse_error ("object", name))
… …
990 arch = archetype::find ("earthwall"); 1047 arch = archetype::find ("earthwall");
991 } 1048 }
992 1049
993 assert (arch); //D maybe use exception handling of sorts? 1050 assert (arch); //D maybe use exception handling of sorts?
994 1051
995 object *op = object::create (); 1052 f.next ();
996 1053
1054 object *op = arch->instance ();
997 op->map = map; 1055 op->map = map;
998 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 1056 // instance() activates, this should be fixed properly
1000 op->deactivate (); 1057 op->deactivate ();
1001 1058
1002 if (!op->parse_kv (f)) 1059 if (!op->parse_kv (f))
1003 { 1060 {
1004 op->destroy (true); 1061 op->destroy (true);
1005 return 0; 1062 return 0;
1006 } 1063 }
1007 1064
1065 op->post_load_check ();
1008 return op; 1066 return op;
1009} 1067}
1010 1068
1011/* This takes a buffer, scans it for variables, and sets those variables 1069/* This takes a buffer, scans it for variables, and sets those variables
1012 * as appropriate in op. 1070 * as appropriate in op.
… …
1017int 1075int
1018set_variable (object *op, char *buf) 1076set_variable (object *op, char *buf)
1019{ 1077{
1020 object_thawer f (buf, (AV *)0); 1078 object_thawer f (buf, (AV *)0);
1021 1079
1022 f.kw = KW_arch; // special hack so that parse_kv skips
1023 return op->parse_kv (f); 1080 return op->parse_kv (f);
1024} 1081}
1025 1082
1026/* This returns a string of the integer movement type */ 1083/* This returns a string of the integer movement type */
1027#if 0 1084#if 0
… …
1089 * the 15'th element of this array should match that name. 1146 * 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. 1147 * If an entry is NULL, that is a flag not to loaded/saved.
1091 */ 1148 */
1092 static const keyword flag_names [NUM_FLAGS] = { 1149 static const keyword flag_names [NUM_FLAGS] = {
1093 KW_alive, 1150 KW_alive,
1094 KW_wiz,
1095 KW_NULL, 1151 KW_NULL,
1096 KW_NULL, 1152 KW_NULL,
1097 KW_was_wiz, 1153 KW_NULL,
1154 KW_NULL,
1098 KW_applied, 1155 KW_applied,
1099 KW_unpaid, 1156 KW_unpaid,
1100 KW_can_use_shield, 1157 KW_can_use_shield,
1101 KW_no_pick, 1158 KW_no_pick,
1102 KW_NULL, // walk_on 1159 KW_NULL, // walk_on
… …
1108 KW_monster, 1165 KW_monster,
1109 KW_friendly, 1166 KW_friendly,
1110 KW_generator, 1167 KW_generator,
1111 KW_is_thrown, 1168 KW_is_thrown,
1112 KW_auto_apply, 1169 KW_auto_apply,
1113 KW_NULL, // was KW_treasure 1170 KW_treasure_env,
1114 KW_player_sold, 1171 KW_player_sold,
1115 /* 20 */ 1172 /* 20 */
1116 KW_see_invisible, 1173 KW_see_invisible,
1117 KW_can_roll, 1174 KW_can_roll,
1118 KW_overlay_floor, 1175 KW_overlay_floor,
… …
1179 KW_can_use_skill, 1236 KW_can_use_skill,
1180 KW_been_applied, 1237 KW_been_applied,
1181 /* 80 */ 1238 /* 80 */
1182 KW_has_ready_scroll, 1239 KW_has_ready_scroll,
1183 KW_can_use_rod, 1240 KW_can_use_rod,
1184 KW_NULL, 1241 KW_precious,
1185 KW_can_use_horn, 1242 KW_can_use_horn,
1186 KW_make_invisible, 1243 KW_make_invisible,
1187 KW_inv_locked, 1244 KW_inv_locked,
1188 KW_is_wooded, 1245 KW_is_wooded,
1189 KW_is_hilly, 1246 KW_is_hilly,
… …
1214 /* 110 */ 1271 /* 110 */
1215 KW_destroy_on_death, 1272 KW_destroy_on_death,
1216 KW_NULL, 1273 KW_NULL,
1217 }; 1274 };
1218 1275
1219 int i;
1220
1221 /* This saves the key/value lists. We do it first so that any 1276 /* 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. 1277 * keys that match field names will be overwritten by the loader.
1223 */ 1278 */
1224 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1279 for (key_value *kv = op->key_values; kv; kv = kv->next)
1225 { 1280 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1226 /* Find the field in the opposing member. */ 1281 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 1282
1234 /* We don't need to worry about the arch's extra fields - they 1283 /* We don't need to worry about the arch's extra fields - they
1235 * will get taken care of the copy_to method. 1284 * will get taken care of the copy_to method.
1236 */ 1285 */
1237 1286
1238 { 1287 f.put (KW_uuid, op->uuid.c_str ());
1239 char uids[64];
1240 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1241 f.put (KW_uuid, (const char *)uids);
1242 }
1243 1288
1244#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1289#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) 1290#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1291
1292 if (object *owner = op->owner)
1293 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1246 1294
1247 CMP_OUT (name); 1295 CMP_OUT (name);
1248 CMP_OUT (name_pl); 1296 CMP_OUT (name_pl);
1249 CMP_OUT (custom_name); 1297 CMP_OUT (custom_name);
1250 CMP_OUT (title); 1298 CMP_OUT (title);
1251 CMP_OUT (race); 1299 CMP_OUT (race);
1300 CMP_OUT (skill);
1252 CMP_OUT (slaying); 1301 CMP_OUT (slaying);
1253 1302 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); 1303 CMP_OUT (other_arch);
1260 1304
1305 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1306 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1307
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1308 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1309 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1310 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1262 1311
1263 if (op->animation_id != tmp->animation_id) 1312 if (op->animation_id != tmp->animation_id)
1264 if (op->animation_id) 1313 if (op->animation_id)
1314 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1315 else
1265 { 1316 {
1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1317 f.put (KW_animation, (const char *)0);
1267 1318 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 } 1319 }
1271 else
1272 f.put (KW_animation, (const char *) 0);
1273 1320
1274 CMP_OUT2 (str, stats.Str); 1321 CMP_OUT2 (str, stats.Str);
1275 CMP_OUT2 (dex, stats.Dex); 1322 CMP_OUT2 (dex, stats.Dex);
1276 CMP_OUT2 (con, stats.Con); 1323 CMP_OUT2 (con, stats.Con);
1277 CMP_OUT2 (wis, stats.Wis); 1324 CMP_OUT2 (wis, stats.Wis);
… …
1307 CMP_OUT (direction); 1354 CMP_OUT (direction);
1308 CMP_OUT (type); 1355 CMP_OUT (type);
1309 CMP_OUT (subtype); 1356 CMP_OUT (subtype);
1310 CMP_OUT (attacktype); 1357 CMP_OUT (attacktype);
1311 1358
1312 for (i = 0; i < NROFATTACKS; i++) 1359 for (int i = 0; i < NROFATTACKS; i++)
1313 if (op->resist[i] != tmp->resist[i]) 1360 if (expect_false (op->resist[i] != tmp->resist[i]))
1314 f.put (resist_save[i], op->resist[i]); 1361 f.put (resist_save[i], op->resist[i]);
1315 1362
1316 CMP_OUT (path_attuned); 1363 CMP_OUT (path_attuned);
1317 CMP_OUT (path_repelled); 1364 CMP_OUT (path_repelled);
1318 CMP_OUT (path_denied); 1365 CMP_OUT (path_denied);
… …
1328 CMP_OUT (last_sp); 1375 CMP_OUT (last_sp);
1329 CMP_OUT (last_grace); 1376 CMP_OUT (last_grace);
1330 CMP_OUT (last_eat); 1377 CMP_OUT (last_eat);
1331 CMP_OUT (glow_radius); 1378 CMP_OUT (glow_radius);
1332 1379
1333 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1380 if (op->flag [FLAG_IS_LINKED])
1381 if (int i = get_button_value (op))
1334 f.put (KW_connected, i); 1382 f.put (KW_connected, i);
1335 1383
1336 CMP_OUT (randomitems); 1384 CMP_OUT (randomitems);
1337 CMP_OUT2 (container, weight_limit); 1385 CMP_OUT2 (container, weight_limit);
1338 1386
1339 CMP_OUT (run_away); 1387 CMP_OUT (run_away);
1340 CMP_OUT (pick_up); 1388 CMP_OUT (pick_up);
1341 CMP_OUT (will_apply); 1389 CMP_OUT (will_apply);
1342 CMP_OUT (smoothlevel); 1390 CMP_OUT (smoothlevel);
1343 CMP_OUT (weapontype); 1391 CMP_OUT (weapontype);
1344 CMP_OUT (tooltype); 1392 CMP_OUT (tooltype);
1345 CMP_OUT (elevation);
1346 CMP_OUT (client_type); 1393 CMP_OUT (client_type);
1347 CMP_OUT (item_power); 1394 CMP_OUT (item_power);
1348 CMP_OUT (duration); 1395 CMP_OUT (duration);
1349 CMP_OUT (range); 1396 CMP_OUT (range);
1350 CMP_OUT (range_modifier); 1397 CMP_OUT (range_modifier);
… …
1359 CMP_OUT (move_off); 1406 CMP_OUT (move_off);
1360 CMP_OUT (move_slow); 1407 CMP_OUT (move_slow);
1361 CMP_OUT (move_slow_penalty); 1408 CMP_OUT (move_slow_penalty);
1362 1409
1363 if (op->flag != tmp->flag) 1410 if (op->flag != tmp->flag)
1364 for (i = 0; i <= NUM_FLAGS; i++) 1411 for (int i = 0; i <= NUM_FLAGS; i++)
1365 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1412 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1366 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1413 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1367 1414
1368 /* Save body locations */ 1415 // save body locations
1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1416 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1370 if (op->body_info[i] != tmp->body_info[i]) 1417 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1371 f.put (body_locations[i].save_name, op->body_info[i]); 1418 f.put (body_locations[i].save_name, op->slot[i].info);
1372} 1419}
1373 1420
1374/* 1421/*
1375 * Dumps all variables in an object to a file. 1422 * 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, 1423 * 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. 1424 * the only place this is not set is when saving the player.
1378 */ 1425 */
1379bool 1426bool
1380object::write (object_freezer &f) 1427object::write (object_freezer &f)
1381{ 1428{
1382 /* Even if the object does have an owner, it would seem that we should 1429 archetype *at = arch ? arch : archetype::empty;
1383 * still save it.
1384 */
1385 if (owner)
1386 return true;
1387 1430
1388 archetype *at = arch ? (archetype *)arch : empty_archetype;
1389
1390 f.put (KW_arch, at->name); 1431 f.put (KW_arch, at->archname);
1391 write_diff (f, this, &at->clone); 1432 write_diff (f, this, at);
1392 1433
1393 for (object *tmp = inv; tmp; tmp = tmp->below) 1434 for (object *tmp = inv; tmp; tmp = tmp->below)
1394 tmp->write (f); 1435 tmp->write (f);
1395 1436
1396 f.put (this); 1437 f.put (this);
… …
1399 return true; 1440 return true;
1400} 1441}
1401 1442
1402///////////////////////////////////////////////////////////////////////////// 1443/////////////////////////////////////////////////////////////////////////////
1403 1444
1445// generic resource file load,
1446// currently supports: region, treasures, archetypes
1447bool
1404bool load_resource_file (const char *filename) 1448load_resource_file_ (const char *filename)
1405{ 1449{
1406 object_thawer f (filename); 1450 object_thawer f (filename);
1407
1408 f.next ();
1409 1451
1410 for (;;) 1452 for (;;)
1411 { 1453 {
1412 switch (f.kw) 1454 switch (f.kw)
1413 { 1455 {
1414 case KW_region: 1456 case KW_region:
1415 if (!region::read (f)) 1457 if (!region::read (f))
1416 return false; 1458 return false;
1417 break; 1459 break;
1418 1460
1461 case KW_treasure:
1462 case KW_treasureone:
1463 if (!treasurelist::read (f))
1464 return false;
1465 break;
1466
1467 case KW_object:
1468 if (!archetype::read (f))
1469 return false;
1470 break;
1471
1419 case KW_EOF: 1472 case KW_EOF:
1420 return true; 1473 return true;
1421 1474
1422 default: 1475 default:
1423 if (!f.parse_error ("resource file")) 1476 if (!f.parse_error ("resource file"))
1424 return false; 1477 return false;
1478
1479 f.next ();
1480 break;
1425 } 1481 }
1426
1427 f.next ();
1428 } 1482 }
1429} 1483}
1430 1484

Diff Legend

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