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.86 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.150 by root, Sun Nov 29 09:41:27 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
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 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30
31extern archetype *loading_arch;
32
33//+GPL
34 34
35/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 37 * 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 38 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 168 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 169 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 170 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 171 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 172 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 173 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 174 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 175 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 176 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 177 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 178 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
252 NULL 252 NULL
253}; 253};
254 254
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 255/* 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 256 * 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 257 * 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. 258 * to check for objects to make sure there are no common errors.
261 */ 259 */
262void 260void
263object::post_load_check () 261object::post_load_check ()
264{ 262{
265 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
266 { 264 {
267 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
268 type = 0; 266 type = 0;
269 } 267 }
270 268
271 switch (type) 269 switch (type)
272 { 270 {
… …
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 appropiate 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 = get_archetype (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 (QUERY_FLAG (this, 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 ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, 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 {
… …
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}
546
547//-GPL
521 548
522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 549#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
523 550
524bool 551bool
525object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
526{ 553{
527 object *op_inv = inv; 554 object *op_inv = inv;
555 key_value *last_kv = key_values;
528 556
529 for (;;) 557 for (;;)
530 { 558 {
531 switch (f.kw) 559 switch (f.kw)
532 { 560 {
533 case KW_uuid: 561 case KW_uuid:
534 if (const char *s = f.get_str ()) 562 if (!uuid.parse (f.get_str ()))
535 { 563 {
536 unsigned int version; 564 f.parse_warn ("unparseable uuid");
537 unsigned long long seq; 565 uuid = UUID::gen ();
538
539 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
540 {
541 uuid.seq = seq;
542 break;
543 }
544 } 566 }
545
546 uuid = gen_uuid ();
547 break; 567 break;
548 568
549 case KW_oid: 569 case KW_oid:
550 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
551 break; 571 break;
… …
557 577
558 case KW_attach: f.get_ornull (attach); break; 578 case KW_attach: f.get_ornull (attach); break;
559 case KW_skill: f.get_ornull (skill); break; 579 case KW_skill: f.get_ornull (skill); break;
560 case KW_race: f.get_ornull (race); break; 580 case KW_race: f.get_ornull (race); break;
561 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;
562 583
563 case KW_arch: 584 case KW_arch:
564 {
565 object *tmp = object::read (f); 585 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 586 {
587 tmp->deactivate ();
588
569 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
593 // and finally we do not want any funny effects
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 596
576 if (!op_inv) 597 if (!op_inv)
577 { 598 {
… …
589 610
590 tmp->below = 0; 611 tmp->below = 0;
591 tmp->env = this; 612 tmp->env = this;
592 op_inv = tmp; 613 op_inv = tmp;
593 } 614 }
594 } 615 else
616 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
617
595 continue; 618 continue;
596 619
597 case KW_other_arch: 620 case KW_other_arch:
598 other_arch =
599 loading_arch 621 if (loading_arch == this)
600 ? archetype::get (f.get_str ()) 622 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
623 else
624 {
601 : archetype::find (f.get_str ()); 625 other_arch = archetype::find (f.get_str ());
602 626
603 if (!other_arch) 627 if (!other_arch)
604 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 ());
605 break; 634 break;
606 635
607 case KW_animation: 636 case KW_animation:
608 { 637 {
609 CLEAR_FLAG (this, FLAG_ANIMATE); 638 CLEAR_FLAG (this, FLAG_ANIMATE);
610 animation_id = 0; 639 animation_id = 0;
611 640
612 const char *str = f.get_str ();
613 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
614 SET_FLAG (this, FLAG_ANIMATE); 642 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
615 } 643 }
616 break; 644 break;
617 645
618 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
619 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
620 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
621 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
622 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
623 652
624 case KW_speed: 653 case KW_speed:
625 f.get (speed); 654 f.get (speed);
626 655
… …
635 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
636 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
637 break; 666 break;
638 667
639 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 {
640 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;
641 break; 692 break;
642 693
643 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
645 696
… …
686 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
687 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
688 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
689 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
690 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
691 case KW_materialname: f.get (materialname); break; 742
743 case KW_materialname:
744 {
745 shstr sh;
746 f.get (sh);
747 material = name_to_material (sh);
748 }
749 break;
692 750
693 /* These are the new values */ 751 /* These are the new values */
694 case KW_move_block: set_move (move_block, f.get_str ()); break; 752 case KW_move_block: set_move (move_block, f); break;
695 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 753 case KW_move_allow: set_move (move_allow, f); break;
696 case KW_move_type: set_move (move_type, f.get_str ()); break; 754 case KW_move_type: set_move (move_type , f); break;
697 case KW_move_on: set_move (move_on, f.get_str ()); break; 755 case KW_move_on: set_move (move_on , f); break;
698 case KW_move_off: set_move (move_off, f.get_str ()); break; 756 case KW_move_off: set_move (move_off , f); break;
699 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 757 case KW_move_slow: set_move (move_slow , f); break;
700 758
701 /* These are all legacy - any new objects should use the move_ .. values */ 759 /* These are all legacy - any new objects should use the move_ .. values */
702 case KW_no_pass: 760 case KW_no_pass:
703 { 761 {
704 if (f.get_sint32 ()) 762 if (f.get_sint32 ())
… …
796 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 854 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
797 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 855 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
798 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 856 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
799 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 857 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
800 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 858 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
859 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
801 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 860 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
802 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 861 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
803 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 862 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
804 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 863 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
805 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 864 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
812 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 871 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
813 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 872 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
814 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 873 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
815 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 874 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
816 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 875 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
817 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
818 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 876 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
819 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 877 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
820 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 878 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
821 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 879 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
822 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 880 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
866 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 924 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
867 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 925 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
868 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 926 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
869 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 927 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
870 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 928 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
929 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
871 930
872 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
873 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 932 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
874 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 933 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
875 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 934 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
905 case KW_anim_speed: f.get (anim_speed); break; 964 case KW_anim_speed: f.get (anim_speed); break;
906 case KW_container: f.get (weight_limit); break; 965 case KW_container: f.get (weight_limit); break;
907 case KW_will_apply: f.get (will_apply); break; 966 case KW_will_apply: f.get (will_apply); break;
908 case KW_attack_movement: f.get (attack_movement); break; 967 case KW_attack_movement: f.get (attack_movement); break;
909 case KW_move_state: f.get (move_status); break; 968 case KW_move_state: f.get (move_status); break;
910 case KW_expmul: f.get (expmul); break; 969 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
911 case KW_glow_radius: f.get (glow_radius); break; 970 case KW_glow_radius: f.get (glow_radius); break;
912 case KW_weapontype: f.get (weapontype); break; 971 case KW_weapontype: f.get (weapontype); break;
913 case KW_tooltype: f.get (tooltype); break;
914 case KW_casting_time: f.get (casting_time); break; 972 case KW_casting_time: f.get (casting_time); break;
973
974 // elevation is deprecated
915 case KW_elevation: f.get (elevation); break; 975 case KW_elevation: break;
976
916 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 977 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
917 case KW_client_type: f.get (client_type); break; 978 case KW_client_type: f.get (client_type); break;
918 case KW_duration: f.get (duration); break; 979 case KW_duration: f.get (duration); break;
919 case KW_range: f.get (range); break; 980 case KW_range: f.get (range); break;
920 case KW_range_modifier: f.get (range_modifier); break; 981 case KW_range_modifier: f.get (range_modifier); break;
… …
939 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 1000 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
940 case KW_can_apply: 1001 case KW_can_apply:
941 break; 1002 break;
942 1003
943 case KW_connected: 1004 case KW_connected:
944 add_button_link (this, map, f.get_sint32 ()); 1005 {
1006 shstr connected;
1007
1008 f.get (connected);
1009 add_link (map, connected);
1010 }
945 break; 1011 break;
946 1012
947 case KW_randomitems: 1013 case KW_randomitems:
948 if (f.get_str ()) 1014 if (f.has_value ())
949 { 1015 {
950 randomitems = 1016 randomitems =
951 loading_arch 1017 loading_arch
952 ? treasurelist::get (f.get_str ()) 1018 ? treasurelist::get (f.get_str ())
953 : treasurelist::find (f.get_str ()); 1019 : treasurelist::find (f.get_str ());
954 1020
955 if (!randomitems) 1021 if (!randomitems)
1022 {
956 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1023 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1024 randomitems = treasurelist::get (shstr_none); // avoid crashes
1025 }
957 } 1026 }
958 else 1027 else
959 randomitems = 0; 1028 randomitems = 0;
960 break; 1029 break;
961 1030
962 case KW_msg: 1031 case KW_msg:
963 f.get_ml (KW_endmsg, msg); 1032 f.get_ml (KW_endmsg, msg);
964 //TODO: allow longer messages
965 if (strlen (msg) >= HUGE_BUF)
966 {
967 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
968 msg = "ERROR, please report: string too long, winged.\n";
969 }
970 break; 1033 break;
971 1034
972 case KW_lore: 1035 case KW_lore:
973 f.get_ml (KW_endlore, lore); 1036 f.get_ml (KW_endlore, lore);
974 //TODO: allow longer messages
975 /* Just print a warning so we can be reasonably safe
976 * about not overflowing the buffer.
977 */
978 if (strlen (lore) > (HUGE_BUF / 2))
979 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
980 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
981 break; 1037 break;
982 1038
983 case KW_editable: 1039 case KW_editable:
984 case KW_editor_folder: 1040 case KW_editor_folder:
985 break; 1041 break;
… …
990 1046
991 f.next (); 1047 f.next ();
992 return true; 1048 return true;
993 1049
994 case KW_ERROR: 1050 case KW_ERROR:
995 set_ob_key_value (this, f.kw_str, f.value, true); 1051 // append as key value pair (do not use kv_set as it prepends)
1052 // we also do not even try to find old values, duplicate keys stay duplicate
1053 {
1054 key_value *kv = new key_value;
1055
1056 kv->next = 0;
1057 kv->key = shstr (f.kw_str);
1058 kv->value = shstr (f.value);
1059
1060 if (!last_kv)
1061 key_values = last_kv = kv;
1062 else
1063 {
1064 while (last_kv->next)
1065 last_kv = last_kv->next;
1066
1067 last_kv->next = kv;
1068 last_kv = kv;
1069 }
1070 }
996 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1071 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
997 break; 1072 break;
998 1073
999 default: 1074 default:
1000 if (!f.parse_error ("object", name)) 1075 if (!f.parse_error ("object", name))
… …
1014 archetype *arch = archetype::find (f.get_str ()); 1089 archetype *arch = archetype::find (f.get_str ());
1015 1090
1016 if (!arch) 1091 if (!arch)
1017 { 1092 {
1018 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1093 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1019 arch = archetype::find ("earthwall"); 1094 arch = archetype::find (shstr_earthwall);
1020 } 1095 }
1021 1096
1022 assert (arch); //D maybe use exception handling of sorts? 1097 assert (arch); //D maybe use exception handling of sorts?
1023 1098
1024 f.next (); 1099 f.next ();
1025 1100
1026 object *op = object::create (); 1101 object *op = arch->instance ();
1027
1028 op->map = map; 1102 op->map = map;
1029 arch->clone.copy_to (op);
1030 // copy_to activates, this should be fixed properly 1103 // instance() activates, this should be fixed properly
1031 op->deactivate (); 1104 op->deactivate ();
1032 1105
1033 if (!op->parse_kv (f)) 1106 if (!op->parse_kv (f))
1034 { 1107 {
1035 op->destroy (true); 1108 op->destroy ();
1036 return 0; 1109 return 0;
1037 } 1110 }
1038 1111
1039 op->post_load_check (); 1112 op->post_load_check ();
1040 return op; 1113 return op;
… …
1049int 1122int
1050set_variable (object *op, char *buf) 1123set_variable (object *op, char *buf)
1051{ 1124{
1052 object_thawer f (buf, (AV *)0); 1125 object_thawer f (buf, (AV *)0);
1053 1126
1054 f.next ();
1055 return op->parse_kv (f); 1127 return op->parse_kv (f);
1056} 1128}
1057 1129
1058/* This returns a string of the integer movement type */
1059#if 0
1060// unused function
1061static char *
1062get_string_move_type (MoveType mt)
1063{
1064 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1065 int i, all_count = 0, count;
1066
1067 strcpy (retbuf, "");
1068 strcpy (retbuf_all, " all");
1069
1070 /* Quick check, and probably fairly common */
1071 if (mt == MOVE_ALL)
1072 return retbuf_all + 1;
1073 if (mt == 0)
1074 {
1075 strcpy (retbuf, "0");
1076 return retbuf;
1077 }
1078
1079 /* We basically slide the bits down. Why look at MOVE_ALL?
1080 * because we may want to return a string like 'all -swim',
1081 * and if we just looked at mt, we couldn't get that.
1082 */
1083 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1084 {
1085 if (mt & (1 << count))
1086 {
1087 strcat (retbuf, " ");
1088 strcat (retbuf, move_name[count]);
1089 }
1090 else
1091 {
1092 strcat (retbuf_all, " -");
1093 strcat (retbuf_all, move_name[count]);
1094 all_count++;
1095 }
1096 }
1097 /* Basically, if there is a single negation, return it, eg
1098 * 'all -swim'. But more than that, just return the
1099 * enumerated values. It doesn't make sense to return
1100 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1101 */
1102 if (all_count <= 1)
1103 return retbuf_all + 1;
1104 else
1105 return retbuf + 1;
1106}
1107#endif
1108
1109// compare *op against *tmp and output differences 1130// compare *op against *arch and output differences
1110static void 1131static void
1111write_diff (object_freezer &f, object *op, object *tmp) 1132write_diff (object_freezer &f, object *op, object *arch)
1112{ 1133{
1113 static const keyword resist_save[NROFATTACKS] = { 1134 static const keyword resist_save[NROFATTACKS] = {
1114# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1135# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1115# include "attackinc.h" 1136# include "attackinc.h"
1116# undef def 1137# undef def
… …
1130 KW_applied, 1151 KW_applied,
1131 KW_unpaid, 1152 KW_unpaid,
1132 KW_can_use_shield, 1153 KW_can_use_shield,
1133 KW_no_pick, 1154 KW_no_pick,
1134 KW_NULL, // walk_on 1155 KW_NULL, // walk_on
1156 /* 10 */
1135 KW_NULL, // no_pass 1157 KW_NULL, // no_pass
1136 /* 10 */
1137 KW_is_animated, 1158 KW_is_animated,
1138 KW_NULL, // slow_move 1159 KW_NULL, // slow_move
1139 KW_NULL, // flying 1160 KW_NULL, // flying
1140 KW_monster, 1161 KW_monster,
1141 KW_friendly, 1162 KW_friendly,
1142 KW_generator, 1163 KW_generator,
1143 KW_is_thrown, 1164 KW_is_thrown,
1144 KW_auto_apply, 1165 KW_auto_apply,
1145 KW_treasure_env, 1166 KW_treasure_env,
1167 /* 20 */
1146 KW_player_sold, 1168 KW_player_sold,
1147 /* 20 */
1148 KW_see_invisible, 1169 KW_see_invisible,
1149 KW_can_roll, 1170 KW_can_roll,
1150 KW_overlay_floor, 1171 KW_overlay_floor,
1151 KW_is_turnable, 1172 KW_is_turnable,
1152 KW_NULL, // walk_off 1173 KW_NULL, // walk_off
1153 KW_NULL, // fly_on 1174 KW_NULL, // fly_on
1154 KW_NULL, // fly_off 1175 KW_NULL, // fly_off
1155 KW_is_used_up, 1176 KW_is_used_up,
1156 KW_identified, 1177 KW_identified,
1178 /* 30 */
1157 KW_reflecting, 1179 KW_reflecting,
1158 /* 30 */
1159 KW_changing, 1180 KW_changing,
1160 KW_splitting, 1181 KW_splitting,
1161 KW_hitback, 1182 KW_hitback,
1162 KW_startequip, 1183 KW_startequip,
1163 KW_blocksview, 1184 KW_blocksview,
1164 KW_undead, 1185 KW_undead,
1165 KW_scared, 1186 KW_scared,
1166 KW_unaggressive, 1187 KW_unaggressive,
1167 KW_reflect_missile, 1188 KW_reflect_missile,
1189 /* 40 */
1168 KW_reflect_spell, 1190 KW_reflect_spell,
1169 /* 40 */
1170 KW_no_magic, 1191 KW_no_magic,
1171 KW_no_fix_player, 1192 KW_NULL,
1172 KW_is_lightable, 1193 KW_is_lightable,
1173 KW_tear_down, 1194 KW_tear_down,
1174 KW_run_away, 1195 KW_run_away,
1175 KW_NULL, // pass_thru 1196 KW_NULL, // pass_thru
1176 KW_NULL, // an_pass_thru 1197 KW_NULL, // an_pass_thru
1177 KW_pick_up, 1198 KW_pick_up,
1178 KW_unique, 1199 KW_unique,
1200 /* 50 */
1179 KW_no_drop, 1201 KW_no_drop,
1180 /* 50 */
1181 KW_NULL, // wizcast 1202 KW_NULL, // wizcast
1182 KW_can_cast_spell, 1203 KW_can_cast_spell,
1183 KW_can_use_scroll, 1204 KW_can_use_scroll,
1184 KW_can_use_range, 1205 KW_can_use_range,
1185 KW_can_use_bow, 1206 KW_can_use_bow,
1186 KW_can_use_armour, 1207 KW_can_use_armour,
1187 KW_can_use_weapon, 1208 KW_can_use_weapon,
1188 KW_can_use_ring, 1209 KW_can_use_ring,
1189 KW_has_ready_range, 1210 KW_has_ready_range,
1211 /* 60 */
1190 KW_has_ready_bow, 1212 KW_has_ready_bow,
1191 /* 60 */
1192 KW_xrays, 1213 KW_xrays,
1193 KW_NULL, 1214 KW_NULL,
1194 KW_is_floor, 1215 KW_is_floor,
1195 KW_lifesave, 1216 KW_lifesave,
1196 KW_no_strength, 1217 KW_no_strength,
1197 KW_sleep, 1218 KW_sleep,
1198 KW_stand_still, 1219 KW_stand_still,
1199 KW_random_move, 1220 KW_random_move,
1200 KW_only_attack, 1221 KW_only_attack,
1222 /* 70 */
1201 KW_confused, 1223 KW_confused,
1202 /* 70 */
1203 KW_stealth, 1224 KW_stealth,
1204 KW_NULL, 1225 KW_NULL,
1205 KW_NULL, 1226 KW_NULL,
1206 KW_cursed, 1227 KW_cursed,
1207 KW_damned, 1228 KW_damned,
1208 KW_see_anywhere, 1229 KW_see_anywhere,
1209 KW_known_magical, 1230 KW_known_magical,
1210 KW_known_cursed, 1231 KW_known_cursed,
1211 KW_can_use_skill, 1232 KW_can_use_skill,
1233 /* 80 */
1212 KW_been_applied, 1234 KW_been_applied,
1213 /* 80 */
1214 KW_has_ready_scroll, 1235 KW_has_ready_scroll,
1215 KW_can_use_rod, 1236 KW_can_use_rod,
1216 KW_precious, 1237 KW_precious,
1217 KW_can_use_horn, 1238 KW_can_use_horn,
1218 KW_make_invisible, 1239 KW_make_invisible,
1219 KW_inv_locked, 1240 KW_inv_locked,
1220 KW_is_wooded, 1241 KW_is_wooded,
1221 KW_is_hilly, 1242 KW_is_hilly,
1222 KW_has_ready_skill, 1243 KW_has_ready_skill,
1244 /* 90 */
1223 KW_has_ready_weapon, 1245 KW_has_ready_weapon,
1224 /* 90 */
1225 KW_no_skill_ident, 1246 KW_no_skill_ident,
1226 KW_is_blind, 1247 KW_is_blind,
1227 KW_can_see_in_dark, 1248 KW_can_see_in_dark,
1228 KW_is_cauldron, 1249 KW_is_cauldron,
1229 KW_NULL, 1250 KW_NULL,
1230 KW_no_steal, 1251 KW_no_steal,
1231 KW_one_hit, 1252 KW_one_hit,
1232 KW_NULL, 1253 KW_NULL,
1233 KW_berserk, 1254 KW_berserk,
1255 /* 100 */
1234 KW_neutral, 1256 KW_neutral,
1235 /* 100 */
1236 KW_no_attack, 1257 KW_no_attack,
1237 KW_no_damage, 1258 KW_no_damage,
1238 KW_obj_original, 1259 KW_obj_original,
1239 KW_NULL, 1260 KW_random_speed,
1240 KW_activate_on_push, 1261 KW_activate_on_push,
1241 KW_activate_on_release, 1262 KW_activate_on_release,
1242 KW_is_water, 1263 KW_is_water,
1243 KW_use_content_on_gen, 1264 KW_use_content_on_gen,
1244 KW_NULL, 1265 KW_NULL,
1266 /* 110 */
1245 KW_is_buildable, 1267 KW_is_buildable,
1246 /* 110 */
1247 KW_destroy_on_death, 1268 KW_destroy_on_death,
1248 KW_NULL, 1269 KW_NULL,
1249 }; 1270 };
1250 1271
1251 int i; 1272 // obj_original is the only commonly differing flag between archetype
1273 // and object, so special-case it here to be able to skip the loop
1274 static const struct flagmask : object::flags_t
1275 {
1276 flagmask ()
1277 {
1278 for (int i = 0; i < NUM_FLAGS; i++)
1279 if (flag_names [i])
1280 set (i);
1281 }
1282 } flagmask;
1252 1283
1253 /* This saves the key/value lists. We do it first so that any 1284 /* This saves the key/value lists. We do it first so that any
1254 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1255 */ 1286 */
1256 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1287 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 { 1288 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1258 /* Find the field in the opposing member. */ 1289 f.put (kv->key, kv->value);
1259 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1260 1290
1261 /* If there's no partnering field, or it's got a different value, save our field. */ 1291 if (op->uuid)
1262 if (!arch_field || my_field->value != arch_field->value)
1263 f.put (my_field->key, my_field->value);
1264 } 1292 {
1293 // highly optimised - this is often 25% of all data written
1294 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1295 char *ptr = cur;
1265 1296
1266 /* We don't need to worry about the arch's extra fields - they 1297 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1267 * will get taken care of the copy_to method. 1298 ptr += sizeof ("uuid ") - 1;
1268 */ 1299 ptr = op->uuid.append (ptr);
1300 *ptr++ = '\n';
1269 1301
1270 { 1302 f.alloc (ptr - cur);
1271 char uids[64];
1272 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1273 f.put (KW_uuid, (const char *)uids);
1274 } 1303 }
1275 1304
1276#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1305#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1277#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1306#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1307
1308 CMP_OUT (x);
1309 CMP_OUT (y);
1310
1311 CMP_OUT (type);
1312 CMP_OUT (subtype);
1313 CMP_OUT (direction);
1278 1314
1279 CMP_OUT (name); 1315 CMP_OUT (name);
1280 CMP_OUT (name_pl); 1316 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1317 CMP_OUT (speed);
1318
1319 // speed_left is a major time-burner, and has good locality, so
1320 // we use a simple lookup-cache to avoid the very slow printf.
1321 if (op->speed_left != arch->speed_left)
1322 {
1323 static double last_speed_left = 0.;
1324 static char last_speed_left_str [256] = "sl 0\n";
1325 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1326
1327 if (last_speed_left != op->speed_left)
1328 {
1329 last_speed_left = op->speed_left;
1330 last_speed_left_len = sizeof ("sl ") - 1
1331 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1332 }
1333
1334 f.add (last_speed_left_str, last_speed_left_len);
1335 }
1336
1282 CMP_OUT (title); 1337 CMP_OUT (title);
1283 CMP_OUT (race); 1338 CMP_OUT (race);
1284 CMP_OUT (slaying); 1339 CMP_OUT (slaying);
1340 CMP_OUT (skill);
1285 1341
1286 if (op->msg != tmp->msg) 1342 CMP_OUT (tag);
1287 f.put (KW_msg, KW_endmsg, op->msg); 1343 CMP_OUT (custom_name);
1288 if (op->lore != tmp->lore) 1344
1289 f.put (KW_lore, KW_endlore, op->lore); 1345 if (object *owner = op->owner)
1346 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1347
1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1290 1349
1291 CMP_OUT (other_arch); 1350 CMP_OUT (other_arch);
1292 1351
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1352 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1353 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1294 1354
1355 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1356 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1357 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1358
1295 if (op->animation_id != tmp->animation_id) 1359 if (op->animation_id != arch->animation_id)
1296 if (op->animation_id) 1360 if (op->has_anim ())
1361 f.put (KW(animation), op->anim ().name);
1362 else
1297 { 1363 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1364 f.put (KW(animation));
1299 1365 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0);
1302 } 1366 }
1303 else
1304 f.put (KW_animation, (const char *) 0);
1305 1367
1306 CMP_OUT2 (str, stats.Str); 1368 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1369 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1370 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1371 CMP_OUT2 (wis, stats.Wis);
… …
1318 CMP_OUT2 (grace, stats.grace); 1380 CMP_OUT2 (grace, stats.grace);
1319 CMP_OUT2 (maxgrace, stats.maxgrace); 1381 CMP_OUT2 (maxgrace, stats.maxgrace);
1320 CMP_OUT2 (exp, stats.exp); 1382 CMP_OUT2 (exp, stats.exp);
1321 1383
1322 CMP_OUT (perm_exp); 1384 CMP_OUT (perm_exp);
1323 CMP_OUT (expmul); 1385 //CMP_OUT (expmul);
1324 1386
1325 CMP_OUT2 (food, stats.food); 1387 CMP_OUT2 (food, stats.food);
1326 CMP_OUT2 (dam, stats.dam); 1388 CMP_OUT2 (dam, stats.dam);
1327 CMP_OUT2 (luck, stats.luck); 1389 CMP_OUT2 (luck, stats.luck);
1328 CMP_OUT2 (wc, stats.wc); 1390 CMP_OUT2 (wc, stats.wc);
1329 CMP_OUT2 (ac, stats.ac); 1391 CMP_OUT2 (ac, stats.ac);
1330 1392
1331 CMP_OUT (x);
1332 CMP_OUT (y);
1333 CMP_OUT (speed);
1334 CMP_OUT (speed_left);
1335 CMP_OUT2 (move_state, move_status); 1393 CMP_OUT2 (move_state, move_status);
1336 CMP_OUT (attack_movement); 1394 CMP_OUT (attack_movement);
1337 CMP_OUT (nrof); 1395 CMP_OUT (nrof);
1338 CMP_OUT (level); 1396 CMP_OUT (level);
1339 CMP_OUT (direction);
1340 CMP_OUT (type);
1341 CMP_OUT (subtype);
1342 CMP_OUT (attacktype); 1397 CMP_OUT (attacktype);
1343 1398
1399 // using memcmp here seems to be a loss - is gcc vectorising?
1344 for (i = 0; i < NROFATTACKS; i++) 1400 for (int i = 0; i < NROFATTACKS; i++)
1345 if (op->resist[i] != tmp->resist[i]) 1401 if (expect_false (op->resist[i] != arch->resist[i]))
1346 f.put (resist_save[i], op->resist[i]); 1402 f.put (resist_save[i], op->resist[i]);
1347 1403
1348 CMP_OUT (path_attuned); 1404 CMP_OUT (path_attuned);
1349 CMP_OUT (path_repelled); 1405 CMP_OUT (path_repelled);
1350 CMP_OUT (path_denied); 1406 CMP_OUT (path_denied);
1407
1351 CMP_OUT2 (material, materials);//TODO: nuke 1408 CMP_OUT2 (material, materials);//TODO: nuke
1352 CMP_OUT (materialname); 1409 if (op->material != arch->material)
1410 f.put (KW(materialname), op->material->name);
1411
1353 CMP_OUT (value); 1412 CMP_OUT (value);
1354 CMP_OUT (carrying); 1413 CMP_OUT (carrying);
1355 CMP_OUT (weight); 1414 CMP_OUT (weight);
1356 CMP_OUT (invisible); 1415 CMP_OUT (invisible);
1357 CMP_OUT (state); 1416 CMP_OUT (state);
… …
1360 CMP_OUT (last_sp); 1419 CMP_OUT (last_sp);
1361 CMP_OUT (last_grace); 1420 CMP_OUT (last_grace);
1362 CMP_OUT (last_eat); 1421 CMP_OUT (last_eat);
1363 CMP_OUT (glow_radius); 1422 CMP_OUT (glow_radius);
1364 1423
1365 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1424 if (op->flag [FLAG_IS_LINKED])
1425 if (auto (ol, op->find_link ()))
1366 f.put (KW_connected, i); 1426 f.put (KW(connected), ol->id);
1367 1427
1368 CMP_OUT (randomitems); 1428 CMP_OUT (randomitems);
1429
1369 CMP_OUT2 (container, weight_limit); 1430 CMP_OUT2 (container, weight_limit);
1370 1431
1371 CMP_OUT (run_away); 1432 CMP_OUT (run_away);
1372 CMP_OUT (pick_up); 1433 CMP_OUT (pick_up);
1373 CMP_OUT (will_apply); 1434 CMP_OUT (will_apply);
1374 CMP_OUT (smoothlevel); 1435 CMP_OUT (smoothlevel);
1375 CMP_OUT (weapontype); 1436 CMP_OUT (weapontype);
1376 CMP_OUT (tooltype);
1377 CMP_OUT (elevation);
1378 CMP_OUT (client_type); 1437 CMP_OUT (client_type);
1379 CMP_OUT (item_power); 1438 CMP_OUT (item_power);
1380 CMP_OUT (duration); 1439 CMP_OUT (duration);
1381 CMP_OUT (range); 1440 CMP_OUT (range);
1382 CMP_OUT (range_modifier); 1441 CMP_OUT (range_modifier);
… …
1390 CMP_OUT (move_on); 1449 CMP_OUT (move_on);
1391 CMP_OUT (move_off); 1450 CMP_OUT (move_off);
1392 CMP_OUT (move_slow); 1451 CMP_OUT (move_slow);
1393 CMP_OUT (move_slow_penalty); 1452 CMP_OUT (move_slow_penalty);
1394 1453
1395 if (op->flag != tmp->flag) 1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455
1456 if (diff [FLAG_OBJ_ORIGINAL])
1457 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1458
1459 diff.reset (FLAG_OBJ_ORIGINAL);
1460
1461 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ()))
1396 for (i = 0; i <= NUM_FLAGS; i++) 1463 for (int i = 0; i < NUM_FLAGS; i++)
1397 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1464 if (expect_false (diff [i]))
1398 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1465 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1399 1466
1400 // save body locations 1467 // save body locations. gcc's memcmp does an abysmal job when used
1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1402 if (op->slot[i].info != tmp->slot[i].info) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1403 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].save_name, op->slot[i].info);
1404} 1471}
1405 1472
1406/* 1473/*
1407 * Dumps all variables in an object to a file. 1474 * Dumps all variables in an object to a file.
… …
1409 * the only place this is not set is when saving the player. 1476 * the only place this is not set is when saving the player.
1410 */ 1477 */
1411bool 1478bool
1412object::write (object_freezer &f) 1479object::write (object_freezer &f)
1413{ 1480{
1414 /* Even if the object does have an owner, it would seem that we should 1481 if (expect_false (is_arch ()))
1415 * still save it. 1482 {
1416 */ 1483 f.put (KW(object), arch->archname);
1417 if (owner) 1484 write_diff (f, this, archetype::empty);
1418 return true; 1485 }
1419 1486 else
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1487 {
1421
1422 f.put (KW_arch, at->name); 1488 f.put (KW(arch), arch->archname);
1423 write_diff (f, this, &at->clone); 1489 write_diff (f, this, arch);
1490 }
1424 1491
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1492 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1493 tmp->write (f);
1427 1494
1428 f.put (this); 1495 f.put (this);
1429 f.put (KW_end); 1496 f.put (KW(end));
1430 1497
1431 return true; 1498 return true;
1432} 1499}
1433 1500
1434///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////
1435 1502
1436// generic resource file load, 1503// generic resource file load,
1437// currently supports: region, treasures, archetypes 1504// currently supports: region, treasures, archetypes
1505bool
1438bool load_resource_file (const char *filename) 1506load_resource_file_ (const char *filename)
1439{ 1507{
1440 object_thawer f (filename); 1508 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444
1445 f.next ();
1446 1509
1447 for (;;) 1510 for (;;)
1448 { 1511 {
1449 switch (f.kw) 1512 switch (f.kw)
1450 { 1513 {
1451 case KW_region: 1514 case KW_region:
1452 if (!region::read (f)) 1515 if (!region::read (f))
1453 goto finish; 1516 return false;
1454 break; 1517 break;
1455 1518
1456 case KW_treasure: 1519 case KW_treasure:
1457 case KW_treasureone: 1520 case KW_treasureone:
1458 if (!treasurelist::read (f)) 1521 if (!treasurelist::read (f))
1459 goto finish; 1522 return false;
1460 break; 1523 break;
1461 1524
1462 case KW_object: 1525 case KW_object:
1463 seen_arch = true;
1464 if (!archetype::read (f)) 1526 if (!archetype::read (f))
1465 goto finish; 1527 return false;
1466 break; 1528 break;
1467 1529
1468 case KW_EOF: 1530 case KW_EOF:
1469 success = true; 1531 return true;
1470 goto finish;
1471 1532
1472 default: 1533 default:
1473 if (!f.parse_error ("resource file")) 1534 if (!f.parse_error ("resource file"))
1474 goto finish; 1535 return false;
1475 1536
1476 f.next (); 1537 f.next ();
1477 break; 1538 break;
1478 } 1539 }
1479 } 1540 }
1480
1481finish:
1482 if (seen_arch)
1483 init_archetype_pointers ();
1484
1485 return success;
1486} 1541}
1487 1542

Diff Legend

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