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.73 by root, Sat Apr 28 17:51:57 2007 UTC vs.
Revision 1.181 by root, Wed Nov 14 20:34:58 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 18 *
19 * You should have received a copy of the Affero GNU General Public License
20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
22 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
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
29#include <global.h> 26#include <global.h>
30#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 RANGED:
272 case BOW:
273 case WAND:
274 case ROD:
275 case HORN:
276 if (slot [body_range].info != -1)
277 {
278 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1;
280 }
281 break;
282
283 case WEAPON:
284 if (slot [body_combat].info != -1)
285 {
286 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1;
288 }
289 break;
290
291 case SHIELD:
292 if (slot [body_shield].info != -1)
293 {
294 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1;
296 }
297 break;
298
299 case CONTAINER:
300 if (nrof)
301 {
302 LOG (llevError, "ITEMBUG: %s: stackable container\n", debug_desc ());
303 nrof = 0;
304 }
305 break;
306
307 case PLAYER:
308 if (slot [body_shield].info != 1)
309 {
310 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
311 slot [body_shield].info = 1;
312 }
313
314 if (slot [body_combat].info != 1)
315 {
316 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
317 slot [body_combat].info = 1;
318 }
319
320 if (slot [body_range].info != 1)
321 {
322 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
323 slot [body_range].info = 1;
324 }
325 break;
326 }
327
265 /* We do some specialised handling to handle legacy cases of name_pl. 328 /* 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 - 329 * 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 330 * 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 331 * 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 332 * 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. 333 * 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 334 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 335 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 336 */
274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 337 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
275 op->name_pl = 0; 338 name_pl = 0;
276 339
277 if (!op->name_pl) 340 if (!name_pl)
278 op->name_pl = op->name; 341 name_pl = name;
279 342
280 /* objects now have a materialname. try to patch it in */ 343 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 344 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
345 select_material (this, map ? map->difficulty : 5);
346
347 if (speed < 0.)
282 { 348 {
283 if (op->map != NULL) 349 flag [FLAG_RANDOM_SPEED] = true;
284 set_materialname (op, op->map->difficulty, NULL); 350 speed = -speed;
285 else 351 // speed_left will be randomised in instantiate () and copy_to ()
286 set_materialname (op, 5, NULL);
287 } 352 }
288 353
289 /* only do these when program is first run - a bit 354 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 355 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 356 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 357 * not in the ideal fashion.
293 */ 358 */
294 if ((op->type == WEAPON || op->type == BOW) && loading_arch) 359 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 360 {
296 if (!op->skill) 361 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 362 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) || 363 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 364 (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); 365 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
301 } 366 }
302 367
303 /* We changed last_heal to gen_sp_armour, which is what it 368 /* We changed last_heal to gen_sp_armour, which is what it
304 * really does for many objects. Need to catch any in maps 369 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 370 * that may have an old value.
306 */ 371 */
307 if (op->type == WEAPON 372 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 373 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 374 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 375 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 376 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 377 || type == BRACERS || type == CLOAK)
313 { 378 {
314 if (op->last_heal) 379 if (last_heal)
315 { 380 {
316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 381 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; 382 gen_sp_armour = last_heal;
318 op->last_heal = 0; 383 last_heal = 0;
319 } 384 }
320 385
321 int ip = calc_item_power (op, 0); 386 int ip = calc_item_power (this, 0);
322 387
323 /* Legacy objects from before item power was in the game */ 388 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 389 if (!item_power && ip)
325 { 390 {
326 if (ip > 3) 391 if (ip > 3)
327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 392 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
328 393
329 op->item_power = ip; 394 item_power = ip;
330 } 395 }
331 396
332 /* Check for possibly bogus values. Has to meet both these criteria - 397 /* 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 398 * 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. 399 * 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, 400 * similarly, it item_power is 0, the first check will always pass,
336 * but not the second one. 401 * but not the second one.
337 */ 402 */
403#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 404 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); 405 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
406#endif
340 } 407 }
341 408
342 /* Old spellcasting object - need to load in the appropiate object */ 409 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 410 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
411 if ((type == ROD
412 || type == WAND
413 || type == SCROLL
414 || type == HORN
415 || type == FIREWALL
344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 416 /* 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) 417 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
418 && !inv
419 && !loading_arch
420 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
421 // TODO: at least one watchout-comments is redundant - investigate/remove
346 { 422 {
423 // TODO: fix firewall object on map
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 424 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 425 * in that spell was stored in sp.
349 */ 426 */
427 //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]); 428 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 429 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 430 randomitems = 0;
353 } 431 }
354 432
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 433 /* 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) 434 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 435 {
436 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 437 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 438 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 439 randomitems = 0; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 440 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 441 value = arch->value * inv->value;
363 }
364
365 if (QUERY_FLAG (op, FLAG_MONSTER))
366 { 442 }
443
444 if (this->flag [FLAG_MONSTER])
445 {
367 if (op->stats.hp > op->stats.maxhp) 446 if (stats.hp > stats.maxhp)
368 { 447 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 448 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; 449 stats.maxhp = stats.hp;
371 } 450 }
372 451
373 /* The archs just need to be updated for this */ 452 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 453 if (move_type == 0)
375 op->move_type = MOVE_WALK; 454 move_type = MOVE_WALK;
376 }
377
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
379 { 455 }
456
457 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
380 /* Object will duplicate it's content as part of the 458 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 459 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 460 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 461 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 462 */
463 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 464 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 465
388 /* Handle player movers. We use move_type for player movers 466 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 467 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 468 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 469 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 470 * are doing, otherwise, set move_type based on maxhp value.
393 */ 471 */
394 if (op->type == PLAYERMOVER) 472 if (type == PLAYERMOVER)
395 { 473 {
396 if (!op->move_type) 474 if (!move_type)
397 { 475 {
398 if (op->stats.maxhp) 476 if (stats.maxhp)
399 { 477 {
400 op->move_type = MOVE_ALL; 478 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 479 stats.maxhp = 0;
402 } 480 }
403 else 481 else
404 op->move_type = MOVE_WALK; 482 move_type = MOVE_WALK;
405 } 483 }
406 } 484 }
407 485
486 // if the object has an animation, try to provide a default face
487 if (has_anim ())
488 {
489 if (anim_speed)
490 // if this item is time-animated, force the last frame
491 animate_object (this, 0);
492 else if (flag [FLAG_MONSTER])
493 // if it is a monster, set appropriate facing
494 animate_object (this, direction);
495 }
408} 496}
409 497
410static void 498static void
411set_move (MoveType &mt, const char *str) 499set_move (MoveType &mt, object_thawer &f)
412{ 500{
413 static const struct flagstr { 501 static const struct flagstr {
414 const char *name; 502 const char *name;
415 MoveType flags; 503 MoveType flags;
416 } move_flags[] = { 504 } move_flags[] = {
… …
422 { "boat" , MOVE_BOAT }, 510 { "boat" , MOVE_BOAT },
423 { "ship" , MOVE_SHIP }, 511 { "ship" , MOVE_SHIP },
424 { "all" , MOVE_ALL }, 512 { "all" , MOVE_ALL },
425 }; 513 };
426 514
427 if (!str) 515 const char *str = f.get_str ();
428 {
429 mt = 0;
430 return;
431 }
432 516
433 if (isdigit (*str)) 517 if (!*str || isdigit (*str))
434 { 518 {
435 mt = atoi (str); 519 mt = atoi (str);
436 return; 520 return;
437 } 521 }
438 522
439 mt = 0; 523 mt = 0;
440 524
441 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 525 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
442 { 526 {
443 bool negate = 0; 527 bool negate = 0;
444 528
445 if (*str == '-') 529 if (*str == '-')
446 { 530 {
447 negate = 1; 531 negate = 1;
448 str++; 532 str++;
449 } 533 }
450 534
451 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 535 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
452 { 536 {
453 if (!strcmp (f->name, str)) 537 if (!strcmp (f->name, str))
454 { 538 {
455 if (negate) 539 if (negate)
456 mt &= ~f->flags; 540 mt &= ~f->flags;
… …
459 543
460 goto next; 544 goto next;
461 } 545 }
462 } 546 }
463 547
464 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 548 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
465 549
466next: ; 550next: ;
467 } 551 }
468} 552}
469 553
470#define GET_FLAG(op,flag) \ 554//-GPL
471 if (f.get_sint32 ()) \ 555
472 SET_FLAG (op, flag); \ 556#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
473 else \
474 CLEAR_FLAG (op, flag) \
475 557
476bool 558bool
477object::parse_kv (object_thawer &f) 559object::parse_kv (object_thawer &f)
478{ 560{
479 object *op_inv = inv; 561 object *op_inv = inv;
… …
481 for (;;) 563 for (;;)
482 { 564 {
483 switch (f.kw) 565 switch (f.kw)
484 { 566 {
485 case KW_uuid: 567 case KW_uuid:
486 if (const char *s = f.get_str ()) 568 if (!uuid.parse (f.get_str ()))
487 { 569 {
488 unsigned int version; 570 f.parse_warn ("unparseable uuid");
489 unsigned long long seq; 571 uuid = UUID::gen ();
490
491 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
492 {
493 uuid.seq = seq;
494 break;
495 }
496 } 572 }
497
498 uuid = gen_uuid ();
499 break; 573 break;
500 574
501 case KW_oid: 575 case KW_oid:
502 f.get (this, f.get_sint32 ()); 576 f.get (this, f.get_sint32 ());
503 break; 577 break;
… …
509 583
510 case KW_attach: f.get_ornull (attach); break; 584 case KW_attach: f.get_ornull (attach); break;
511 case KW_skill: f.get_ornull (skill); break; 585 case KW_skill: f.get_ornull (skill); break;
512 case KW_race: f.get_ornull (race); break; 586 case KW_race: f.get_ornull (race); break;
513 case KW_slaying: f.get_ornull (slaying); break; 587 case KW_slaying: f.get_ornull (slaying); break;
588 case KW_tag: f.get_ornull (tag); break;
514 589
515 case KW_arch: 590 case KW_arch:
516 {
517 object *tmp = object::read (f); 591 if (object *tmp = object::read (f))
518 tmp->deactivate ();
519
520 { 592 {
593 tmp->deactivate ();
594
521 // was: insert_ob_in_ob (tmp, op); 595 // was: insert_ob_in_ob (tmp, op);
522 // but manually adding it can improve map loading times a lot 596 // but manually adding it can improve map loading times a lot
523 // also, appending instead of prepending keeps the 597 // also, appending instead of prepending keeps the
524 // save ordering the same between repeated load/saves. 598 // save ordering the same between repeated load/saves.
525 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 599 // and finally we do not want any funny effects
526 CLEAR_FLAG (tmp, FLAG_REMOVED); 600 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
601 tmp->clr_flag (FLAG_REMOVED);
527 602
528 if (!op_inv) 603 if (!op_inv)
529 { 604 {
530 inv = tmp; 605 inv = tmp;
531 tmp->above = 0; 606 tmp->above = 0;
… …
541 616
542 tmp->below = 0; 617 tmp->below = 0;
543 tmp->env = this; 618 tmp->env = this;
544 op_inv = tmp; 619 op_inv = tmp;
545 } 620 }
546 } 621 else
622 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
623
547 continue; 624 continue;
548 625
549 case KW_other_arch: 626 case KW_other_arch:
550 other_arch =
551 loading_arch 627 if (loading_arch == this)
552 ? archetype::get (f.get_str ()) 628 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
629 else
630 {
553 : archetype::find (f.get_str ()); 631 other_arch = archetype::find (f.get_str ());
554 632
555 if (!other_arch) 633 if (!other_arch)
556 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 634 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
635 }
636 break;
637
638 case KW_owner:
639 f.delayed_deref (this, owner, f.get_str ());
557 break; 640 break;
558 641
559 case KW_animation: 642 case KW_animation:
560 { 643 {
561 CLEAR_FLAG (this, FLAG_ANIMATE); 644 clr_flag (FLAG_ANIMATE);
562 animation_id = 0; 645 animation_id = 0;
563 646
564 const char *str = f.get_str (); 647 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
565 if (str && (animation_id = find_animation (str))) 648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
566 SET_FLAG (this, FLAG_ANIMATE);
567 } 649 }
568 break; 650 break;
569 651
570 case KW_last_heal: f.get (last_heal); break; 652 case KW_last_heal: f.get (last_heal); break;
571 case KW_last_sp: f.get (last_sp); break; 653 case KW_last_sp: f.get (last_sp); break;
572 case KW_last_grace: f.get (last_grace); break; 654 case KW_last_grace: f.get (last_grace); break;
573 case KW_last_eat: f.get (last_eat); break; 655 case KW_last_eat: f.get (last_eat); break;
656 case KW_sl:
574 case KW_speed_left: f.get (speed_left); break; 657 case KW_speed_left: f.get (speed_left); break;
575 658
576 case KW_speed: 659 case KW_speed:
577 f.get (speed); 660 f.get (speed);
578 661
… …
587 move_slow |= MOVE_WALK; 670 move_slow |= MOVE_WALK;
588 f.get (move_slow_penalty); 671 f.get (move_slow_penalty);
589 break; 672 break;
590 673
591 case KW_face: 674 case KW_face:
675 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
676 break;
677
678 case KW_sound:
679 if (f.has_value ())
680 {
592 face = face_find (f.get_str ()); 681 sound = sound_find (f.get_str ());
682 if (!sound)
683 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
684 }
685 else
686 sound = 0;
687 break;
688
689 case KW_sound_destroy:
690 if (f.has_value ())
691 {
692 sound_destroy = sound_find (f.get_str ());
693 if (!sound_destroy)
694 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
695 }
696 else
697 sound_destroy = 0;
593 break; 698 break;
594 699
595 case KW_x: f.get (x); break; 700 case KW_x: f.get (x); break;
596 case KW_y: f.get (y); break; 701 case KW_y: f.get (y); break;
597 702
… …
638 case KW_invisible: f.get (invisible); break; 743 case KW_invisible: f.get (invisible); break;
639 case KW_magic: f.get (magic); break; 744 case KW_magic: f.get (magic); break;
640 case KW_state: f.get (state); break; 745 case KW_state: f.get (state); break;
641 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 746 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
642 case KW_material: f.get (materials); break; //TODO: nuke 747 case KW_material: f.get (materials); break; //TODO: nuke
643 case KW_materialname: f.get (materialname); break; 748 case KW_materialname: f.get (material); break;
644 749
645 /* These are the new values */ 750 /* These are the new values */
646 case KW_move_block: set_move (move_block, f.get_str ()); break; 751 case KW_move_block: set_move (move_block, f); break;
647 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 752 case KW_move_allow: set_move (move_allow, f); break;
648 case KW_move_type: set_move (move_type, f.get_str ()); break; 753 case KW_move_type: set_move (move_type , f); break;
649 case KW_move_on: set_move (move_on, f.get_str ()); break; 754 case KW_move_on: set_move (move_on , f); break;
650 case KW_move_off: set_move (move_off, f.get_str ()); break; 755 case KW_move_off: set_move (move_off , f); break;
651 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 756 case KW_move_slow: set_move (move_slow , f); break;
652
653 /* These are all legacy - any new objects should use the move_ .. values */
654 case KW_no_pass:
655 {
656 if (f.get_sint32 ())
657 move_block = MOVE_ALL;
658 else
659 move_block = 0;
660 }
661
662 break;
663
664 /* These are all legacy - any new objects should use the move_ .. values */
665 case KW_walk_on:
666 {
667 if (f.get_sint32 ())
668 move_on |= MOVE_WALK;
669 else
670 move_on &= ~MOVE_WALK;
671 }
672
673 break;
674
675 /* These are all legacy - any new objects should use the move_ .. values */
676 case KW_walk_off:
677 {
678 if (f.get_sint32 ())
679 move_off |= MOVE_WALK;
680 else
681 move_off &= ~MOVE_WALK;
682 }
683 break;
684
685 /* These are all legacy - any new objects should use the move_ .. values */
686 case KW_fly_on:
687 {
688 if (f.get_sint32 ())
689 move_on |= MOVE_FLY_LOW;
690 else
691 move_on &= ~MOVE_FLY_LOW;
692 }
693 break;
694
695 /* These are all legacy - any new objects should use the move_ .. values */
696 case KW_fly_off:
697 {
698 if (f.get_sint32 ())
699 move_off |= MOVE_FLY_LOW;
700 else
701 move_off &= ~MOVE_FLY_LOW;
702 }
703 break;
704 757
705 //TODO: remove these after converting archetypes 758 //TODO: remove these after converting archetypes
706 case KW_can_use_wand: 759 case KW_can_use_wand:
707 GET_FLAG (this, FLAG_USE_RANGE); 760 GET_FLAG (this, FLAG_USE_RANGE);
708 break; 761 break;
709 762
710 /* These are all legacy - any new objects should use the move_ .. values */
711 case KW_flying:
712 {
713 if (f.get_sint32 ())
714 move_type |= MOVE_FLY_LOW;
715 else
716 move_type &= ~MOVE_FLY_LOW;
717 }
718 break;
719
720
721 case KW_identified: 763 case KW_identified:
722 GET_FLAG (this, FLAG_IDENTIFIED); 764 GET_FLAG (this, FLAG_IDENTIFIED);
723 //TODO: move to check_object or so 765 //TODO: move to check_object or so
724 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 766 if (this->flag [FLAG_IDENTIFIED])
725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 767 this->clr_flag (FLAG_KNOWN_MAGICAL);
726 768
727 break;
728
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; 769 break;
744 770
745 case KW_friendly: 771 case KW_friendly:
746 if (f.get_sint32 ()) 772 if (f.get_bool ())
747 if (type != PLAYER) 773 if (type != PLAYER)
748 add_friendly_object (this); 774 add_friendly_object (this);
749 775
750 break; 776 break;
751 777
… …
764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 790 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; 791 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 792 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 793 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 794 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
795 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 796 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 797 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 798 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 799 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 800 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
774 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 801 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
775 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 802 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
776 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 803 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
804 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
777 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 805 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
778 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 806 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
779 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 807 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 810 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 811 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 812 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;
787 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 813 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 814 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 815 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; 816 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
791 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 817 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 861 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 862 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; 863 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
838 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 864 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
839 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 865 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
866 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
867 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
840 868
841 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 869 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
842 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 870 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
843 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 871 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
844 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 872 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
874 case KW_anim_speed: f.get (anim_speed); break; 902 case KW_anim_speed: f.get (anim_speed); break;
875 case KW_container: f.get (weight_limit); break; 903 case KW_container: f.get (weight_limit); break;
876 case KW_will_apply: f.get (will_apply); break; 904 case KW_will_apply: f.get (will_apply); break;
877 case KW_attack_movement: f.get (attack_movement); break; 905 case KW_attack_movement: f.get (attack_movement); break;
878 case KW_move_state: f.get (move_status); break; 906 case KW_move_state: f.get (move_status); break;
879 case KW_expmul: f.get (expmul); break; 907 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
880 case KW_glow_radius: f.get (glow_radius); break; 908 case KW_glow_radius: f.get (glow_radius); break;
881 case KW_weapontype: f.get (weapontype); break; 909 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; 910 case KW_casting_time: f.get (casting_time); break;
911
912 // elevation is deprecated
884 case KW_elevation: f.get (elevation); break; 913 case KW_elevation: break;
914
885 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 915 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
886 case KW_client_type: f.get (client_type); break; 916 case KW_client_type: f.get (client_type); break;
887 case KW_duration: f.get (duration); break; 917 case KW_duration: f.get (duration); break;
888 case KW_range: f.get (range); break; 918 case KW_range: f.get (range); break;
889 case KW_range_modifier: f.get (range_modifier); break; 919 case KW_range_modifier: f.get (range_modifier); break;
890 case KW_dam_modifier: f.get (dam_modifier); break; 920 case KW_dam_modifier: f.get (dam_modifier); break;
891 case KW_duration_modifier: f.get (duration_modifier); break; 921 case KW_duration_modifier: f.get (duration_modifier); break;
892 922
893 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 923 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
894 //TODO: parse from other include files 924 //TODO: parse from other include files
895 case KW_body_range: f.get (body_info[0]); break; 925 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
896 case KW_body_arm: f.get (body_info[1]); break; 926 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
897 case KW_body_torso: f.get (body_info[2]); break; 927 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
898 case KW_body_head: f.get (body_info[3]); break; 928 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
899 case KW_body_neck: f.get (body_info[4]); break; 929 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
900 case KW_body_skill: f.get (body_info[5]); break; 930 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
901 case KW_body_finger: f.get (body_info[6]); break; 931 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
902 case KW_body_shoulder: f.get (body_info[7]); break; 932 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
903 case KW_body_foot: f.get (body_info[8]); break; 933 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
904 case KW_body_hand: f.get (body_info[9]); break; 934 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
905 case KW_body_wrist: f.get (body_info[10]); break; 935 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
906 case KW_body_waist: f.get (body_info[11]); break; 936 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
937 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
938 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
907 case KW_can_apply: 939 case KW_can_apply:
908 break; 940 break;
909 941
910 case KW_connected: 942 case KW_connected:
911 add_button_link (this, map, f.get_sint32 ()); 943 {
944 shstr connected;
945
946 f.get (connected);
947 add_link (map, connected);
948 }
912 break; 949 break;
913 950
914 case KW_randomitems: 951 case KW_randomitems:
915 if (f.get_str ()) 952 if (f.has_value ())
916 { 953 {
917 randomitems = 954 randomitems =
918 loading_arch 955 loading_arch
919 ? treasurelist::get (f.get_str ()) 956 ? treasurelist::get (f.get_str ())
920 : treasurelist::find (f.get_str ()); 957 : treasurelist::find (f.get_str ());
921 958
922 if (!randomitems) 959 if (!randomitems)
960 {
923 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 961 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
962 randomitems = treasurelist::get (shstr_none); // avoid crashes
963 }
924 } 964 }
965 else
966 randomitems = 0;
925 break; 967 break;
926 968
927 case KW_msg: 969 case KW_msg:
928 f.get_ml (KW_endmsg, msg); 970 f.get_ml (KW_endmsg, msg);
929 //TODO: allow longer messages
930 if (strlen (msg) >= HUGE_BUF)
931 {
932 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
933 msg = "ERROR, please report: string too long, winged.\n";
934 }
935 break; 971 break;
936 972
937 case KW_lore: 973 case KW_lore:
938 f.get_ml (KW_endlore, lore); 974 f.get_ml (KW_endlore, lore);
939 //TODO: allow longer messages
940 /* Just print a warning so we can be reasonably safe
941 * about not overflowing the buffer.
942 */
943 if (strlen (lore) > (HUGE_BUF / 2))
944 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
945 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
946 break; 975 break;
947 976
948 case KW_editable: 977 case KW_editable:
949 case KW_editor_folder: 978 case KW_editor_folder:
950 break; 979 break;
951 980
952 case KW_end: 981 case KW_end:
953 check_loaded_object (this);
954
955 if (!loading_arch) 982 if (!loading_arch)
956 instantiate (); 983 instantiate ();
957 984
958 f.next (); 985 f.next ();
959 return true; 986 return true;
960 987
961 case KW_ERROR: 988 case KW_ERROR:
962 set_ob_key_value (this, f.kw_str, f.value, true); 989 // we do not even try to find old values, duplicate keys stay duplicate
963 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 990 // the list gets reversed after loading
991 kv.add (shstr (f.kw_str), shstr (f.value));
964 break; 992 break;
965 993
966 default: 994 default:
967 if (!f.parse_error ("object", name)) 995 if (!f.parse_error ("object", name))
968 return false; 996 return false;
… …
980 1008
981 archetype *arch = archetype::find (f.get_str ()); 1009 archetype *arch = archetype::find (f.get_str ());
982 1010
983 if (!arch) 1011 if (!arch)
984 { 1012 {
985 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1013 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
986 arch = archetype::find ("earthwall"); 1014 arch = archetype::find (shstr_earthwall);
987 } 1015 }
988 1016
989 assert (arch); //D maybe use exception handling of sorts? 1017 assert (arch); //D maybe use exception handling of sorts?
990 1018
991 f.next (); 1019 f.next ();
992 1020
993 object *op = object::create (); 1021 object *op = arch->instance ();
994
995 op->map = map; 1022 op->map = map;
996 arch->clone.copy_to (op);
997 // copy_to activates, this should be fixed properly 1023 // instance() activates, this should be fixed properly
998 op->deactivate (); 1024 op->deactivate ();
999 1025
1000 if (!op->parse_kv (f)) 1026 if (!op->parse_kv (f))
1001 { 1027 {
1002 op->destroy (true); 1028 op->destroy ();
1003 return 0; 1029 return 0;
1004 } 1030 }
1005 1031
1032 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1033 // that greatly simplifies the loading code.
1034 op->kv.reverse ();
1035
1036 op->post_load_check ();
1006 return op; 1037 return op;
1007} 1038}
1008 1039
1009/* This takes a buffer, scans it for variables, and sets those variables 1040/* This takes a buffer, scans it for variables, and sets those variables
1010 * as appropriate in op. 1041 * as appropriate in op.
… …
1013 * override values and in c_wiz to mutate values. 1044 * override values and in c_wiz to mutate values.
1014 */ 1045 */
1015int 1046int
1016set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1017{ 1048{
1018 object_thawer f (buf, (AV *)0); 1049 object_thawer f (format ("%s\nend", buf), (AV *)0);
1019 1050
1020 f.next ();
1021 return op->parse_kv (f); 1051 return op->parse_kv (f);
1022} 1052}
1023 1053
1024/* This returns a string of the integer movement type */
1025#if 0
1026// unused function
1027static char *
1028get_string_move_type (MoveType mt)
1029{
1030 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1031 int i, all_count = 0, count;
1032
1033 strcpy (retbuf, "");
1034 strcpy (retbuf_all, " all");
1035
1036 /* Quick check, and probably fairly common */
1037 if (mt == MOVE_ALL)
1038 return retbuf_all + 1;
1039 if (mt == 0)
1040 {
1041 strcpy (retbuf, "0");
1042 return retbuf;
1043 }
1044
1045 /* We basically slide the bits down. Why look at MOVE_ALL?
1046 * because we may want to return a string like 'all -swim',
1047 * and if we just looked at mt, we couldn't get that.
1048 */
1049 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1050 {
1051 if (mt & (1 << count))
1052 {
1053 strcat (retbuf, " ");
1054 strcat (retbuf, move_name[count]);
1055 }
1056 else
1057 {
1058 strcat (retbuf_all, " -");
1059 strcat (retbuf_all, move_name[count]);
1060 all_count++;
1061 }
1062 }
1063 /* Basically, if there is a single negation, return it, eg
1064 * 'all -swim'. But more than that, just return the
1065 * enumerated values. It doesn't make sense to return
1066 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1067 */
1068 if (all_count <= 1)
1069 return retbuf_all + 1;
1070 else
1071 return retbuf + 1;
1072}
1073#endif
1074
1075// compare *op against *tmp and output differences 1054// compare *op against *arch and output differences
1076static void 1055static void
1077write_diff (object_freezer &f, object *op, object *tmp) 1056write_diff (object_freezer &f, object *op, object *arch)
1078{ 1057{
1079 static const keyword resist_save[NROFATTACKS] = { 1058 static const keyword resist_save[NROFATTACKS] = {
1080# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1059# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1081# include "attackinc.h" 1060# include "attackinc.h"
1082# undef def 1061# undef def
… …
1087 * the 15'th element of this array should match that name. 1066 * the 15'th element of this array should match that name.
1088 * If an entry is NULL, that is a flag not to loaded/saved. 1067 * If an entry is NULL, that is a flag not to loaded/saved.
1089 */ 1068 */
1090 static const keyword flag_names [NUM_FLAGS] = { 1069 static const keyword flag_names [NUM_FLAGS] = {
1091 KW_alive, 1070 KW_alive,
1092 KW_wiz,
1093 KW_NULL, 1071 KW_NULL,
1094 KW_NULL, 1072 KW_NULL,
1095 KW_was_wiz, 1073 KW_NULL,
1074 KW_NULL,
1096 KW_applied, 1075 KW_applied,
1097 KW_unpaid, 1076 KW_unpaid,
1098 KW_can_use_shield, 1077 KW_can_use_shield,
1099 KW_no_pick, 1078 KW_no_pick,
1100 KW_NULL, // walk_on 1079 KW_is_transparent_floor,
1080 /* 10 */
1101 KW_NULL, // no_pass 1081 KW_NULL, // no_pass
1102 /* 10 */
1103 KW_is_animated, 1082 KW_is_animated,
1104 KW_NULL, // slow_move 1083 KW_NULL, // slow_move
1105 KW_NULL, // flying 1084 KW_NULL, // flying
1106 KW_monster, 1085 KW_monster,
1107 KW_friendly, 1086 KW_friendly,
1108 KW_generator, 1087 KW_generator,
1109 KW_is_thrown, 1088 KW_is_thrown,
1110 KW_auto_apply, 1089 KW_auto_apply,
1111 KW_treasure_env, 1090 KW_treasure_env,
1091 /* 20 */
1112 KW_player_sold, 1092 KW_player_sold,
1113 /* 20 */
1114 KW_see_invisible, 1093 KW_see_invisible,
1115 KW_can_roll, 1094 KW_can_roll,
1116 KW_overlay_floor, 1095 KW_overlay_floor,
1117 KW_is_turnable, 1096 KW_is_turnable,
1118 KW_NULL, // walk_off 1097 KW_NULL, // walk_off
1119 KW_NULL, // fly_on 1098 KW_NULL, // fly_on
1120 KW_NULL, // fly_off 1099 KW_NULL, // fly_off
1121 KW_is_used_up, 1100 KW_is_used_up,
1122 KW_identified, 1101 KW_identified,
1102 /* 30 */
1123 KW_reflecting, 1103 KW_reflecting,
1124 /* 30 */
1125 KW_changing, 1104 KW_changing,
1126 KW_splitting, 1105 KW_splitting,
1127 KW_hitback, 1106 KW_hitback,
1128 KW_startequip, 1107 KW_startequip,
1129 KW_blocksview, 1108 KW_blocksview,
1130 KW_undead, 1109 KW_undead,
1131 KW_scared, 1110 KW_scared,
1132 KW_unaggressive, 1111 KW_unaggressive,
1133 KW_reflect_missile, 1112 KW_reflect_missile,
1113 /* 40 */
1134 KW_reflect_spell, 1114 KW_reflect_spell,
1135 /* 40 */
1136 KW_no_magic, 1115 KW_no_magic,
1137 KW_no_fix_player, 1116 KW_NULL,
1138 KW_is_lightable, 1117 KW_is_lightable,
1139 KW_tear_down, 1118 KW_tear_down,
1140 KW_run_away, 1119 KW_run_away,
1141 KW_NULL, // pass_thru 1120 KW_NULL, // pass_thru
1142 KW_NULL, // an_pass_thru 1121 KW_NULL, // an_pass_thru
1143 KW_pick_up, 1122 KW_pick_up,
1144 KW_unique, 1123 KW_unique,
1124 /* 50 */
1145 KW_no_drop, 1125 KW_no_drop,
1146 /* 50 */
1147 KW_NULL, // wizcast 1126 KW_NULL, // wizcast
1148 KW_can_cast_spell, 1127 KW_can_cast_spell,
1149 KW_can_use_scroll, 1128 KW_can_use_scroll,
1150 KW_can_use_range, 1129 KW_can_use_range,
1151 KW_can_use_bow, 1130 KW_can_use_bow,
1152 KW_can_use_armour, 1131 KW_can_use_armour,
1153 KW_can_use_weapon, 1132 KW_can_use_weapon,
1154 KW_can_use_ring, 1133 KW_can_use_ring,
1155 KW_has_ready_range, 1134 KW_has_ready_range,
1135 /* 60 */
1156 KW_has_ready_bow, 1136 KW_has_ready_bow,
1157 /* 60 */
1158 KW_xrays, 1137 KW_xrays,
1159 KW_NULL, 1138 KW_NULL,
1160 KW_is_floor, 1139 KW_is_floor,
1161 KW_lifesave, 1140 KW_lifesave,
1162 KW_no_strength, 1141 KW_no_strength,
1163 KW_sleep, 1142 KW_sleep,
1164 KW_stand_still, 1143 KW_stand_still,
1165 KW_random_move, 1144 KW_random_move,
1166 KW_only_attack, 1145 KW_only_attack,
1146 /* 70 */
1167 KW_confused, 1147 KW_confused,
1168 /* 70 */
1169 KW_stealth, 1148 KW_stealth,
1170 KW_NULL, 1149 KW_NULL,
1171 KW_NULL, 1150 KW_NULL,
1172 KW_cursed, 1151 KW_cursed,
1173 KW_damned, 1152 KW_damned,
1174 KW_see_anywhere, 1153 KW_see_anywhere,
1175 KW_known_magical, 1154 KW_known_magical,
1176 KW_known_cursed, 1155 KW_known_cursed,
1177 KW_can_use_skill, 1156 KW_can_use_skill,
1157 /* 80 */
1178 KW_been_applied, 1158 KW_been_applied,
1179 /* 80 */
1180 KW_has_ready_scroll, 1159 KW_has_ready_scroll,
1181 KW_can_use_rod, 1160 KW_can_use_rod,
1182 KW_precious, 1161 KW_precious,
1183 KW_can_use_horn, 1162 KW_can_use_horn,
1184 KW_make_invisible, 1163 KW_make_invisible,
1185 KW_inv_locked, 1164 KW_inv_locked,
1186 KW_is_wooded, 1165 KW_is_wooded,
1187 KW_is_hilly, 1166 KW_is_hilly,
1188 KW_has_ready_skill, 1167 KW_has_ready_skill,
1168 /* 90 */
1189 KW_has_ready_weapon, 1169 KW_has_ready_weapon,
1190 /* 90 */
1191 KW_no_skill_ident, 1170 KW_no_skill_ident,
1192 KW_is_blind, 1171 KW_is_blind,
1193 KW_can_see_in_dark, 1172 KW_can_see_in_dark,
1194 KW_is_cauldron, 1173 KW_is_cauldron,
1195 KW_NULL, 1174 KW_NULL,
1196 KW_no_steal, 1175 KW_no_steal,
1197 KW_one_hit, 1176 KW_one_hit,
1198 KW_NULL, 1177 KW_NULL,
1199 KW_berserk, 1178 KW_berserk,
1179 /* 100 */
1200 KW_neutral, 1180 KW_neutral,
1201 /* 100 */
1202 KW_no_attack, 1181 KW_no_attack,
1203 KW_no_damage, 1182 KW_no_damage,
1204 KW_obj_original, 1183 KW_obj_original,
1205 KW_NULL, 1184 KW_random_speed,
1206 KW_activate_on_push, 1185 KW_activate_on_push,
1207 KW_activate_on_release, 1186 KW_activate_on_release,
1208 KW_is_water, 1187 KW_is_water,
1209 KW_use_content_on_gen, 1188 KW_use_content_on_gen,
1210 KW_NULL, 1189 KW_NULL,
1190 /* 110 */
1211 KW_is_buildable, 1191 KW_is_buildable,
1212 /* 110 */
1213 KW_destroy_on_death, 1192 KW_destroy_on_death,
1214 KW_NULL, 1193 KW_NULL,
1215 }; 1194 };
1216 1195
1217 int i; 1196 // obj_original is the only commonly differing flag between archetype
1197 // and object, so special-case it here to be able to skip the loop
1198 static const struct flagmask : object::flags_t
1199 {
1200 flagmask ()
1201 {
1202 for (int i = 0; i < NUM_FLAGS; i++)
1203 if (flag_names [i])
1204 set (i);
1205 }
1206 } flagmask;
1218 1207
1219 /* This saves the key/value lists. We do it first so that any 1208 /* This saves the key/value lists. We do it first so that any
1220 * keys that match field names will be overwritten by the loader. 1209 * keys that match field names will be overwritten by the loader.
1221 */ 1210 */
1222 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1211 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1223 { 1212 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1224 /* Find the field in the opposing member. */ 1213 f.put (kv->key, kv->value);
1225 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1226 1214
1227 /* If there's no partnering field, or it's got a different value, save our field. */ 1215 if (op->uuid)
1228 if (!arch_field || my_field->value != arch_field->value)
1229 f.put (my_field->key, my_field->value);
1230 } 1216 {
1217 // highly optimised - this is often 25% of all data written
1218 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1219 char *ptr = cur;
1231 1220
1232 /* We don't need to worry about the arch's extra fields - they 1221 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1233 * will get taken care of the copy_to method. 1222 ptr += sizeof ("uuid ") - 1;
1234 */ 1223 ptr = op->uuid.append (ptr);
1224 *ptr++ = '\n';
1235 1225
1236 { 1226 f.alloc (ptr - cur);
1237 char uids[64];
1238 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1239 f.put (KW_uuid, (const char *)uids);
1240 } 1227 }
1241 1228
1242#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1229#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1243#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1230#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1231
1232 CMP_OUT (x);
1233 CMP_OUT (y);
1234
1235 CMP_OUT (type);
1236 CMP_OUT (subtype);
1237 CMP_OUT (direction);
1244 1238
1245 CMP_OUT (name); 1239 CMP_OUT (name);
1246 CMP_OUT (name_pl); 1240 CMP_OUT (name_pl);
1247 CMP_OUT (custom_name); 1241 CMP_OUT (speed);
1242
1243 // speed_left is a major time-burner, and has good locality, so
1244 // we use a simple lookup-cache to avoid the very slow printf.
1245 if (op->speed_left != arch->speed_left)
1246 {
1247 static double last_speed_left = 0.;
1248 static char last_speed_left_str [256] = "sl 0\n";
1249 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1250
1251 if (last_speed_left != op->speed_left)
1252 {
1253 last_speed_left = op->speed_left;
1254 // .7g loses precision even for float, but gives nice round numbers and smaller files
1255 // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
1256 // (printf is typically very slow)
1257 last_speed_left_len = sizeof ("sl ") - 1
1258 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1259 }
1260
1261 f.add (last_speed_left_str, last_speed_left_len);
1262 }
1263
1248 CMP_OUT (title); 1264 CMP_OUT (title);
1249 CMP_OUT (race); 1265 CMP_OUT (race);
1250 CMP_OUT (slaying); 1266 CMP_OUT (slaying);
1267 CMP_OUT (skill);
1251 1268
1252 if (op->msg != tmp->msg) 1269 CMP_OUT (tag);
1253 f.put (KW_msg, KW_endmsg, op->msg); 1270 CMP_OUT (custom_name);
1254 if (op->lore != tmp->lore) 1271
1255 f.put (KW_lore, KW_endlore, op->lore); 1272 if (object *owner = op->owner)
1273 if (const char *ref = owner->ref ())
1274 f.put (KW(owner), ref);
1275
1276 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1256 1277
1257 CMP_OUT (other_arch); 1278 CMP_OUT (other_arch);
1258 1279
1259 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1280 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1281 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1260 1282
1283 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1284 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1285 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1286
1261 if (op->animation_id != tmp->animation_id) 1287 if (op->animation_id != arch->animation_id)
1262 if (op->animation_id) 1288 if (op->has_anim ())
1289 f.put (KW(animation), op->anim ().name);
1290 else
1263 { 1291 {
1264 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1292 f.put (KW(animation));
1265 1293 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1266 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1267 f.put (KW_is_animated, (sint32) 0);
1268 } 1294 }
1269 else
1270 f.put (KW_animation, (const char *) 0);
1271 1295
1272 CMP_OUT2 (str, stats.Str); 1296 CMP_OUT2 (str, stats.Str);
1273 CMP_OUT2 (dex, stats.Dex); 1297 CMP_OUT2 (dex, stats.Dex);
1274 CMP_OUT2 (con, stats.Con); 1298 CMP_OUT2 (con, stats.Con);
1275 CMP_OUT2 (wis, stats.Wis); 1299 CMP_OUT2 (wis, stats.Wis);
… …
1284 CMP_OUT2 (grace, stats.grace); 1308 CMP_OUT2 (grace, stats.grace);
1285 CMP_OUT2 (maxgrace, stats.maxgrace); 1309 CMP_OUT2 (maxgrace, stats.maxgrace);
1286 CMP_OUT2 (exp, stats.exp); 1310 CMP_OUT2 (exp, stats.exp);
1287 1311
1288 CMP_OUT (perm_exp); 1312 CMP_OUT (perm_exp);
1289 CMP_OUT (expmul); 1313 //CMP_OUT (expmul);
1290 1314
1291 CMP_OUT2 (food, stats.food); 1315 CMP_OUT2 (food, stats.food);
1292 CMP_OUT2 (dam, stats.dam); 1316 CMP_OUT2 (dam, stats.dam);
1293 CMP_OUT2 (luck, stats.luck); 1317 CMP_OUT2 (luck, stats.luck);
1294 CMP_OUT2 (wc, stats.wc); 1318 CMP_OUT2 (wc, stats.wc);
1295 CMP_OUT2 (ac, stats.ac); 1319 CMP_OUT2 (ac, stats.ac);
1296 1320
1297 CMP_OUT (x);
1298 CMP_OUT (y);
1299 CMP_OUT (speed);
1300 CMP_OUT (speed_left);
1301 CMP_OUT2 (move_state, move_status); 1321 CMP_OUT2 (move_state, move_status);
1302 CMP_OUT (attack_movement); 1322 CMP_OUT (attack_movement);
1303 CMP_OUT (nrof); 1323 CMP_OUT (nrof);
1304 CMP_OUT (level); 1324 CMP_OUT (level);
1305 CMP_OUT (direction);
1306 CMP_OUT (type);
1307 CMP_OUT (subtype);
1308 CMP_OUT (attacktype); 1325 CMP_OUT (attacktype);
1309 1326
1327 // using memcmp here seems to be a loss - is gcc vectorising?
1310 for (i = 0; i < NROFATTACKS; i++) 1328 for (int i = 0; i < NROFATTACKS; i++)
1311 if (op->resist[i] != tmp->resist[i]) 1329 if (expect_false (op->resist[i] != arch->resist[i]))
1312 f.put (resist_save[i], op->resist[i]); 1330 f.put (resist_save[i], op->resist[i]);
1313 1331
1314 CMP_OUT (path_attuned); 1332 CMP_OUT (path_attuned);
1315 CMP_OUT (path_repelled); 1333 CMP_OUT (path_repelled);
1316 CMP_OUT (path_denied); 1334 CMP_OUT (path_denied);
1335
1317 CMP_OUT2 (material, materials);//TODO: nuke 1336 CMP_OUT2 (material, materials);//TODO: nuke
1318 CMP_OUT (materialname); 1337 if (op->material != arch->material)
1338 f.put (KW(materialname), op->material->name);
1339
1319 CMP_OUT (value); 1340 CMP_OUT (value);
1320 CMP_OUT (carrying); 1341 CMP_OUT (carrying);
1321 CMP_OUT (weight); 1342 CMP_OUT (weight);
1322 CMP_OUT (invisible); 1343 CMP_OUT (invisible);
1323 CMP_OUT (state); 1344 CMP_OUT (state);
… …
1326 CMP_OUT (last_sp); 1347 CMP_OUT (last_sp);
1327 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1328 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1329 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1330 1351
1331 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1352 if (op->flag [FLAG_IS_LINKED])
1353 if (auto (ol, op->find_link ()))
1332 f.put (KW_connected, i); 1354 f.put (KW(connected), ol->id);
1333 1355
1334 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1357
1335 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
1336 1359
1337 CMP_OUT (run_away); 1360 CMP_OUT (run_away);
1338 CMP_OUT (pick_up); 1361 CMP_OUT (pick_up);
1339 CMP_OUT (will_apply); 1362 CMP_OUT (will_apply);
1340 CMP_OUT (smoothlevel); 1363 CMP_OUT (smoothlevel);
1341 CMP_OUT (weapontype); 1364 CMP_OUT (weapontype);
1342 CMP_OUT (tooltype);
1343 CMP_OUT (elevation);
1344 CMP_OUT (client_type); 1365 CMP_OUT (client_type);
1345 CMP_OUT (item_power); 1366 CMP_OUT (item_power);
1346 CMP_OUT (duration); 1367 CMP_OUT (duration);
1347 CMP_OUT (range); 1368 CMP_OUT (range);
1348 CMP_OUT (range_modifier); 1369 CMP_OUT (range_modifier);
… …
1356 CMP_OUT (move_on); 1377 CMP_OUT (move_on);
1357 CMP_OUT (move_off); 1378 CMP_OUT (move_off);
1358 CMP_OUT (move_slow); 1379 CMP_OUT (move_slow);
1359 CMP_OUT (move_slow_penalty); 1380 CMP_OUT (move_slow_penalty);
1360 1381
1361 if (op->flag != tmp->flag) 1382 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1383
1384#if stdcpp // we need gcc, sorry
1385 if (diff [FLAG_OBJ_ORIGINAL])
1386 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1387
1388 diff.reset (FLAG_OBJ_ORIGINAL);
1389
1390 // quickly test whether any other flags differ
1391 if (expect_true (diff.any ()))
1362 for (i = 0; i <= NUM_FLAGS; i++) 1392 for (int i = 0; i < NUM_FLAGS; i++)
1363 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1393 if (expect_false (diff [i]))
1364 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1394 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1395#else
1396 // use sgi extensions
1397 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1398 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1399#endif
1365 1400
1366 /* Save body locations */ 1401 // save body locations. gcc's memcmp does an abysmal job when used
1367 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1368 if (op->body_info[i] != tmp->body_info[i]) 1403 if (expect_false (op->slot[i].info != arch->slot[i].info))
1369 f.put (body_locations[i].save_name, op->body_info[i]); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1370} 1405}
1371 1406
1372/* 1407/*
1373 * Dumps all variables in an object to a file. 1408 * Dumps all variables in an object to a file.
1374 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1409 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1375 * the only place this is not set is when saving the player. 1410 * the only place this is not set is when saving the player.
1376 */ 1411 */
1377bool 1412bool
1378object::write (object_freezer &f) 1413object::write (object_freezer &f)
1379{ 1414{
1380 /* Even if the object does have an owner, it would seem that we should 1415 if (expect_false (is_arch ()))
1381 * still save it. 1416 {
1382 */ 1417 f.put (KW(object), arch->archname);
1383 if (owner) 1418 write_diff (f, this, archetype::empty);
1384 return true; 1419 }
1385 1420 else
1386 archetype *at = arch ? (archetype *)arch : empty_archetype; 1421 {
1387
1388 f.put (KW_arch, at->name); 1422 f.put (KW(arch), arch->archname);
1389 write_diff (f, this, &at->clone); 1423 write_diff (f, this, arch);
1424 }
1390 1425
1391 for (object *tmp = inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
1392 tmp->write (f); 1427 tmp->write (f);
1393 1428
1394 f.put (this); 1429 f.put (this);
1395 f.put (KW_end); 1430 f.put (KW(end));
1396 1431
1397 return true; 1432 return true;
1398} 1433}
1399 1434
1400///////////////////////////////////////////////////////////////////////////// 1435/////////////////////////////////////////////////////////////////////////////
1401 1436
1402// generic resource file load, 1437// generic resource file load,
1403// currently supports: region, treasures, archetypes 1438// currently supports: region, treasures, archetypes
1439bool
1404bool load_resource_file (const char *filename) 1440load_resource_file_ (const char *filename)
1405{ 1441{
1406 object_thawer f (filename); 1442 object_thawer f (filename);
1407 1443
1408 bool success = false;
1409 bool seen_arch = false;
1410
1411 f.next ();
1412
1413 for (;;) 1444 for (;;)
1414 { 1445 {
1446 coroapi::cede_to_tick ();
1447
1415 switch (f.kw) 1448 switch (f.kw)
1416 { 1449 {
1417 case KW_region: 1450 case KW_region:
1418 if (!region::read (f)) 1451 if (!region::read (f))
1419 goto finish; 1452 return false;
1420 break; 1453 break;
1421 1454
1422 case KW_treasure: 1455 case KW_treasure:
1423 case KW_treasureone: 1456 case KW_treasureone:
1424 if (!treasurelist::read (f)) 1457 if (!treasurelist::read (f))
1425 goto finish; 1458 return false;
1426 break; 1459 break;
1427 1460
1428 case KW_object: 1461 case KW_object:
1429 seen_arch = true;
1430 if (!archetype::read (f)) 1462 if (!archetype::read (f))
1431 goto finish; 1463 return false;
1432 break; 1464 break;
1433 1465
1434 case KW_EOF: 1466 case KW_EOF:
1435 success = true; 1467 return true;
1436 goto finish;
1437 1468
1438 default: 1469 default:
1439 if (!f.parse_error ("resource file")) 1470 if (!f.parse_error ("resource file"))
1440 goto finish; 1471 return false;
1472
1473 f.next ();
1474 break;
1441 } 1475 }
1442 } 1476 }
1443
1444finish:
1445 if (seen_arch)
1446 init_archetype_pointers ();
1447
1448 return success;
1449} 1477}
1450 1478

Diff Legend

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