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.77 by root, Mon May 7 04:21:09 2007 UTC vs.
Revision 1.140 by root, Sun Nov 8 22:30:48 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30
31extern archetype *loading_arch;
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->slot[1].info != -1) || 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->slot[1].info != -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->slot[1].info, &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;
… …
874 case KW_anim_speed: f.get (anim_speed); break; 945 case KW_anim_speed: f.get (anim_speed); break;
875 case KW_container: f.get (weight_limit); break; 946 case KW_container: f.get (weight_limit); break;
876 case KW_will_apply: f.get (will_apply); break; 947 case KW_will_apply: f.get (will_apply); break;
877 case KW_attack_movement: f.get (attack_movement); break; 948 case KW_attack_movement: f.get (attack_movement); break;
878 case KW_move_state: f.get (move_status); break; 949 case KW_move_state: f.get (move_status); break;
879 case KW_expmul: f.get (expmul); break; 950 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
880 case KW_glow_radius: f.get (glow_radius); break; 951 case KW_glow_radius: f.get (glow_radius); break;
881 case KW_weapontype: f.get (weapontype); break; 952 case KW_weapontype: f.get (weapontype); break;
882 case KW_tooltype: f.get (tooltype); break;
883 case KW_casting_time: f.get (casting_time); break; 953 case KW_casting_time: f.get (casting_time); break;
954
955 // elevation is deprecated
884 case KW_elevation: f.get (elevation); break; 956 case KW_elevation: break;
957
885 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;
886 case KW_client_type: f.get (client_type); break; 959 case KW_client_type: f.get (client_type); break;
887 case KW_duration: f.get (duration); break; 960 case KW_duration: f.get (duration); break;
888 case KW_range: f.get (range); break; 961 case KW_range: f.get (range); break;
889 case KW_range_modifier: f.get (range_modifier); break; 962 case KW_range_modifier: f.get (range_modifier); break;
890 case KW_dam_modifier: f.get (dam_modifier); break; 963 case KW_dam_modifier: f.get (dam_modifier); break;
891 case KW_duration_modifier: f.get (duration_modifier); break; 964 case KW_duration_modifier: f.get (duration_modifier); break;
892 965
893 //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
894 //TODO: parse from other include files 967 //TODO: parse from other include files
895 case KW_body_range: slot[ 0].info = f.get_sint32 (); break; 968 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
969 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
970 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
896 case KW_body_arm: slot[ 1].info = f.get_sint32 (); break; 971 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
897 case KW_body_torso: slot[ 2].info = f.get_sint32 (); break; 972 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
898 case KW_body_head: slot[ 3].info = f.get_sint32 (); break; 973 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
899 case KW_body_neck: slot[ 4].info = f.get_sint32 (); break; 974 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
900 case KW_body_skill: slot[ 5].info = f.get_sint32 (); break; 975 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
901 case KW_body_finger: slot[ 6].info = f.get_sint32 (); break; 976 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
902 case KW_body_shoulder: slot[ 7].info = f.get_sint32 (); break; 977 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
903 case KW_body_foot: slot[ 8].info = f.get_sint32 (); break; 978 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
904 case KW_body_hand: slot[ 9].info = f.get_sint32 (); break; 979 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
905 case KW_body_wrist: slot[10].info = f.get_sint32 (); break; 980 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
906 case KW_body_waist: slot[11].info = f.get_sint32 (); break; 981 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
907 case KW_can_apply: 982 case KW_can_apply:
908 break; 983 break;
909 984
910 case KW_connected: 985 case KW_connected:
911 add_button_link (this, map, f.get_sint32 ()); 986 {
987 shstr connected;
988
989 f.get (connected);
990 add_link (map, connected);
991 }
912 break; 992 break;
913 993
914 case KW_randomitems: 994 case KW_randomitems:
915 if (f.get_str ()) 995 if (f.get_str ())
916 { 996 {
… …
918 loading_arch 998 loading_arch
919 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
920 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
921 1001
922 if (!randomitems) 1002 if (!randomitems)
1003 {
923 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 }
924 } 1007 }
925 else 1008 else
926 randomitems = 0; 1009 randomitems = 0;
927 break; 1010 break;
928 1011
929 case KW_msg: 1012 case KW_msg:
930 f.get_ml (KW_endmsg, msg); 1013 f.get_ml (KW_endmsg, msg);
931 //TODO: allow longer messages
932 if (strlen (msg) >= HUGE_BUF)
933 {
934 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
935 msg = "ERROR, please report: string too long, winged.\n";
936 }
937 break; 1014 break;
938 1015
939 case KW_lore: 1016 case KW_lore:
940 f.get_ml (KW_endlore, lore); 1017 f.get_ml (KW_endlore, lore);
941 //TODO: allow longer messages
942 /* Just print a warning so we can be reasonably safe
943 * about not overflowing the buffer.
944 */
945 if (strlen (lore) > (HUGE_BUF / 2))
946 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
947 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
948 break; 1018 break;
949 1019
950 case KW_editable: 1020 case KW_editable:
951 case KW_editor_folder: 1021 case KW_editor_folder:
952 break; 1022 break;
953 1023
954 case KW_end: 1024 case KW_end:
955 check_loaded_object (this);
956
957 if (!loading_arch) 1025 if (!loading_arch)
958 instantiate (); 1026 instantiate ();
959 1027
960 f.next (); 1028 f.next ();
961 return true; 1029 return true;
962 1030
963 case KW_ERROR: 1031 case KW_ERROR:
964 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 }
965 //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
966 break; 1053 break;
967 1054
968 default: 1055 default:
969 if (!f.parse_error ("object", name)) 1056 if (!f.parse_error ("object", name))
… …
983 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
984 1071
985 if (!arch) 1072 if (!arch)
986 { 1073 {
987 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
988 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
989 } 1076 }
990 1077
991 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
992 1079
993 f.next (); 1080 f.next ();
994 1081
995 object *op = object::create (); 1082 object *op = arch->instance ();
996
997 op->map = map; 1083 op->map = map;
998 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 1084 // instance() activates, this should be fixed properly
1000 op->deactivate (); 1085 op->deactivate ();
1001 1086
1002 if (!op->parse_kv (f)) 1087 if (!op->parse_kv (f))
1003 { 1088 {
1004 op->destroy (true); 1089 op->destroy ();
1005 return 0; 1090 return 0;
1006 } 1091 }
1007 1092
1093 op->post_load_check ();
1008 return op; 1094 return op;
1009} 1095}
1010 1096
1011/* 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
1012 * as appropriate in op. 1098 * as appropriate in op.
… …
1017int 1103int
1018set_variable (object *op, char *buf) 1104set_variable (object *op, char *buf)
1019{ 1105{
1020 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1021 1107
1022 f.next ();
1023 return op->parse_kv (f); 1108 return op->parse_kv (f);
1024} 1109}
1025 1110
1026/* This returns a string of the integer movement type */
1027#if 0
1028// unused function
1029static char *
1030get_string_move_type (MoveType mt)
1031{
1032 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1033 int i, all_count = 0, count;
1034
1035 strcpy (retbuf, "");
1036 strcpy (retbuf_all, " all");
1037
1038 /* Quick check, and probably fairly common */
1039 if (mt == MOVE_ALL)
1040 return retbuf_all + 1;
1041 if (mt == 0)
1042 {
1043 strcpy (retbuf, "0");
1044 return retbuf;
1045 }
1046
1047 /* We basically slide the bits down. Why look at MOVE_ALL?
1048 * because we may want to return a string like 'all -swim',
1049 * and if we just looked at mt, we couldn't get that.
1050 */
1051 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1052 {
1053 if (mt & (1 << count))
1054 {
1055 strcat (retbuf, " ");
1056 strcat (retbuf, move_name[count]);
1057 }
1058 else
1059 {
1060 strcat (retbuf_all, " -");
1061 strcat (retbuf_all, move_name[count]);
1062 all_count++;
1063 }
1064 }
1065 /* Basically, if there is a single negation, return it, eg
1066 * 'all -swim'. But more than that, just return the
1067 * enumerated values. It doesn't make sense to return
1068 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1069 */
1070 if (all_count <= 1)
1071 return retbuf_all + 1;
1072 else
1073 return retbuf + 1;
1074}
1075#endif
1076
1077// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1078static void 1112static void
1079write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1080{ 1114{
1081 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1082# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1083# include "attackinc.h" 1117# include "attackinc.h"
1084# undef def 1118# undef def
… …
1089 * the 15'th element of this array should match that name. 1123 * the 15'th element of this array should match that name.
1090 * If an entry is NULL, that is a flag not to loaded/saved. 1124 * If an entry is NULL, that is a flag not to loaded/saved.
1091 */ 1125 */
1092 static const keyword flag_names [NUM_FLAGS] = { 1126 static const keyword flag_names [NUM_FLAGS] = {
1093 KW_alive, 1127 KW_alive,
1094 KW_wiz,
1095 KW_NULL, 1128 KW_NULL,
1096 KW_NULL, 1129 KW_NULL,
1097 KW_was_wiz, 1130 KW_NULL,
1131 KW_NULL,
1098 KW_applied, 1132 KW_applied,
1099 KW_unpaid, 1133 KW_unpaid,
1100 KW_can_use_shield, 1134 KW_can_use_shield,
1101 KW_no_pick, 1135 KW_no_pick,
1102 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
… …
1214 /* 110 */ 1248 /* 110 */
1215 KW_destroy_on_death, 1249 KW_destroy_on_death,
1216 KW_NULL, 1250 KW_NULL,
1217 }; 1251 };
1218 1252
1219 int i;
1220
1221 /* 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
1222 * keys that match field names will be overwritten by the loader. 1254 * keys that match field names will be overwritten by the loader.
1223 */ 1255 */
1224 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)
1225 { 1257 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1226 /* Find the field in the opposing member. */ 1258 f.put (kv->key, kv->value);
1227 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1228 1259
1229 /* If there's no partnering field, or it's got a different value, save our field. */ 1260 if (op->uuid)
1230 if (!arch_field || my_field->value != arch_field->value) 1261 f.put (KW_uuid, op->uuid.c_str ());
1231 f.put (my_field->key, my_field->value);
1232 }
1233 1262
1234 /* We don't need to worry about the arch's extra fields - they
1235 * will get taken care of the copy_to method.
1236 */
1237
1238 {
1239 char uids[64];
1240 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1241 f.put (KW_uuid, (const char *)uids);
1242 }
1243
1244#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1263#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1245#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1265
1266 CMP_OUT (x);
1267 CMP_OUT (y);
1268
1269 CMP_OUT (type);
1270 CMP_OUT (subtype);
1271 CMP_OUT (direction);
1246 1272
1247 CMP_OUT (name); 1273 CMP_OUT (name);
1248 CMP_OUT (name_pl); 1274 CMP_OUT (name_pl);
1249 CMP_OUT (custom_name); 1275
1276 CMP_OUT (speed);
1277 CMP_OUT (speed_left);
1278
1250 CMP_OUT (title); 1279 CMP_OUT (title);
1251 CMP_OUT (race); 1280 CMP_OUT (race);
1252 CMP_OUT (slaying); 1281 CMP_OUT (slaying);
1282 CMP_OUT (skill);
1253 1283
1254 if (op->msg != tmp->msg) 1284 CMP_OUT (tag);
1255 f.put (KW_msg, KW_endmsg, op->msg); 1285 CMP_OUT (custom_name);
1256 if (op->lore != tmp->lore) 1286
1257 f.put (KW_lore, KW_endlore, op->lore); 1287 if (object *owner = op->owner)
1288 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1289
1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1258 1291
1259 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1260 1293
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1294 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1295 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1262 1296
1297 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300
1263 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != arch->animation_id)
1264 if (op->animation_id) 1302 if (op->has_anim ())
1303 f.put (KW_animation, op->anim ().name);
1304 else
1265 { 1305 {
1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1306 f.put (KW_animation, (const char *)0);
1267 1307 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1268 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1269 f.put (KW_is_animated, (sint32) 0);
1270 } 1308 }
1271 else
1272 f.put (KW_animation, (const char *) 0);
1273 1309
1274 CMP_OUT2 (str, stats.Str); 1310 CMP_OUT2 (str, stats.Str);
1275 CMP_OUT2 (dex, stats.Dex); 1311 CMP_OUT2 (dex, stats.Dex);
1276 CMP_OUT2 (con, stats.Con); 1312 CMP_OUT2 (con, stats.Con);
1277 CMP_OUT2 (wis, stats.Wis); 1313 CMP_OUT2 (wis, stats.Wis);
… …
1286 CMP_OUT2 (grace, stats.grace); 1322 CMP_OUT2 (grace, stats.grace);
1287 CMP_OUT2 (maxgrace, stats.maxgrace); 1323 CMP_OUT2 (maxgrace, stats.maxgrace);
1288 CMP_OUT2 (exp, stats.exp); 1324 CMP_OUT2 (exp, stats.exp);
1289 1325
1290 CMP_OUT (perm_exp); 1326 CMP_OUT (perm_exp);
1291 CMP_OUT (expmul); 1327 //CMP_OUT (expmul);
1292 1328
1293 CMP_OUT2 (food, stats.food); 1329 CMP_OUT2 (food, stats.food);
1294 CMP_OUT2 (dam, stats.dam); 1330 CMP_OUT2 (dam, stats.dam);
1295 CMP_OUT2 (luck, stats.luck); 1331 CMP_OUT2 (luck, stats.luck);
1296 CMP_OUT2 (wc, stats.wc); 1332 CMP_OUT2 (wc, stats.wc);
1297 CMP_OUT2 (ac, stats.ac); 1333 CMP_OUT2 (ac, stats.ac);
1298 1334
1299 CMP_OUT (x);
1300 CMP_OUT (y);
1301 CMP_OUT (speed);
1302 CMP_OUT (speed_left);
1303 CMP_OUT2 (move_state, move_status); 1335 CMP_OUT2 (move_state, move_status);
1304 CMP_OUT (attack_movement); 1336 CMP_OUT (attack_movement);
1305 CMP_OUT (nrof); 1337 CMP_OUT (nrof);
1306 CMP_OUT (level); 1338 CMP_OUT (level);
1307 CMP_OUT (direction);
1308 CMP_OUT (type);
1309 CMP_OUT (subtype);
1310 CMP_OUT (attacktype); 1339 CMP_OUT (attacktype);
1311 1340
1341 // using memcmp here seems to be a loss - us gcc vectorising?
1312 for (i = 0; i < NROFATTACKS; i++) 1342 for (int i = 0; i < NROFATTACKS; i++)
1313 if (op->resist[i] != tmp->resist[i]) 1343 if (expect_false (op->resist[i] != arch->resist[i]))
1314 f.put (resist_save[i], op->resist[i]); 1344 f.put (resist_save[i], op->resist[i]);
1315 1345
1316 CMP_OUT (path_attuned); 1346 CMP_OUT (path_attuned);
1317 CMP_OUT (path_repelled); 1347 CMP_OUT (path_repelled);
1318 CMP_OUT (path_denied); 1348 CMP_OUT (path_denied);
… …
1328 CMP_OUT (last_sp); 1358 CMP_OUT (last_sp);
1329 CMP_OUT (last_grace); 1359 CMP_OUT (last_grace);
1330 CMP_OUT (last_eat); 1360 CMP_OUT (last_eat);
1331 CMP_OUT (glow_radius); 1361 CMP_OUT (glow_radius);
1332 1362
1333 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1363 if (op->flag [FLAG_IS_LINKED])
1364 if (auto (ol, op->find_link ()))
1334 f.put (KW_connected, i); 1365 f.put (KW_connected, ol->id);
1335 1366
1336 CMP_OUT (randomitems); 1367 CMP_OUT (randomitems);
1337 CMP_OUT2 (container, weight_limit); 1368 CMP_OUT2 (container, weight_limit);
1338 1369
1339 CMP_OUT (run_away); 1370 CMP_OUT (run_away);
1340 CMP_OUT (pick_up); 1371 CMP_OUT (pick_up);
1341 CMP_OUT (will_apply); 1372 CMP_OUT (will_apply);
1342 CMP_OUT (smoothlevel); 1373 CMP_OUT (smoothlevel);
1343 CMP_OUT (weapontype); 1374 CMP_OUT (weapontype);
1344 CMP_OUT (tooltype);
1345 CMP_OUT (elevation);
1346 CMP_OUT (client_type); 1375 CMP_OUT (client_type);
1347 CMP_OUT (item_power); 1376 CMP_OUT (item_power);
1348 CMP_OUT (duration); 1377 CMP_OUT (duration);
1349 CMP_OUT (range); 1378 CMP_OUT (range);
1350 CMP_OUT (range_modifier); 1379 CMP_OUT (range_modifier);
… …
1358 CMP_OUT (move_on); 1387 CMP_OUT (move_on);
1359 CMP_OUT (move_off); 1388 CMP_OUT (move_off);
1360 CMP_OUT (move_slow); 1389 CMP_OUT (move_slow);
1361 CMP_OUT (move_slow_penalty); 1390 CMP_OUT (move_slow_penalty);
1362 1391
1363 if (op->flag != tmp->flag) 1392 // obj_original is the only commonly differing flag between archetype
1393 // and object, so special-case it here to be able to skip the loop
1394 object::flags_t diff = op->flags ^ arch->flags;
1395
1396 if (expect_true (diff.any ()))
1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 {
1400 // some other flags differ, too
1364 for (i = 0; i <= NUM_FLAGS; i++) 1401 for (int i = 0; i < NUM_FLAGS; i++)
1365 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1402 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1366 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1403 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1404 }
1405 else
1406 {
1407 // only obj_original differs
1408 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1409 }
1410 }
1367 1411
1368 // save body locations 1412 // save body locations. gcc's memcmp does an abysmal job when used
1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1413 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1370 if (op->slot[i].info != tmp->slot[i].info) 1414 if (expect_false (op->slot[i].info != arch->slot[i].info))
1371 f.put (body_locations[i].save_name, op->slot[i].info); 1415 f.put (body_locations[i].save_name, op->slot[i].info);
1372} 1416}
1373 1417
1374/* 1418/*
1375 * Dumps all variables in an object to a file. 1419 * Dumps all variables in an object to a file.
… …
1377 * the only place this is not set is when saving the player. 1421 * the only place this is not set is when saving the player.
1378 */ 1422 */
1379bool 1423bool
1380object::write (object_freezer &f) 1424object::write (object_freezer &f)
1381{ 1425{
1382 /* Even if the object does have an owner, it would seem that we should 1426 if (is_arch ())
1383 * still save it. 1427 {
1384 */ 1428 f.put (KW_object, arch->archname);
1385 if (owner) 1429 write_diff (f, this, archetype::empty);
1386 return true; 1430 }
1387 1431 else
1388 archetype *at = arch ? (archetype *)arch : empty_archetype; 1432 {
1389
1390 f.put (KW_arch, at->name); 1433 f.put (KW_arch, arch->archname);
1391 write_diff (f, this, &at->clone); 1434 write_diff (f, this, arch);
1435 }
1392 1436
1393 for (object *tmp = inv; tmp; tmp = tmp->below) 1437 for (object *tmp = inv; tmp; tmp = tmp->below)
1394 tmp->write (f); 1438 tmp->write (f);
1395 1439
1396 f.put (this); 1440 f.put (this);
… …
1401 1445
1402///////////////////////////////////////////////////////////////////////////// 1446/////////////////////////////////////////////////////////////////////////////
1403 1447
1404// generic resource file load, 1448// generic resource file load,
1405// currently supports: region, treasures, archetypes 1449// currently supports: region, treasures, archetypes
1450bool
1406bool load_resource_file (const char *filename) 1451load_resource_file_ (const char *filename)
1407{ 1452{
1408 object_thawer f (filename); 1453 object_thawer f (filename);
1409
1410 bool success = false;
1411 bool seen_arch = false;
1412
1413 f.next ();
1414 1454
1415 for (;;) 1455 for (;;)
1416 { 1456 {
1417 switch (f.kw) 1457 switch (f.kw)
1418 { 1458 {
1419 case KW_region: 1459 case KW_region:
1420 if (!region::read (f)) 1460 if (!region::read (f))
1421 goto finish; 1461 return false;
1422 break; 1462 break;
1423 1463
1424 case KW_treasure: 1464 case KW_treasure:
1425 case KW_treasureone: 1465 case KW_treasureone:
1426 if (!treasurelist::read (f)) 1466 if (!treasurelist::read (f))
1427 goto finish; 1467 return false;
1428 break; 1468 break;
1429 1469
1430 case KW_object: 1470 case KW_object:
1431 seen_arch = true;
1432 if (!archetype::read (f)) 1471 if (!archetype::read (f))
1433 goto finish; 1472 return false;
1434 break; 1473 break;
1435 1474
1436 case KW_EOF: 1475 case KW_EOF:
1437 success = true; 1476 return true;
1438 goto finish;
1439 1477
1440 default: 1478 default:
1441 if (!f.parse_error ("resource file")) 1479 if (!f.parse_error ("resource file"))
1442 goto finish; 1480 return false;
1443 1481
1444 f.next (); 1482 f.next ();
1445 break; 1483 break;
1446 } 1484 }
1447 } 1485 }
1448
1449finish:
1450 if (seen_arch)
1451 init_archetype_pointers ();
1452
1453 return success;
1454} 1486}
1455 1487

Diff Legend

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