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

Diff Legend

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