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.120 by root, Thu Sep 11 12:43:17 2008 UTC vs.
Revision 1.180 by root, Wed Nov 14 19:40:44 2018 UTC

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

Diff Legend

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