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

Diff Legend

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