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.79 by root, Mon May 7 07:47:32 2007 UTC vs.
Revision 1.180 by root, Wed Nov 14 19:40:44 2018 UTC

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

Diff Legend

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