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.33 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.184 by root, Sat Dec 1 20:22:12 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 (©) 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
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
6 8 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 12 * option) any later version.
11 13 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 17 * GNU General Public License for more details.
16 18 *
17 You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 20 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
20 22 *
21 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>
22*/ 24 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27
28 25
29#include <global.h> 26#include <global.h>
30#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33/* Maps the MOVE_* values to names */ 29/////////////////////////////////////////////////////////////////////////////
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 30
31extern archetype *loading_arch;
32
33//+GPL
35 34
36/* 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
37 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
38 * 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
39 * 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
… …
169 "spell_magic_drain", /* 122 */ 168 "spell_magic_drain", /* 122 */
170 "spell_counterspell", /* 123 */ 169 "spell_counterspell", /* 123 */
171 "spell_disarm", /* 124 */ 170 "spell_disarm", /* 124 */
172 "spell_cure_confusion", /* 125 */ 171 "spell_cure_confusion", /* 125 */
173 "spell_restoration", /* 126 */ 172 "spell_restoration", /* 126 */
174 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 173 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
175 "spell_counterwall", /* 128 */ 174 "spell_counterwall", /* 128 */
176 "spell_cause_light_wounds", /* 129 */ 175 "spell_cause_light_wounds", /* 129 */
177 "spell_cause_medium_wounds", /* 130 */ 176 "spell_cause_medium_wounds", /* 130 */
178 "spell_cause_heavy_wounds", /* 131 */ 177 "spell_cause_heavy_wounds", /* 131 */
179 "spell_charm_monsters", /* 132 */ 178 "spell_charm_monsters", /* 132 */
… …
251 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
252 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
253 NULL 252 NULL
254}; 253};
255 254
256extern int arch_init;
257
258/* 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
259 * 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
260 * 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
261 * 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.
262 */ 259 */
263static void 260void
264check_loaded_object (object *op) 261object::post_load_check ()
265{ 262{
266 int ip; 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 }
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 (nrof %d)\n", debug_desc (), (int)nrof);
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
268 /* We do some specialized handling to handle legacy cases of name_pl. 328 /* We do some specialised handling to handle legacy cases of name_pl.
269 * 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 -
270 * this isn't perfect (things won't be properly pluralized), but works to 330 * this isn't perfect (things won't be properly pluralised), but works to
271 * 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
272 * 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
273 * 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.
274 * Otherwise, what happens is that the the plural name will lose 334 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 335 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 336 */
277 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)
278 op->name_pl = NULL; 338 name_pl = 0;
279 339
280 if (!op->name_pl) 340 if (!name_pl)
281 op->name_pl = op->name; 341 name_pl = name;
282 342
283 /* objects now have a materialname. try to patch it in */ 343 /* objects now have a materialname. try to patch it in */
284 if (!(op->is_weapon () && op->level > 0)) 344 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
285 { 345 select_material (this, map ? map->difficulty : 5);
286 if (op->map != NULL) 346
287 set_materialname (op, op->map->difficulty, NULL); 347 if (speed < 0.)
288 else
289 set_materialname (op, 5, NULL);
290 } 348 {
349 flag [FLAG_RANDOM_SPEED] = true;
350 speed = -speed;
351 // speed_left will be randomised in instantiate () and copy_to ()
352 }
353
291 /* only do these when program is first run - a bit 354 /* only do these when program is first run - a bit
292 * excessive to do this at every run - most of this is 355 * excessive to do this at every run - most of this is
293 * really just to catch any errors - program will still run, but 356 * really just to catch any errors - program will still run, but
294 * not in the ideal fashion. 357 * not in the ideal fashion.
295 */ 358 */
296 if ((op->type == WEAPON || op->type == BOW) && arch_init) 359 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
297 { 360 {
298 if (!op->skill) 361 if (!skill)
299 {
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 362 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
301 } 363 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
302 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 364 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
303 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
304 {
305 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);
306 }
307 } 366 }
308 367
309 /* 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
310 * really does for many objects. Need to catch any in maps 369 * really does for many objects. Need to catch any in maps
311 * that may have an old value. 370 * that may have an old value.
312 */ 371 */
313 if ((op->type == WEAPON) || 372 if (type == WEAPON
314 (op->type == ARMOUR) || (op->type == HELMET) || 373 || type == ARMOUR || type == HELMET
315 (op->type == SHIELD) || (op->type == RING) || 374 || type == SHIELD || type == RING
316 (op->type == BOOTS) || (op->type == GLOVES) || 375 || type == BOOTS || type == GLOVES
317 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 376 || type == AMULET || type == GIRDLE
377 || type == BRACERS || type == CLOAK)
318 { 378 {
319 if (op->last_heal) 379 if (last_heal)
320 { 380 {
321 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 ());
322 op->gen_sp_armour = op->last_heal; 382 gen_sp_armour = last_heal;
323 op->last_heal = 0; 383 last_heal = 0;
324 } 384 }
325 if (editor) 385
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 386 int ip = calc_item_power (this, 0);
387
329 /* Legacy objects from before item power was in the game */ 388 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 389 if (!item_power && ip)
331 { 390 {
332 if (ip > 3) 391 if (ip > 3)
333 {
334 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);
335 } 393
336 op->item_power = ip; 394 item_power = ip;
337 } 395 }
396
338 /* Check for possibly bogus values. Has to meet both these criteria - 397 /* Check for possibly bogus values. Has to meet both these criteria -
339 * 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
340 * 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.
341 * 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,
342 * but not the second one. 401 * but not the second one.
343 */ 402 */
403#if 0 //TODO
344 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 404 if (ip > 2 * item_power && ip > (item_power + 3))
345 {
346 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);
347 } 406#endif
348
349 } 407 }
408
350 /* Old spellcasting object - need to load in the appropiate object */ 409 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
351 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
352 /* 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 */
353 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 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
354 { 422 {
355 object *tmp; 423 // TODO: fix firewall object on map
356
357 /* 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'
358 * in that spell was stored in sp. 425 * in that spell was stored in sp.
359 */ 426 */
427 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
360 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]);
361 insert_ob_in_ob (tmp, op); 429 insert_ob_in_ob (tmp, this);
362 op->randomitems = NULL; /* So another spell isn't created for this object */ 430 randomitems = 0;
363 } 431 }
432
364 /* 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 */
365
366 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 434 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
367 { 435 {
368 object *tmp; 436 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
369
370 tmp = get_archetype_by_object_name (op->slaying); 437 object *tmp = get_archetype_by_object_name (slaying);
371 insert_ob_in_ob (tmp, op); 438 insert_ob_in_ob (tmp, this);
372 op->randomitems = NULL; /* So another spell isn't created for this object */ 439 randomitems = 0; /* So another spell isn't created for this object */
373 /* without this, value is all screwed up */ 440 /* without this, value is all screwed up */
374 op->value = op->arch->clone.value * op->inv->value; 441 value = arch->value * inv->value;
375 }
376
377 if (QUERY_FLAG (op, FLAG_MONSTER))
378 { 442 }
443
444 if (this->flag [FLAG_MONSTER])
445 {
379 if (op->stats.hp > op->stats.maxhp) 446 if (stats.hp > stats.maxhp)
447 {
380 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);
449 stats.maxhp = stats.hp;
450 }
381 451
382 /* The archs just need to be updated for this */ 452 /* The archs just need to be updated for this */
383 if (op->move_type == 0) 453 if (move_type == 0)
384 op->move_type = MOVE_WALK; 454 move_type = MOVE_WALK;
385 }
386
387 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
388 { 455 }
456
457 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
389 /* Object will duplicate it's content as part of the 458 /* Object will duplicate it's content as part of the
390 * generation process. To do this, we must flag inventory 459 * generation process. To do this, we must flag inventory
391 * so it remains unevaluated concerning the randomitems and 460 * so it remains unevaluated concerning the randomitems and
392 * the living (a demonlord shouldn't cast from inside generator!) 461 * the living (a demonlord shouldn't cast from inside generator!)
393 */ 462 */
463 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
394 flag_inv (op, FLAG_IS_A_TEMPLATE); 464 flag_inv (this, FLAG_IS_A_TEMPLATE);
395 }
396 465
397 /* Handle player movers. We use move_type for player movers 466 /* Handle player movers. We use move_type for player movers
398 * because they operate on their own time (move_on 467 * because they operate on their own time (move_on
399 * would potentially cause them to be triggered when someone steps 468 * would potentially cause them to be triggered when someone steps
400 * 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
401 * are doing, otherwise, set move_type based on maxhp value. 470 * are doing, otherwise, set move_type based on maxhp value.
402 */ 471 */
403 if (op->type == PLAYERMOVER) 472 if (type == PLAYERMOVER)
404 { 473 {
405 if (!op->move_type) 474 if (!move_type)
406 { 475 {
407 if (op->stats.maxhp) 476 if (stats.maxhp)
408 { 477 {
409 op->move_type = MOVE_ALL; 478 move_type = MOVE_ALL;
410 op->stats.maxhp = 0; 479 stats.maxhp = 0;
411 } 480 }
412 else 481 else
482 move_type = MOVE_WALK;
483 }
484 }
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 }
496}
497
498static void
499set_move (MoveType &mt, object_thawer &f)
500{
501 static const struct flagstr {
502 const char *name;
503 MoveType flags;
504 } move_flags[] = {
505 { "walk" , MOVE_WALK },
506 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
507 { "fly_low" , MOVE_FLY_LOW },
508 { "fly_high", MOVE_FLY_HIGH },
509 { "swim" , MOVE_SWIM },
510 { "boat" , MOVE_BOAT },
511 { "ship" , MOVE_SHIP },
512 { "all" , MOVE_ALL },
513 };
514
515 const char *str = f.get_str ();
516
517 if (!*str || isdigit (*str))
518 {
519 mt = atoi (str);
520 return;
521 }
522
523 mt = 0;
524
525 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
526 {
527 bool negate = 0;
528
529 if (*str == '-')
530 {
531 negate = 1;
532 str++;
533 }
534
535 for (const flagstr *f = move_flags; f < move_flags + ecb_array_length (move_flags); ++f)
536 {
537 if (!strcmp (f->name, str))
413 { 538 {
414 op->move_type = MOVE_WALK; 539 if (negate)
540 mt &= ~f->flags;
541 else
542 mt |= f->flags;
543
544 goto next;
415 } 545 }
416 } 546 }
417 }
418 547
548 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
549
550next: ;
551 }
419} 552}
420 553
421static void 554//-GPL
422set_move (MoveType & mt, const char *str) 555
556#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
557
558bool
559object::parse_kv (object_thawer &f)
423{ 560{
424 if (!str) 561 object *op_inv = inv;
425 { 562
426 mt = 0; 563 for (;;)
427 return;
428 } 564 {
429 565 switch (f.kw)
430 if (isdigit (*str))
431 {
432 mt = atoi (str);
433 return;
434 }
435
436 mt = 0;
437
438 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
439 {
440 if (!strcasecmp (str, "all"))
441 mt |= MOVE_ALL;
442 else
443 { 566 {
444 int i, negate = 0; 567 case KW_uuid:
568 if (!uuid.parse (f.get_str ()))
569 {
570 f.parse_warn ("unparseable uuid");
571 uuid = UUID::gen ();
572 }
573 break;
445 574
446 if (*str == '-') 575 case KW_oid:
576 f.get (this, f.get_sint32 ());
577 break;
578
579 case KW_name: f.get (name); break;
580 case KW_name_pl: f.get (name_pl); break;
581 case KW_title: f.get (title); break;
582 case KW_custom_name: f.get (custom_name); break;
583
584 case KW_attach: f.get_ornull (attach); break;
585 case KW_skill: f.get_ornull (skill); break;
586 case KW_race: f.get_ornull (race); break;
587 case KW_slaying: f.get_ornull (slaying); break;
588 case KW_tag: f.get_ornull (tag); break;
589
590 case KW_arch:
591 if (object *tmp = object::read (f))
592 {
593 tmp->deactivate ();
594
595 // was: insert_ob_in_ob (tmp, op);
596 // but manually adding it can improve map loading times a lot
597 // also, appending instead of prepending keeps the
598 // save ordering the same between repeated load/saves.
599 // and finally we do not want any funny effects
600 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
601 tmp->clr_flag (FLAG_REMOVED);
602
603 if (!op_inv)
604 {
605 inv = tmp;
606 tmp->above = 0;
607 }
608 else
609 {
610 while (op_inv->below)
611 op_inv = op_inv->below;
612
613 op_inv->below = tmp;
614 tmp->above = op_inv;
615 }
616
617 tmp->below = 0;
618 tmp->env = this;
619 op_inv = tmp;
620 }
621 else
622 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
623
624 continue;
625
626 case KW_other_arch:
627 if (loading_arch == this)
628 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
629 else
630 {
631 other_arch = archetype::find (f.get_str ());
632
633 if (!other_arch)
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 ());
640 break;
641
642 case KW_animation:
447 { 643 {
644 clr_flag (FLAG_ANIMATE);
448 negate = 1; 645 animation_id = 0;
449 str++; 646
647 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
450 } 649 }
650 break;
451 651
452 for (i = 0; move_name[i]; i++) 652 case KW_last_heal: f.get (last_heal); break;
653 case KW_last_sp: f.get (last_sp); break;
654 case KW_last_grace: f.get (last_grace); break;
655 case KW_last_eat: f.get (last_eat); break;
656 case KW_sl:
657 case KW_speed_left: f.get (speed_left); break;
658
659 case KW_speed:
660 f.get (speed);
661
662 //TODO: maybe do in check_object
663 // removed check for style maps
664 if (speed < 0)
665 speed_left = speed_left - rndm ();
666
667 break;
668
669 case KW_slow_move:
670 move_slow |= MOVE_WALK;
671 f.get (move_slow_penalty);
672 break;
673
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 {
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;
698 break;
699
700 case KW_x: f.get (x); break;
701 case KW_y: f.get (y); break;
702
703 case KW_Str: // uppercase alias
704 case KW_str: f.get (stats.Str); break;
705 case KW_Dex: // uppercase alias
706 case KW_dex: f.get (stats.Dex); break;
707 case KW_Con: // uppercase alias
708 case KW_con: f.get (stats.Con); break;
709 case KW_Wis: // uppercase alias
710 case KW_wis: f.get (stats.Wis); break;
711 case KW_Cha: // uppercase alias
712 case KW_cha: f.get (stats.Cha); break;
713 case KW_Int: // uppercase alias
714 case KW_int: f.get (stats.Int); break;
715 case KW_Pow: // uppercase alias
716 case KW_pow: f.get (stats.Pow); break;
717
718 case KW_hp: f.get (stats.hp); break;
719 case KW_maxhp: f.get (stats.maxhp); break;
720 case KW_sp: f.get (stats.sp); break;
721 case KW_maxsp: f.get (stats.maxsp); break;
722 case KW_grace: f.get (stats.grace); break;
723 case KW_maxgrace: f.get (stats.maxgrace); break;
724
725 case KW_exp: f.get (stats.exp); break;
726 case KW_perm_exp: f.get (perm_exp); break;
727 case KW_food: f.get (stats.food); break;
728 case KW_dam: f.get (stats.dam); break;
729 case KW_wc: f.get (stats.wc); break;
730 case KW_ac: f.get (stats.ac); break;
731 case KW_nrof: f.get (nrof); break;
732 case KW_level: f.get (level); break;
733 case KW_direction: f.get (direction); break;
734 case KW_type: f.get (type); break;
735 case KW_subtype: f.get (subtype); break;
736 case KW_value: f.get (value); break;
737 case KW_weight: f.get (weight); break;
738 case KW_carrying: f.get (carrying); break;
739 case KW_attacktype: f.get (attacktype); break;
740 case KW_path_attuned: f.get (path_attuned); break;
741 case KW_path_repelled: f.get (path_repelled); break;
742 case KW_path_denied: f.get (path_denied); break;
743 case KW_invisible: f.get (invisible); break;
744 case KW_magic: f.get (magic); break;
745 case KW_state: f.get (state); break;
746 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
747 case KW_material: f.get (materials); break; //TODO: nuke
748 case KW_materialname: f.get (material); break;
749
750 /* These are the new values */
751 case KW_move_block: set_move (move_block, f); break;
752 case KW_move_allow: set_move (move_allow, f); break;
753 case KW_move_type: set_move (move_type , f); break;
754 case KW_move_on: set_move (move_on , f); break;
755 case KW_move_off: set_move (move_off , f); break;
756 case KW_move_slow: set_move (move_slow , f); break;
757
758 //TODO: remove these after converting archetypes
759 case KW_can_use_wand:
760 GET_FLAG (this, FLAG_USE_RANGE);
761 break;
762
763 case KW_identified:
764 GET_FLAG (this, FLAG_IDENTIFIED);
765 //TODO: move to check_object or so
766 if (this->flag [FLAG_IDENTIFIED])
767 this->clr_flag (FLAG_KNOWN_MAGICAL);
768
769 break;
770
771 case KW_friendly:
772 if (f.get_bool ())
773 if (type != PLAYER)
774 add_friendly_object (this);
775
776 break;
777
778 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
779 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
780 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
781 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
782 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
783 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
784 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
785 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
786 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
787 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
788 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
789 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
790 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
791 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
792 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
793 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
794 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
795 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
796 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
797 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
798 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
799 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
800 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
801 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
802 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); 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;
805 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
806 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
807 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
810 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
811 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
812 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
813 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
814 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
815 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
816 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
817 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
818 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
819 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
820 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
821 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
822 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
823 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
824 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
825 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
826 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
827 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
828 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
829 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
830 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
831 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
832 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
833 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
834 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
835 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
836 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
837 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
838 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
839 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
840 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
841 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
842 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
843 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
844 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
845 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
846 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
847 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
848 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
849 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
850 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
851 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
852 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
853 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
854 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
855 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
856 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
857 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
858 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
859 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
860 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
861 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
862 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
863 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
864 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); 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;
868
869 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
870 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
871 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
872 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
873 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
874 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
875 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
876 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
877 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
878 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
879 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
880 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
881 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
882 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
883 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
884 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
885 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
886 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
887 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
888 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
889 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
890 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
891 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
892 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
893 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
894 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
895 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
896
897 case KW_luck: f.get (stats.luck); break;
898 case KW_run_away: f.get (run_away); break;
899 case KW_pick_up: f.get (pick_up); break;
900 case KW_item_power: f.get (item_power); break;
901 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
902 case KW_anim_speed: f.get (anim_speed); break;
903 case KW_container: f.get (weight_limit); break;
904 case KW_will_apply: f.get (will_apply); break;
905 case KW_attack_movement: f.get (attack_movement); break;
906 case KW_move_state: f.get (move_status); break;
907 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
908 case KW_glow_radius: f.get (glow_radius); break;
909 case KW_weapontype: f.get (weapontype); break;
910 case KW_casting_time: f.get (casting_time); break;
911
912 // elevation is deprecated
913 case KW_elevation: break;
914
915 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
916 case KW_client_type: f.get (client_type); break;
917 case KW_duration: f.get (duration); break;
918 case KW_range: f.get (range); break;
919 case KW_range_modifier: f.get (range_modifier); break;
920 case KW_dam_modifier: f.get (dam_modifier); break;
921 case KW_duration_modifier: f.get (duration_modifier); break;
922
923 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
924 //TODO: parse from other include files
925 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
926 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
927 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
928 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
929 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
930 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
931 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
932 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
933 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
934 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
935 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); 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;
939 case KW_can_apply:
940 break;
941
942 case KW_connected:
453 { 943 {
454 if (!strcasecmp (move_name[i], str)) 944 shstr connected;
455 {
456 if (negate)
457 mt &= ~(1 << i);
458 else
459 mt |= (1 << i);
460 945
461 break; 946 f.get (connected);
462 } 947 add_link (map, connected);
463 } 948 }
464
465 if (!move_name[i])
466 { 949 break;
467 /* fly is a special case - covers both fly_low and
468 * fly_high - since it doesn't match to a specific
469 * single bit, have to special case it.
470 */
471 if (!strcasecmp (str, "flying"))
472 {
473 if (negate)
474 mt &= ~MOVE_FLYING;
475 else
476 mt |= MOVE_FLYING;
477 }
478 else
479 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
480 }
481 }
482 }
483}
484 950
485#define GET_FLAG(op,flag) \
486 if (thawer.get_sint32 ()) \
487 SET_FLAG (op, flag); \
488 else \
489 CLEAR_FLAG (op, flag) \
490
491int
492parse_object (object *op, object_thawer &thawer, int map_flags)
493{
494 bool ismore = 0;
495 object *op_inv = op->inv;
496
497 for (;;)
498 {
499 keyword kw = thawer.get_kv ();
500
501 switch (kw)
502 {
503 case KW_Object: // uppercase alias
504 case KW_object: 951 case KW_randomitems:
505 thawer.get (op->name); 952 if (f.has_value ())
506
507 if (op->arch)
508 op->arch->name = op->name;
509
510 break;
511
512 case KW_uuid:
513 if (const char *s = thawer.get_str ())
514 { 953 {
515 unsigned int version; 954 randomitems =
516 unsigned long long seq; 955 loading_arch
956 ? treasurelist::get (f.get_str ())
957 : treasurelist::find (f.get_str ());
517 958
518 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 959 if (!randomitems)
519 { 960 {
520 op->uuid.seq = seq; 961 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
521 break; 962 randomitems = treasurelist::get (shstr_none); // avoid crashes
522 } 963 }
523 } 964 }
524
525 op->uuid = gen_uuid ();
526 break;
527
528 case KW_oid:
529 thawer.get (op, thawer.get_sint32 ());
530 break;
531
532 case KW_name: thawer.get (op->name); break;
533 case KW_name_pl: thawer.get (op->name_pl); break;
534 case KW_title: thawer.get (op->title); break;
535 case KW_custom_name: thawer.get (op->custom_name); break;
536
537 case KW_attach: thawer.get_ornull (op->attach); break;
538 case KW_skill: thawer.get_ornull (op->skill); break;
539 case KW_race: thawer.get_ornull (op->race); break;
540 case KW_slaying: thawer.get_ornull (op->slaying); break;
541
542 case KW_arch:
543 {
544 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
546
547 if (op->arch)
548 {
549 /* If op->arch has been set, then this new object
550 * must be part of the inventory. So process
551 * appropriately.
552 */
553 archetype *arch = archetype::find (str);
554
555 object *tmp;
556
557 if (arch)
558 tmp = arch_to_object (arch);
559 else
560 {
561 tmp = object::create ();
562 /* record the name of the broken object */
563 tmp->name = str;
564 }
565
566 // decativate the object we, as we are still going
567 // to read the speed value. Objects should be activated
568 // when the map, object or player is completly loaded.
569 tmp->deactivate ();
570
571 parse_object (tmp, thawer, map_flags);
572
573 if (tmp->arch)
574 {
575 // was: insert_ob_in_ob (tmp, op);
576 // but manually adding it can improve map loading times a lot
577 // also, appending instead of prepending keeps the
578 // save ordering the same between repeated load/saves.
579 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
580 CLEAR_FLAG (tmp, FLAG_REMOVED);
581
582 if (!op_inv)
583 {
584 op->inv = tmp;
585 tmp->above = 0;
586 }
587 else
588 {
589 while (op_inv->below)
590 op_inv = op_inv->below;
591
592 op_inv->below = tmp;
593 tmp->above = op_inv;
594 }
595
596 tmp->below = 0;
597 tmp->env = op;
598 op_inv = tmp;
599 }
600 else
601 {
602 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
603 tmp->destroy ();
604 }
605 }
606 else
607 {
608 /* This is the actual archetype definition then */
609 op->arch = archetype::find (str);
610
611 if (op->arch)
612 {
613 op->arch->clone.copy_to (op);
614 // copy_to activates, this should be fixed properly
615 op->deactivate ();
616 }
617 else if (!arch_init)
618 /* record the name of the broken object */
619 op->name = str;
620 }
621 }
622 break;
623
624 case KW_other_arch:
625 op->other_arch = archetype::find (thawer.get_str ());
626 break;
627
628 case KW_animation:
629 {
630 const char *str = thawer.get_str ();
631
632 if (!str)
633 {
634 op->animation_id = 0;
635 CLEAR_FLAG (op, FLAG_ANIMATE);
636 }
637 else
638 {
639 op->animation_id = find_animation (str);
640 SET_FLAG (op, FLAG_ANIMATE);
641 }
642 }
643
644 break;
645
646 case KW_last_heal: thawer.get (op->last_heal); break;
647 case KW_last_sp: thawer.get (op->last_sp); break;
648 case KW_last_grace: thawer.get (op->last_grace); break;
649 case KW_last_eat: thawer.get (op->last_eat); break;
650 case KW_speed_left: thawer.get (op->speed_left); break;
651
652 case KW_speed:
653 thawer.get (op->speed);
654
655 //TODO: maybe do in check_object
656 // removed check for style maps
657 if (op->speed < 0)
658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
659
660 break;
661
662 case KW_slow_move:
663 op->move_slow |= MOVE_WALK;
664 thawer.get (op->move_slow_penalty);
665 break;
666
667 case KW_face:
668 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
669 break;
670
671 case KW_x: thawer.get (op->x); break;
672 case KW_y: thawer.get (op->y); break;
673
674 case KW_Str: // uppercase alias
675 case KW_str: thawer.get (op->stats.Str); break;
676 case KW_Dex: // uppercase alias
677 case KW_dex: thawer.get (op->stats.Dex); break;
678 case KW_Con: // uppercase alias
679 case KW_con: thawer.get (op->stats.Con); break;
680 case KW_Wis: // uppercase alias
681 case KW_wis: thawer.get (op->stats.Wis); break;
682 case KW_Cha: // uppercase alias
683 case KW_cha: thawer.get (op->stats.Cha); break;
684 case KW_Int: // uppercase alias
685 case KW_int: thawer.get (op->stats.Int); break;
686 case KW_Pow: // uppercase alias
687 case KW_pow: thawer.get (op->stats.Pow); break;
688
689 case KW_hp: thawer.get (op->stats.hp); break;
690 case KW_maxhp: thawer.get (op->stats.maxhp); break;
691 case KW_sp: thawer.get (op->stats.sp); break;
692 case KW_maxsp: thawer.get (op->stats.maxsp); break;
693 case KW_grace: thawer.get (op->stats.grace); break;
694 case KW_maxgrace: thawer.get (op->stats.maxgrace); break;
695
696 case KW_exp: thawer.get (op->stats.exp); break;
697 case KW_perm_exp: thawer.get (op->perm_exp); break;
698 case KW_food: thawer.get (op->stats.food); break;
699 case KW_dam: thawer.get (op->stats.dam); break;
700 case KW_wc: thawer.get (op->stats.wc); break;
701 case KW_ac: thawer.get (op->stats.ac); break;
702 case KW_nrof: thawer.get (op->nrof); break;
703 case KW_level: thawer.get (op->level); break;
704 case KW_direction: thawer.get (op->direction); break;
705 case KW_type: thawer.get (op->type); break;
706 case KW_subtype: thawer.get (op->subtype); break;
707 case KW_value: thawer.get (op->value); break;
708 case KW_weight: thawer.get (op->weight); break;
709 case KW_carrying: thawer.get (op->carrying); break;
710 case KW_attacktype: thawer.get (op->attacktype); break;
711 case KW_path_attuned: thawer.get (op->path_attuned); break;
712 case KW_path_repelled: thawer.get (op->path_repelled); break;
713 case KW_path_denied: thawer.get (op->path_denied); break;
714 case KW_invisible: thawer.get (op->invisible); break;
715 case KW_magic: thawer.get (op->magic); break;
716 case KW_state: thawer.get (op->state); break;
717 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
718 case KW_material: thawer.get (op->material); break;
719 case KW_materialname: thawer.get (op->materialname); break;
720
721 /* These are the new values */
722 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
723 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
724 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;
725 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;
726 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;
727 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;
728
729 /* These are all legacy - any new objects should use the move_ .. values */
730 case KW_no_pass:
731 {
732 if (thawer.get_sint32 ())
733 op->move_block = MOVE_ALL;
734 else
735 op->move_block = 0;
736 }
737
738 break;
739
740 /* These are all legacy - any new objects should use the move_ .. values */
741 case KW_walk_on:
742 {
743 if (thawer.get_sint32 ())
744 op->move_on |= MOVE_WALK;
745 else
746 op->move_on &= ~MOVE_WALK;
747 }
748
749 break;
750
751 /* These are all legacy - any new objects should use the move_ .. values */
752 case KW_walk_off:
753 {
754 if (thawer.get_sint32 ())
755 op->move_off |= MOVE_WALK;
756 else
757 op->move_off &= ~MOVE_WALK;
758 }
759 break;
760
761 /* These are all legacy - any new objects should use the move_ .. values */
762 case KW_fly_on:
763 {
764 if (thawer.get_sint32 ())
765 op->move_on |= MOVE_FLY_LOW;
766 else
767 op->move_on &= ~MOVE_FLY_LOW;
768 }
769 break;
770
771 /* These are all legacy - any new objects should use the move_ .. values */
772 case KW_fly_off:
773 {
774 if (thawer.get_sint32 ())
775 op->move_off |= MOVE_FLY_LOW;
776 else
777 op->move_off &= ~MOVE_FLY_LOW;
778 }
779 break;
780
781 //TODO: remove these after converting archetypes
782 case KW_can_use_wand:
783 GET_FLAG (op, FLAG_USE_RANGE);
784 break;
785
786 /* These are all legacy - any new objects should use the move_ .. values */
787 case KW_flying:
788 {
789 if (thawer.get_sint32 ())
790 op->move_type |= MOVE_FLY_LOW;
791 else
792 op->move_type &= ~MOVE_FLY_LOW;
793 }
794 break;
795
796
797 case KW_identified:
798 GET_FLAG (op, FLAG_IDENTIFIED);
799 //TODO: move to check_object or so
800 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
801 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
802
803 break;
804
805 case KW_wiz:
806 GET_FLAG (op, FLAG_WIZ);
807 //TODO: move to check_object
808 if (QUERY_FLAG (op, FLAG_WIZ))
809 {
810 SET_FLAG (op, FLAG_WAS_WIZ);
811 SET_FLAG (op, FLAG_WIZPASS);
812 SET_FLAG (op, FLAG_WIZCAST);
813 }
814 else 965 else
815 { 966 randomitems = 0;
816 CLEAR_FLAG (op, FLAG_WIZPASS);
817 CLEAR_FLAG (op, FLAG_WIZCAST);
818 }
819 break;
820
821 case KW_friendly:
822 GET_FLAG (op, FLAG_FRIENDLY);
823 //TODO: move to check_object or so
824 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
825 add_friendly_object (op);
826 break;
827
828 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
829 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
830 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
831 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
832 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
833 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
834 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
835 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
836 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
837 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
838 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
839 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
840 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
841 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
842 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
843 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
844 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
845 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
846 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
847 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
848 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
849 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
850 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
851 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
852 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
853 case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
854 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
855 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
856 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
857 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
858 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
859 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
860 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
861 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
862 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
863 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
864 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
865 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
866 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
867 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
868 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
869 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
870 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
871 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
872 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
873 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
874 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
875 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
876 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
877 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
878 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
879 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
880 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
881 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
882 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
883 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
884 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
885 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
886 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
887 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
888 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
889 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
890 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
891 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
892 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
893 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
894 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
895 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
896 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
897 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
898 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
899 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
900 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
901 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
902 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
903 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
904 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
905 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
906 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
907 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
908 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
909 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
910 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
911 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
912
913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
917 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
918 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
919 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
920 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
921 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
922 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
923 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
924 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
925 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
926 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
927 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
928 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
929 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
930 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
931 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
932 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
933 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
934 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
935 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
936 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
937 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
938 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
939 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
940
941 case KW_luck: thawer.get (op->stats.luck); break;
942 case KW_run_away: thawer.get (op->run_away); break;
943 case KW_pick_up: thawer.get (op->pick_up); break;
944 case KW_item_power: thawer.get (op->item_power); break;
945 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
946 case KW_anim_speed: thawer.get (op->anim_speed); break;
947 case KW_container: thawer.get (op->weight_limit); break;
948 case KW_will_apply: thawer.get (op->will_apply); break;
949 case KW_attack_movement: thawer.get (op->attack_movement); break;
950 case KW_move_state: thawer.get (op->move_status); break;
951 case KW_expmul: thawer.get (op->expmul); break;
952 case KW_glow_radius: thawer.get (op->glow_radius); break;
953 case KW_weapontype: thawer.get (op->weapontype); break;
954 case KW_tooltype: thawer.get (op->tooltype); break;
955 case KW_casting_time: thawer.get (op->casting_time); break;
956 case KW_elevation: thawer.get (op->elevation); break;
957 case KW_smoothlevel: thawer.get (op->smoothlevel); break;
958 case KW_client_type: thawer.get (op->client_type); break;
959 case KW_duration: thawer.get (op->duration); break;
960 case KW_range: thawer.get (op->range); break;
961 case KW_range_modifier: thawer.get (op->range_modifier); break;
962 case KW_dam_modifier: thawer.get (op->dam_modifier); break;
963 case KW_duration_modifier: thawer.get (op->duration_modifier); break;
964
965 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
966 //TODO: parse from other include files
967 case KW_body_range: thawer.get (op->body_info[0]); break;
968 case KW_body_arm: thawer.get (op->body_info[1]); break;
969 case KW_body_torso: thawer.get (op->body_info[2]); break;
970 case KW_body_head: thawer.get (op->body_info[3]); break;
971 case KW_body_neck: thawer.get (op->body_info[4]); break;
972 case KW_body_skill: thawer.get (op->body_info[5]); break;
973 case KW_body_finger: thawer.get (op->body_info[6]); break;
974 case KW_body_shoulder: thawer.get (op->body_info[7]); break;
975 case KW_body_foot: thawer.get (op->body_info[8]); break;
976 case KW_body_hand: thawer.get (op->body_info[9]); break;
977 case KW_body_wrist: thawer.get (op->body_info[10]); break;
978 case KW_body_waist: thawer.get (op->body_info[11]); break;
979 case KW_can_apply:
980 break;
981
982 case KW_connected:
983 add_button_link (op, op->map, thawer.get_sint32 ());
984 break;
985
986 case KW_randomitems:
987 op->randomitems = find_treasurelist (thawer.get_str ());
988 break; 967 break;
989 968
990 case KW_msg: 969 case KW_msg:
991 thawer.get_ml (KW_endmsg, op->msg); 970 f.get_ml (KW_endmsg, msg);
992 //TODO: allow longer messages
993 if (strlen (op->msg) >= HUGE_BUF)
994 {
995 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
996 op->msg = "ERROR, please report: string too long, winged.\n";
997 }
998 break; 971 break;
999 972
1000 case KW_lore: 973 case KW_lore:
1001 thawer.get_ml (KW_endlore, op->lore); 974 f.get_ml (KW_endlore, lore);
1002 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer.
1005 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 break; 975 break;
1010 976
1011 case KW_editable: 977 case KW_editable:
1012 case KW_editor_folder: 978 case KW_editor_folder:
1013 break; 979 break;
1014 980
1015 case KW_More: // uppercase alias
1016 case KW_more:
1017 /* We need to record that this is a multipart object,
1018 * so the calling function can glue things back together
1019 */
1020 ismore = 1;
1021 break;
1022
1023 case KW_end: 981 case KW_end:
1024 check_loaded_object (op);
1025
1026 if (!arch_init) 982 if (!loading_arch)
1027 op->instantiate (); 983 instantiate ();
1028 984
1029 return ismore ? LL_MORE : LL_NORMAL; 985 f.next ();
1030
1031 case KW_EOF:
1032 return LL_EOF; 986 return true;
1033 987
1034 case KW_ERROR: 988 case KW_ERROR:
1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 989 // we do not even try to find old values, duplicate keys stay duplicate
1036 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 990 // the list gets reversed after loading
991 kv.add (shstr (f.kw_str), shstr (f.value));
1037 break; 992 break;
1038 993
1039 default: 994 default:
1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 995 if (!f.parse_error ("object", name))
996 return false;
1041 break; 997 break;
1042 } 998 }
999
1000 f.next ();
1043 } 1001 }
1044} 1002}
1045 1003
1046/* 1004object *
1047 * Loads an object from the given file-pointer. 1005object::read (object_thawer &f, maptile *map)
1048 * Variables will be read and parsed and patched into the object
1049 * until the string "end" is reached, or the end of the file.
1050 *
1051 * bufstat is used to determine various file attributes:
1052 * LO_REPATE (0): We are reading from the same buffer as the last call.
1053 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1054 * will also be reading from this (treasure file, artifacts.)
1055 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1056 * be reset.
1057 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1058 *
1059 */
1060int
1061load_object (object_thawer &fp, object *op, int map_flags)
1062{ 1006{
1063 // cede every 500 objects loaded 1007 assert (f.kw == KW_arch);
1064 {
1065 static int cede_counter = 0;
1066 1008
1067 if (++cede_counter >= 500) 1009 archetype *arch = archetype::find (f.get_str ());
1010
1011 if (!arch)
1068 { 1012 {
1069 cede_counter = 0; 1013 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1070 if (coroapi::nready ()) 1014 arch = archetype::find (shstr_earthwall);
1071 coroapi::cede ();
1072 } 1015 }
1016
1017 assert (arch); //D maybe use exception handling of sorts?
1018
1019 f.next ();
1020
1021 object *op = arch->instance ();
1022 op->map = map;
1023 // instance() activates, this should be fixed properly
1024 op->deactivate ();
1025
1026 if (!op->parse_kv (f))
1027 {
1028 op->destroy ();
1029 return 0;
1073 } 1030 }
1074 1031
1075 return parse_object (op, fp, map_flags); 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 ();
1037 return op;
1076} 1038}
1077 1039
1078/* 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
1079 * as appropriate in op. 1041 * as appropriate in op.
1080 * 1042 *
… …
1082 * override values and in c_wiz to mutate values. 1044 * override values and in c_wiz to mutate values.
1083 */ 1045 */
1084int 1046int
1085set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1086{ 1048{
1087 object_thawer thawer (buf, (AV *)0); 1049 object_thawer f (format ("%s\nend", buf), (AV *)0);
1088 1050
1089 return parse_object (op, thawer, 0); 1051 return op->parse_kv (f);
1090} 1052}
1091 1053
1092/*
1093 * Initialises the array of variable-names. Needed before any
1094 * objects can be loaded. Called by init_library().
1095 */
1096
1097void
1098init_vars ()
1099{
1100}
1101
1102/* This returns a string of the integer movement type */
1103#if 0
1104// unused function
1105static char *
1106get_string_move_type (MoveType mt)
1107{
1108 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1109 int i, all_count = 0, count;
1110
1111 strcpy (retbuf, "");
1112 strcpy (retbuf_all, " all");
1113
1114 /* Quick check, and probably fairly common */
1115 if (mt == MOVE_ALL)
1116 return retbuf_all + 1;
1117 if (mt == 0)
1118 {
1119 strcpy (retbuf, "0");
1120 return retbuf;
1121 }
1122
1123 /* We basically slide the bits down. Why look at MOVE_ALL?
1124 * because we may want to return a string like 'all -swim',
1125 * and if we just looked at mt, we couldn't get that.
1126 */
1127 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1128 {
1129 if (mt & (1 << count))
1130 {
1131 strcat (retbuf, " ");
1132 strcat (retbuf, move_name[count]);
1133 }
1134 else
1135 {
1136 strcat (retbuf_all, " -");
1137 strcat (retbuf_all, move_name[count]);
1138 all_count++;
1139 }
1140 }
1141 /* Basically, if there is a single negation, return it, eg
1142 * 'all -swim'. But more than that, just return the
1143 * enumerated values. It doesn't make sense to return
1144 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1145 */
1146 if (all_count <= 1)
1147 return retbuf_all + 1;
1148 else
1149 return retbuf + 1;
1150}
1151#endif
1152
1153// compare *op against *tmp and output differences 1054// compare *op against *arch and output differences
1154void 1055static void
1155put (object_freezer &f, object *op, object *tmp) 1056write_diff (object_freezer &f, object *op, object *arch)
1156{ 1057{
1157 static const keyword resist_save[NROFATTACKS] = { 1058 static const keyword resist_save[NROFATTACKS] = {
1158# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1059# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1159# include "attackinc.h" 1060# include "attackinc.h"
1160# undef def 1061# undef def
… …
1165 * the 15'th element of this array should match that name. 1066 * the 15'th element of this array should match that name.
1166 * 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.
1167 */ 1068 */
1168 static const keyword flag_names [NUM_FLAGS] = { 1069 static const keyword flag_names [NUM_FLAGS] = {
1169 KW_alive, 1070 KW_alive,
1170 KW_wiz,
1171 KW_NULL, 1071 KW_NULL,
1172 KW_NULL, 1072 KW_NULL,
1173 KW_was_wiz, 1073 KW_NULL,
1074 KW_NULL,
1174 KW_applied, 1075 KW_applied,
1175 KW_unpaid, 1076 KW_unpaid,
1176 KW_can_use_shield, 1077 KW_can_use_shield,
1177 KW_no_pick, 1078 KW_no_pick,
1178 KW_NULL, // walk_on 1079 KW_is_transparent_floor,
1080 /* 10 */
1179 KW_NULL, // no_pass 1081 KW_NULL, // no_pass
1180 /* 10 */
1181 KW_is_animated, 1082 KW_is_animated,
1182 KW_NULL, // slow_move 1083 KW_NULL, // slow_move
1183 KW_NULL, // flying 1084 KW_NULL, // flying
1184 KW_monster, 1085 KW_monster,
1185 KW_friendly, 1086 KW_friendly,
1186 KW_generator, 1087 KW_generator,
1187 KW_is_thrown, 1088 KW_is_thrown,
1188 KW_auto_apply, 1089 KW_auto_apply,
1189 KW_NULL, // was KW_treasure 1090 KW_treasure_env,
1091 /* 20 */
1190 KW_player_sold, 1092 KW_player_sold,
1191 /* 20 */
1192 KW_see_invisible, 1093 KW_see_invisible,
1193 KW_can_roll, 1094 KW_can_roll,
1194 KW_overlay_floor, 1095 KW_overlay_floor,
1195 KW_is_turnable, 1096 KW_is_turnable,
1196 KW_NULL, // walk_off 1097 KW_NULL, // walk_off
1197 KW_NULL, // fly_on 1098 KW_NULL, // fly_on
1198 KW_NULL, // fly_off 1099 KW_NULL, // fly_off
1199 KW_is_used_up, 1100 KW_is_used_up,
1200 KW_identified, 1101 KW_identified,
1102 /* 30 */
1201 KW_reflecting, 1103 KW_reflecting,
1202 /* 30 */
1203 KW_changing, 1104 KW_changing,
1204 KW_splitting, 1105 KW_splitting,
1205 KW_hitback, 1106 KW_hitback,
1206 KW_startequip, 1107 KW_startequip,
1207 KW_blocksview, 1108 KW_blocksview,
1208 KW_undead, 1109 KW_undead,
1209 KW_scared, 1110 KW_scared,
1210 KW_unaggressive, 1111 KW_unaggressive,
1211 KW_reflect_missile, 1112 KW_reflect_missile,
1113 /* 40 */
1212 KW_reflect_spell, 1114 KW_reflect_spell,
1213 /* 40 */
1214 KW_no_magic, 1115 KW_no_magic,
1215 KW_no_fix_player, 1116 KW_NULL,
1216 KW_is_lightable, 1117 KW_is_lightable,
1217 KW_tear_down, 1118 KW_tear_down,
1218 KW_run_away, 1119 KW_run_away,
1219 KW_NULL, // pass_thru 1120 KW_NULL, // pass_thru
1220 KW_NULL, // an_pass_thru 1121 KW_NULL, // an_pass_thru
1221 KW_pick_up, 1122 KW_pick_up,
1222 KW_unique, 1123 KW_unique,
1124 /* 50 */
1223 KW_no_drop, 1125 KW_no_drop,
1224 /* 50 */
1225 KW_NULL, // wizcast 1126 KW_NULL, // wizcast
1226 KW_can_cast_spell, 1127 KW_can_cast_spell,
1227 KW_can_use_scroll, 1128 KW_can_use_scroll,
1228 KW_can_use_range, 1129 KW_can_use_range,
1229 KW_can_use_bow, 1130 KW_can_use_bow,
1230 KW_can_use_armour, 1131 KW_can_use_armour,
1231 KW_can_use_weapon, 1132 KW_can_use_weapon,
1232 KW_can_use_ring, 1133 KW_can_use_ring,
1233 KW_has_ready_range, 1134 KW_has_ready_range,
1135 /* 60 */
1234 KW_has_ready_bow, 1136 KW_has_ready_bow,
1235 /* 60 */
1236 KW_xrays, 1137 KW_xrays,
1237 KW_NULL, 1138 KW_NULL,
1238 KW_is_floor, 1139 KW_is_floor,
1239 KW_lifesave, 1140 KW_lifesave,
1240 KW_no_strength, 1141 KW_no_strength,
1241 KW_sleep, 1142 KW_sleep,
1242 KW_stand_still, 1143 KW_stand_still,
1243 KW_random_move, 1144 KW_random_move,
1244 KW_only_attack, 1145 KW_only_attack,
1146 /* 70 */
1245 KW_confused, 1147 KW_confused,
1246 /* 70 */
1247 KW_stealth, 1148 KW_stealth,
1248 KW_NULL, 1149 KW_NULL,
1249 KW_NULL, 1150 KW_NULL,
1250 KW_cursed, 1151 KW_cursed,
1251 KW_damned, 1152 KW_damned,
1252 KW_see_anywhere, 1153 KW_see_anywhere,
1253 KW_known_magical, 1154 KW_known_magical,
1254 KW_known_cursed, 1155 KW_known_cursed,
1255 KW_can_use_skill, 1156 KW_can_use_skill,
1157 /* 80 */
1256 KW_been_applied, 1158 KW_been_applied,
1257 /* 80 */
1258 KW_has_ready_scroll, 1159 KW_has_ready_scroll,
1259 KW_can_use_rod, 1160 KW_can_use_rod,
1260 KW_NULL, 1161 KW_precious,
1261 KW_can_use_horn, 1162 KW_can_use_horn,
1262 KW_make_invisible, 1163 KW_make_invisible,
1263 KW_inv_locked, 1164 KW_inv_locked,
1264 KW_is_wooded, 1165 KW_is_wooded,
1265 KW_is_hilly, 1166 KW_is_hilly,
1266 KW_has_ready_skill, 1167 KW_has_ready_skill,
1168 /* 90 */
1267 KW_has_ready_weapon, 1169 KW_has_ready_weapon,
1268 /* 90 */
1269 KW_no_skill_ident, 1170 KW_no_skill_ident,
1270 KW_is_blind, 1171 KW_is_blind,
1271 KW_can_see_in_dark, 1172 KW_can_see_in_dark,
1272 KW_is_cauldron, 1173 KW_is_cauldron,
1273 KW_NULL, 1174 KW_NULL,
1274 KW_no_steal, 1175 KW_no_steal,
1275 KW_one_hit, 1176 KW_one_hit,
1276 KW_NULL, 1177 KW_NULL,
1277 KW_berserk, 1178 KW_berserk,
1179 /* 100 */
1278 KW_neutral, 1180 KW_neutral,
1279 /* 100 */
1280 KW_no_attack, 1181 KW_no_attack,
1281 KW_no_damage, 1182 KW_no_damage,
1282 KW_NULL, 1183 KW_obj_original,
1283 KW_NULL, 1184 KW_random_speed,
1284 KW_activate_on_push, 1185 KW_activate_on_push,
1285 KW_activate_on_release, 1186 KW_activate_on_release,
1286 KW_is_water, 1187 KW_is_water,
1287 KW_use_content_on_gen, 1188 KW_use_content_on_gen,
1288 KW_NULL, 1189 KW_NULL,
1190 /* 110 */
1289 KW_is_buildable, 1191 KW_is_buildable,
1290 /* 110 */ 1192 KW_destroy_on_death,
1193 KW_NULL,
1291 }; 1194 };
1292 1195
1293 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;
1294 1207
1295 /* 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
1296 * keys that match field names will be overwritten by the loader. 1209 * keys that match field names will be overwritten by the loader.
1297 */ 1210 */
1298 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1211 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1299 { 1212 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1300 /* Find the field in the opposing member. */ 1213 f.put (kv->key, kv->value);
1301 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1302 1214
1303 /* If there's no partnering field, or it's got a different value, save our field. */ 1215 if (op->uuid)
1304 if (!arch_field || my_field->value != arch_field->value)
1305 f.put (my_field->key, my_field->value);
1306 } 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;
1307 1220
1308 /* We don't need to worry about the arch's extra fields - they 1221 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1309 * will get taken care of the copy_to method. 1222 ptr += sizeof ("uuid ") - 1;
1310 */ 1223 ptr = op->uuid.append (ptr);
1224 *ptr++ = '\n';
1311 1225
1312 { 1226 f.alloc (ptr - cur);
1313 char uids[64];
1314 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1315 f.put (KW_uuid, (const char *)uids);
1316 } 1227 }
1317 1228
1318#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)
1319#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);
1320 1238
1321 CMP_OUT (name); 1239 CMP_OUT (name);
1322 CMP_OUT (name_pl); 1240 CMP_OUT (name_pl);
1323 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
1324 CMP_OUT (title); 1264 CMP_OUT (title);
1325 CMP_OUT (race); 1265 CMP_OUT (race);
1326 CMP_OUT (slaying); 1266 CMP_OUT (slaying);
1267 CMP_OUT (skill);
1327 1268
1328 if (op->msg != tmp->msg) 1269 CMP_OUT (tag);
1329 f.put (KW_msg, KW_endmsg, op->msg); 1270 CMP_OUT (custom_name);
1330 if (op->lore != tmp->lore) 1271
1331 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
1332 1277
1333 CMP_OUT (other_arch); 1278 CMP_OUT (other_arch);
1334 CMP_OUT (face);
1335 1279
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);
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
1336 if (op->animation_id != tmp->animation_id) 1287 if (op->animation_id != arch->animation_id)
1337 if (op->animation_id) 1288 if (op->has_anim ())
1289 f.put (KW(animation), op->anim ().name);
1290 else
1338 { 1291 {
1339 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1292 f.put (KW(animation));
1340 1293 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1341 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1342 f.put (KW_is_animated, (sint32) 0);
1343 } 1294 }
1344 else
1345 f.put (KW_animation, (const char *) 0);
1346 1295
1347 CMP_OUT2 (str, stats.Str); 1296 CMP_OUT2 (str, stats.Str);
1348 CMP_OUT2 (dex, stats.Dex); 1297 CMP_OUT2 (dex, stats.Dex);
1349 CMP_OUT2 (con, stats.Con); 1298 CMP_OUT2 (con, stats.Con);
1350 CMP_OUT2 (wis, stats.Wis); 1299 CMP_OUT2 (wis, stats.Wis);
… …
1359 CMP_OUT2 (grace, stats.grace); 1308 CMP_OUT2 (grace, stats.grace);
1360 CMP_OUT2 (maxgrace, stats.maxgrace); 1309 CMP_OUT2 (maxgrace, stats.maxgrace);
1361 CMP_OUT2 (exp, stats.exp); 1310 CMP_OUT2 (exp, stats.exp);
1362 1311
1363 CMP_OUT (perm_exp); 1312 CMP_OUT (perm_exp);
1364 CMP_OUT (expmul); 1313 //CMP_OUT (expmul);
1365 1314
1366 CMP_OUT2 (food, stats.food); 1315 CMP_OUT2 (food, stats.food);
1367 CMP_OUT2 (dam, stats.dam); 1316 CMP_OUT2 (dam, stats.dam);
1368 CMP_OUT2 (luck, stats.luck); 1317 CMP_OUT2 (luck, stats.luck);
1369 CMP_OUT2 (wc, stats.wc); 1318 CMP_OUT2 (wc, stats.wc);
1370 CMP_OUT2 (ac, stats.ac); 1319 CMP_OUT2 (ac, stats.ac);
1371 1320
1372 CMP_OUT (x);
1373 CMP_OUT (y);
1374 CMP_OUT (speed);
1375 CMP_OUT (speed_left);
1376 CMP_OUT2 (move_state, move_status); 1321 CMP_OUT2 (move_state, move_status);
1377 CMP_OUT (attack_movement); 1322 CMP_OUT (attack_movement);
1378 CMP_OUT (nrof); 1323 CMP_OUT (nrof);
1379 CMP_OUT (level); 1324 CMP_OUT (level);
1380 CMP_OUT (direction);
1381 CMP_OUT (type);
1382 CMP_OUT (subtype);
1383 CMP_OUT (attacktype); 1325 CMP_OUT (attacktype);
1384 1326
1327 // using memcmp here seems to be a loss - is gcc vectorising?
1385 for (i = 0; i < NROFATTACKS; i++) 1328 for (int i = 0; i < NROFATTACKS; i++)
1386 if (op->resist[i] != tmp->resist[i]) 1329 if (expect_false (op->resist[i] != arch->resist[i]))
1387 f.put (resist_save[i], op->resist[i]); 1330 f.put (resist_save[i], op->resist[i]);
1388 1331
1389 CMP_OUT (path_attuned); 1332 CMP_OUT (path_attuned);
1390 CMP_OUT (path_repelled); 1333 CMP_OUT (path_repelled);
1391 CMP_OUT (path_denied); 1334 CMP_OUT (path_denied);
1392 CMP_OUT (material); 1335
1393 CMP_OUT (materialname); 1336 CMP_OUT2 (material, materials);//TODO: nuke
1337 if (op->material != arch->material)
1338 f.put (KW(materialname), op->material->name);
1339
1394 CMP_OUT (value); 1340 CMP_OUT (value);
1395 CMP_OUT (carrying); 1341 CMP_OUT (carrying);
1396 CMP_OUT (weight); 1342 CMP_OUT (weight);
1397 CMP_OUT (invisible); 1343 CMP_OUT (invisible);
1398 CMP_OUT (state); 1344 CMP_OUT (state);
… …
1401 CMP_OUT (last_sp); 1347 CMP_OUT (last_sp);
1402 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1403 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1404 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1405 1351
1406 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 ())
1407 f.put (KW_connected, i); 1354 f.put (KW(connected), ol->id);
1408 1355
1409 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1357
1410 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
1411 1359
1412 CMP_OUT (run_away); 1360 CMP_OUT (run_away);
1413 CMP_OUT (pick_up); 1361 CMP_OUT (pick_up);
1414 CMP_OUT (will_apply); 1362 CMP_OUT (will_apply);
1415 CMP_OUT (smoothlevel); 1363 CMP_OUT (smoothlevel);
1416 CMP_OUT (weapontype); 1364 CMP_OUT (weapontype);
1417 CMP_OUT (tooltype);
1418 CMP_OUT (elevation);
1419 CMP_OUT (client_type); 1365 CMP_OUT (client_type);
1420 CMP_OUT (item_power); 1366 CMP_OUT (item_power);
1421 CMP_OUT (duration); 1367 CMP_OUT (duration);
1422 CMP_OUT (range); 1368 CMP_OUT (range);
1423 CMP_OUT (range_modifier); 1369 CMP_OUT (range_modifier);
… …
1431 CMP_OUT (move_on); 1377 CMP_OUT (move_on);
1432 CMP_OUT (move_off); 1378 CMP_OUT (move_off);
1433 CMP_OUT (move_slow); 1379 CMP_OUT (move_slow);
1434 CMP_OUT (move_slow_penalty); 1380 CMP_OUT (move_slow_penalty);
1435 1381
1436 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 ()))
1437 for (i = 0; i <= NUM_FLAGS; i++) 1392 for (int i = 0; i < NUM_FLAGS; i++)
1438 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1393 if (expect_false (diff [i]))
1439 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
1440 1400
1441 /* Save body locations */ 1401 // save body locations. gcc's memcmp does an abysmal job when used
1442 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
1443 if (op->body_info[i] != tmp->body_info[i]) 1403 if (expect_false (op->slot[i].info != arch->slot[i].info))
1444 f.put (body_locations[i].save_name, op->body_info[i]); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1445} 1405}
1446 1406
1447/* 1407/*
1448 * Dumps all variables in an object to a file. 1408 * Dumps all variables in an object to a file.
1449 * 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,
1450 * 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.
1451 */ 1411 */
1452void 1412bool
1453save_object (object_freezer &fp, object *op, int flag) 1413object::write (object_freezer &f)
1454{ 1414{
1455 /* Even if the object does have an owner, it would seem that we should 1415 if (expect_false (is_arch ()))
1456 * still save it. 1416 {
1457 */ 1417 f.put (KW(object), arch->archname);
1458 if (op->owner) 1418 write_diff (f, this, archetype::empty);
1459 return; 1419 }
1460 1420 else
1461 /* If it is unpaid and we don't want to save those, just return. */ 1421 {
1462 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1463 return;
1464
1465 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1466
1467 fp.put (KW_arch, at->name); 1422 f.put (KW(arch), arch->archname);
1468 put (fp, op, &at->clone); 1423 write_diff (f, this, arch);
1424 }
1469 1425
1470 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1471
1472 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
1473 save_object (fp, tmp, flag); 1427 tmp->write (f);
1474 1428
1475 fp.put (op); 1429 f.put (this);
1476 fp.put (KW_end); 1430 f.put (KW(end));
1431
1432 return true;
1477} 1433}
1478 1434
1435/////////////////////////////////////////////////////////////////////////////
1436
1437// generic resource file load,
1438// currently supports: region, treasures, archetypes
1439bool
1440load_resource_file_ (const char *filename)
1441{
1442 object_thawer f (filename);
1443
1444 for (;;)
1445 {
1446 coroapi::cede_to_tick ();
1447
1448 switch (f.kw)
1449 {
1450 case KW_region:
1451 if (!region::read (f))
1452 return false;
1453 break;
1454
1455 case KW_treasure:
1456 case KW_treasureone:
1457 if (!treasurelist::read (f))
1458 return false;
1459 break;
1460
1461 case KW_object:
1462 if (!archetype::read (f))
1463 return false;
1464 break;
1465
1466 case KW_EOF:
1467 return true;
1468
1469 default:
1470 if (!f.parse_error ("resource file"))
1471 return false;
1472
1473 f.next ();
1474 break;
1475 }
1476 }
1477}
1478

Diff Legend

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