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.59 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.160 by root, Thu May 6 22:58:03 2010 UTC

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

Diff Legend

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