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

Diff Legend

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