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

Diff Legend

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