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.72 by root, Sat Apr 21 12:28:31 2007 UTC vs.
Revision 1.137 by root, Thu Nov 5 15:43:21 2009 UTC

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

Diff Legend

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