ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.82 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.127 by root, Thu Jan 8 03:03:23 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
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 23
29#include <global.h> 24#include <global.h>
30#include <loader.h> 25#include <loader.h>
31#include <sproto.h> 26#include <sproto.h>
32 27
33///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
34 31
35/* This table is only necessary to convert objects that existed before the 32/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 33 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 34 * 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 35 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 165 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 166 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 167 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 168 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 169 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 170 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 171 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 172 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 173 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 174 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 175 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 247 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 248 "spell_glyph", /* 205 */
252 NULL 249 NULL
253}; 250};
254 251
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 252/* 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 253 * 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 254 * 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. 255 * to check for objects to make sure there are no common errors.
261 */ 256 */
262void 257void
263object::post_load_check () 258object::post_load_check ()
264{ 259{
260 if (type >= NUM_TYPES)
261 {
262 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0;
264 }
265
265 switch (type) 266 switch (type)
266 { 267 {
267 case BOW: 268 case BOW:
268 case WAND: 269 case WAND:
269 case ROD: 270 case ROD:
270 case HORN: 271 case HORN:
271 if (slot [body_range].info != -1) 272 if (slot [body_range].info != -1)
272 { 273 {
273 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 274 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
274 slot [body_range].info = -1; 275 slot [body_range].info = -1;
275 } 276 }
276 break; 277 break;
277 278
278 case WEAPON: 279 case WEAPON:
279 if (slot [body_combat].info != -1) 280 if (slot [body_combat].info != -1)
280 { 281 {
281 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 282 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
282 slot [body_combat].info = -1; 283 slot [body_combat].info = -1;
283 } 284 }
284 break; 285 break;
285 286
286 case SHIELD: 287 case SHIELD:
287 if (slot [body_shield].info != -1) 288 if (slot [body_shield].info != -1)
288 { 289 {
289 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 290 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
290 slot [body_shield].info = -1; 291 slot [body_shield].info = -1;
291 } 292 }
292 break; 293 break;
293 294
294 case PLAYER: 295 case PLAYER:
295 if (slot [body_shield].info != 1) 296 if (slot [body_shield].info != 1)
296 { 297 {
297 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 298 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
298 slot [body_shield].info = 1; 299 slot [body_shield].info = 1;
299 } 300 }
300 301
301 if (slot [body_combat].info != 1) 302 if (slot [body_combat].info != 1)
302 { 303 {
303 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 304 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
304 slot [body_combat].info = 1; 305 slot [body_combat].info = 1;
305 } 306 }
306 307
307 if (slot [body_range].info != 1) 308 if (slot [body_range].info != 1)
308 { 309 {
309 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 310 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
310 slot [body_range].info = 1; 311 slot [body_range].info = 1;
311 } 312 }
312 break; 313 break;
313 } 314 }
314 315
… …
319 * also have to catch is if this object is not using the normal name for 320 * also have to catch is if this object is not using the normal name for
320 * the object. In that case, we also want to use the loaded name. 321 * the object. In that case, we also want to use the loaded name.
321 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
322 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
323 */ 324 */
324 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 325 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
325 name_pl = 0; 326 name_pl = 0;
326 327
327 if (!name_pl) 328 if (!name_pl)
328 name_pl = name; 329 name_pl = name;
329 330
… …
337 * not in the ideal fashion. 338 * not in the ideal fashion.
338 */ 339 */
339 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
340 { 341 {
341 if (!skill) 342 if (!skill)
342 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
343 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 344 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
344 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 345 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
345 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
346 } 347 }
347 348
348 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
349 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
350 * that may have an old value. 351 * that may have an old value.
… …
356 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
357 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
358 { 359 {
359 if (last_heal) 360 if (last_heal)
360 { 361 {
361 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
362 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
363 last_heal = 0; 364 last_heal = 0;
364 } 365 }
365 366
366 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
367 368
368 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
369 if (!item_power && ip) 370 if (!item_power && ip)
370 { 371 {
371 if (ip > 3) 372 if (ip > 3)
372 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 373 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
373 374
374 item_power = ip; 375 item_power = ip;
375 } 376 }
376 377
377 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
378 * something that has item_power 1 is probably just fine if our calculated 379 * something that has item_power 1 is probably just fine if our calculated
379 * value is 1 or 2 - these values are small enough that hard to be precise. 380 * value is 1 or 2 - these values are small enough that hard to be precise.
380 * similarly, it item_power is 0, the first check will always pass, 381 * similarly, it item_power is 0, the first check will always pass,
381 * but not the second one. 382 * but not the second one.
382 */ 383 */
384#if 0 //TODO
383 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
384 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif
385 } 388 }
386 389
387 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
389 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
390 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
391 { 403 {
404 // TODO: fix firewall object on map
392 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
393 * in that spell was stored in sp. 406 * in that spell was stored in sp.
394 */ 407 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
395 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
396 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
397 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
398 } 412 }
399 413
400 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
401 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
402 { 416 {
417 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
403 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
404 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
406 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
407 value = arch->clone.value * inv->value; 422 value = arch->value * inv->value;
408 } 423 }
409 424
410 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
411 { 426 {
412 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
413 { 428 {
414 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 429 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
415 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
416 } 431 }
417 432
418 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
419 if (move_type == 0) 434 if (move_type == 0)
420 move_type = MOVE_WALK; 435 move_type = MOVE_WALK;
421 } 436 }
422 437
423 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 438 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
424 {
425 /* Object will duplicate it's content as part of the 439 /* Object will duplicate it's content as part of the
426 * generation process. To do this, we must flag inventory 440 * generation process. To do this, we must flag inventory
427 * so it remains unevaluated concerning the randomitems and 441 * so it remains unevaluated concerning the randomitems and
428 * the living (a demonlord shouldn't cast from inside generator!) 442 * the living (a demonlord shouldn't cast from inside generator!)
429 */ 443 */
444 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
430 flag_inv (this, FLAG_IS_A_TEMPLATE); 445 flag_inv (this, FLAG_IS_A_TEMPLATE);
431 }
432 446
433 /* Handle player movers. We use move_type for player movers 447 /* Handle player movers. We use move_type for player movers
434 * because they operate on their own time (move_on 448 * because they operate on their own time (move_on
435 * would potentially cause them to be triggered when someone steps 449 * would potentially cause them to be triggered when someone steps
436 * on them). If move_type is set, presume person knows what they 450 * on them). If move_type is set, presume person knows what they
437 * are doing, otherwise, set move_type based on maxhp value. 451 * are doing, otherwise, set move_type based on maxhp value.
438 */ 452 */
439 if (type == PLAYERMOVER) 453 if (type == PLAYERMOVER)
440 { 454 {
441 if (!move_type) 455 if (!move_type)
… …
503 517
504 goto next; 518 goto next;
505 } 519 }
506 } 520 }
507 521
508 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 522 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
509 523
510next: ; 524next: ;
511 } 525 }
512} 526}
513 527
514#define GET_FLAG(op,flag) \ 528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
515 if (f.get_sint32 ()) \
516 SET_FLAG (op, flag); \
517 else \
518 CLEAR_FLAG (op, flag) \
519 529
520bool 530bool
521object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
522{ 532{
523 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
524 535
525 for (;;) 536 for (;;)
526 { 537 {
527 switch (f.kw) 538 switch (f.kw)
528 { 539 {
529 case KW_uuid: 540 case KW_uuid:
530 if (const char *s = f.get_str ()) 541 if (const char *s = f.get_str ())
531 { 542 if (!uuid.parse (s))
532 unsigned int version;
533 unsigned long long seq;
534
535 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
536 { 543 {
537 uuid.seq = seq; 544 f.parse_warn ("unparseable uuid");
538 break; 545 uuid = UUID::gen ();
539 } 546 }
540 }
541
542 uuid = gen_uuid ();
543 break; 547 break;
544 548
545 case KW_oid: 549 case KW_oid:
546 f.get (this, f.get_sint32 ()); 550 f.get (this, f.get_sint32 ());
547 break; 551 break;
… …
553 557
554 case KW_attach: f.get_ornull (attach); break; 558 case KW_attach: f.get_ornull (attach); break;
555 case KW_skill: f.get_ornull (skill); break; 559 case KW_skill: f.get_ornull (skill); break;
556 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
557 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
562 case KW_tag: f.get_ornull (tag); break;
558 563
559 case KW_arch: 564 case KW_arch:
560 {
561 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
562 tmp->deactivate ();
563
564 { 566 {
567 tmp->deactivate ();
568
565 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
566 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
567 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
568 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects
569 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
570 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
571 576
572 if (!op_inv) 577 if (!op_inv)
573 { 578 {
… …
585 590
586 tmp->below = 0; 591 tmp->below = 0;
587 tmp->env = this; 592 tmp->env = this;
588 op_inv = tmp; 593 op_inv = tmp;
589 } 594 }
590 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
591 continue; 598 continue;
592 599
593 case KW_other_arch: 600 case KW_other_arch:
594 other_arch =
595 loading_arch 601 if (loading_arch == this)
596 ? archetype::get (f.get_str ()) 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
603 else
604 {
597 : archetype::find (f.get_str ()); 605 other_arch = archetype::find (f.get_str ());
598 606
599 if (!other_arch) 607 if (!other_arch)
600 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 608 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
609 }
610 break;
611
612 case KW_owner:
613 f.delayed_deref (this, owner, f.get_str ());
601 break; 614 break;
602 615
603 case KW_animation: 616 case KW_animation:
604 { 617 {
605 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
606 animation_id = 0; 619 animation_id = 0;
607 620
608 const char *str = f.get_str (); 621 const char *str = f.get_str ();
609 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
610 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
611 } 624 }
612 break; 625 break;
613 626
614 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
615 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
632 f.get (move_slow_penalty); 645 f.get (move_slow_penalty);
633 break; 646 break;
634 647
635 case KW_face: 648 case KW_face:
636 face = face_find (f.get_str ()); 649 face = face_find (f.get_str ());
650 break;
651
652 case KW_sound:
653 sound = sound_find (f.get_str ());
654 if (!sound)
655 f.parse_warn ("sound not found");
656 break;
657
658 case KW_sound_destroy:
659 sound_destroy = sound_find (f.get_str ());
660 if (!sound_destroy)
661 f.parse_warn ("sound not found");
637 break; 662 break;
638 663
639 case KW_x: f.get (x); break; 664 case KW_x: f.get (x); break;
640 case KW_y: f.get (y); break; 665 case KW_y: f.get (y); break;
641 666
… …
769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 794 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
770 795
771 break; 796 break;
772 797
773 case KW_friendly: 798 case KW_friendly:
774 if (f.get_sint32 ()) 799 if (f.get_bool ())
775 if (type != PLAYER) 800 if (type != PLAYER)
776 add_friendly_object (this); 801 add_friendly_object (this);
777 802
778 break; 803 break;
779 804
… …
792 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 817 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
793 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 818 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
794 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 819 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
795 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 820 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
796 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 821 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
822 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
797 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 823 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
798 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 824 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
799 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 825 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
800 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 826 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
801 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 827 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
904 case KW_attack_movement: f.get (attack_movement); break; 930 case KW_attack_movement: f.get (attack_movement); break;
905 case KW_move_state: f.get (move_status); break; 931 case KW_move_state: f.get (move_status); break;
906 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
907 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
908 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
909 case KW_tooltype: f.get (tooltype); break;
910 case KW_casting_time: f.get (casting_time); break; 935 case KW_casting_time: f.get (casting_time); break;
936
937 // elevation is deprecated
911 case KW_elevation: f.get (elevation); break; 938 case KW_elevation: break;
939
912 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 940 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
913 case KW_client_type: f.get (client_type); break; 941 case KW_client_type: f.get (client_type); break;
914 case KW_duration: f.get (duration); break; 942 case KW_duration: f.get (duration); break;
915 case KW_range: f.get (range); break; 943 case KW_range: f.get (range); break;
916 case KW_range_modifier: f.get (range_modifier); break; 944 case KW_range_modifier: f.get (range_modifier); break;
… …
935 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
936 case KW_can_apply: 964 case KW_can_apply:
937 break; 965 break;
938 966
939 case KW_connected: 967 case KW_connected:
940 add_button_link (this, map, f.get_sint32 ()); 968 {
969 shstr connected;
970
971 f.get (connected);
972 add_link (map, connected);
973 }
941 break; 974 break;
942 975
943 case KW_randomitems: 976 case KW_randomitems:
944 if (f.get_str ()) 977 if (f.get_str ())
945 { 978 {
… …
955 randomitems = 0; 988 randomitems = 0;
956 break; 989 break;
957 990
958 case KW_msg: 991 case KW_msg:
959 f.get_ml (KW_endmsg, msg); 992 f.get_ml (KW_endmsg, msg);
960 //TODO: allow longer messages
961 if (strlen (msg) >= HUGE_BUF)
962 {
963 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
964 msg = "ERROR, please report: string too long, winged.\n";
965 }
966 break; 993 break;
967 994
968 case KW_lore: 995 case KW_lore:
969 f.get_ml (KW_endlore, lore); 996 f.get_ml (KW_endlore, lore);
970 //TODO: allow longer messages
971 /* Just print a warning so we can be reasonably safe
972 * about not overflowing the buffer.
973 */
974 if (strlen (lore) > (HUGE_BUF / 2))
975 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
976 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
977 break; 997 break;
978 998
979 case KW_editable: 999 case KW_editable:
980 case KW_editor_folder: 1000 case KW_editor_folder:
981 break; 1001 break;
… …
986 1006
987 f.next (); 1007 f.next ();
988 return true; 1008 return true;
989 1009
990 case KW_ERROR: 1010 case KW_ERROR:
991 set_ob_key_value (this, f.kw_str, f.value, true); 1011 // append as key value pair (do not use kv_set as it prepends)
1012 // we also do not even try to find old values, duplicate keys stay duplicate
1013 {
1014 key_value *kv = new key_value;
1015
1016 kv->next = 0;
1017 kv->key = shstr (f.kw_str);
1018 kv->value = shstr (f.value);
1019
1020 if (!last_kv)
1021 key_values = last_kv = kv;
1022 else
1023 {
1024 while (last_kv->next)
1025 last_kv = last_kv->next;
1026
1027 last_kv->next = kv;
1028 last_kv = kv;
1029 }
1030 }
992 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1031 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
993 break; 1032 break;
994 1033
995 default: 1034 default:
996 if (!f.parse_error ("object", name)) 1035 if (!f.parse_error ("object", name))
… …
1017 1056
1018 assert (arch); //D maybe use exception handling of sorts? 1057 assert (arch); //D maybe use exception handling of sorts?
1019 1058
1020 f.next (); 1059 f.next ();
1021 1060
1022 object *op = object::create (); 1061 object *op = arch->instance ();
1023
1024 op->map = map; 1062 op->map = map;
1025 arch->clone.copy_to (op);
1026 // copy_to activates, this should be fixed properly 1063 // instance() activates, this should be fixed properly
1027 op->deactivate (); 1064 op->deactivate ();
1028 1065
1029 if (!op->parse_kv (f)) 1066 if (!op->parse_kv (f))
1030 { 1067 {
1031 op->destroy (true); 1068 op->destroy ();
1032 return 0; 1069 return 0;
1033 } 1070 }
1034 1071
1035 op->post_load_check (); 1072 op->post_load_check ();
1036 return op; 1073 return op;
… …
1045int 1082int
1046set_variable (object *op, char *buf) 1083set_variable (object *op, char *buf)
1047{ 1084{
1048 object_thawer f (buf, (AV *)0); 1085 object_thawer f (buf, (AV *)0);
1049 1086
1050 f.next ();
1051 return op->parse_kv (f); 1087 return op->parse_kv (f);
1052} 1088}
1053 1089
1054/* This returns a string of the integer movement type */ 1090/* This returns a string of the integer movement type */
1055#if 0 1091#if 0
… …
1242 /* 110 */ 1278 /* 110 */
1243 KW_destroy_on_death, 1279 KW_destroy_on_death,
1244 KW_NULL, 1280 KW_NULL,
1245 }; 1281 };
1246 1282
1247 int i;
1248
1249 /* This saves the key/value lists. We do it first so that any 1283 /* This saves the key/value lists. We do it first so that any
1250 * keys that match field names will be overwritten by the loader. 1284 * keys that match field names will be overwritten by the loader.
1251 */ 1285 */
1252 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1286 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 { 1287 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1254 /* Find the field in the opposing member. */ 1288 f.put (kv->key, kv->value);
1255 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256
1257 /* If there's no partnering field, or it's got a different value, save our field. */
1258 if (!arch_field || my_field->value != arch_field->value)
1259 f.put (my_field->key, my_field->value);
1260 }
1261 1289
1262 /* We don't need to worry about the arch's extra fields - they 1290 /* We don't need to worry about the arch's extra fields - they
1263 * will get taken care of the copy_to method. 1291 * will get taken care of the copy_to method.
1264 */ 1292 */
1265 1293
1266 { 1294 f.put (KW_uuid, op->uuid.c_str ());
1267 char uids[64];
1268 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1269 f.put (KW_uuid, (const char *)uids);
1270 }
1271 1295
1272#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1296#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1273#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1297#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1298
1299 if (object *owner = op->owner)
1300 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1274 1301
1275 CMP_OUT (name); 1302 CMP_OUT (name);
1276 CMP_OUT (name_pl); 1303 CMP_OUT (name_pl);
1277 CMP_OUT (custom_name); 1304 CMP_OUT (custom_name);
1278 CMP_OUT (title); 1305 CMP_OUT (title);
1279 CMP_OUT (race); 1306 CMP_OUT (race);
1307 CMP_OUT (skill);
1280 CMP_OUT (slaying); 1308 CMP_OUT (slaying);
1281 1309 CMP_OUT (tag);
1282 if (op->msg != tmp->msg)
1283 f.put (KW_msg, KW_endmsg, op->msg);
1284 if (op->lore != tmp->lore)
1285 f.put (KW_lore, KW_endlore, op->lore);
1286
1287 CMP_OUT (other_arch); 1310 CMP_OUT (other_arch);
1288 1311
1312 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1313 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1314
1289 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1315 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1316 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1317 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1318
1291 if (op->animation_id != tmp->animation_id) 1319 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1320 if (op->animation_id)
1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1322 else
1293 { 1323 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1324 f.put (KW_animation, (const char *)0);
1295 1325 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32) 0);
1298 } 1326 }
1299 else
1300 f.put (KW_animation, (const char *) 0);
1301 1327
1302 CMP_OUT2 (str, stats.Str); 1328 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1329 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1330 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1331 CMP_OUT2 (wis, stats.Wis);
… …
1335 CMP_OUT (direction); 1361 CMP_OUT (direction);
1336 CMP_OUT (type); 1362 CMP_OUT (type);
1337 CMP_OUT (subtype); 1363 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1364 CMP_OUT (attacktype);
1339 1365
1340 for (i = 0; i < NROFATTACKS; i++) 1366 for (int i = 0; i < NROFATTACKS; i++)
1341 if (op->resist[i] != tmp->resist[i]) 1367 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1368 f.put (resist_save[i], op->resist[i]);
1343 1369
1344 CMP_OUT (path_attuned); 1370 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1371 CMP_OUT (path_repelled);
1346 CMP_OUT (path_denied); 1372 CMP_OUT (path_denied);
… …
1356 CMP_OUT (last_sp); 1382 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1383 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1384 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1385 CMP_OUT (glow_radius);
1360 1386
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1387 if (op->flag [FLAG_IS_LINKED])
1388 if (auto (ol, op->find_link ()))
1362 f.put (KW_connected, i); 1389 f.put (KW_connected, ol->id);
1363 1390
1364 CMP_OUT (randomitems); 1391 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1392 CMP_OUT2 (container, weight_limit);
1366 1393
1367 CMP_OUT (run_away); 1394 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1395 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1396 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1397 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1398 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1399 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1400 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1401 CMP_OUT (duration);
1377 CMP_OUT (range); 1402 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1403 CMP_OUT (range_modifier);
… …
1387 CMP_OUT (move_off); 1412 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1413 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1414 CMP_OUT (move_slow_penalty);
1390 1415
1391 if (op->flag != tmp->flag) 1416 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1417 for (int i = 0; i <= NUM_FLAGS; i++)
1393 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1418 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1419 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1420
1396 // save body locations 1421 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1422 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (op->slot[i].info != tmp->slot[i].info) 1423 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1424 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1425}
1401 1426
1402/* 1427/*
1403 * Dumps all variables in an object to a file. 1428 * Dumps all variables in an object to a file.
… …
1405 * the only place this is not set is when saving the player. 1430 * the only place this is not set is when saving the player.
1406 */ 1431 */
1407bool 1432bool
1408object::write (object_freezer &f) 1433object::write (object_freezer &f)
1409{ 1434{
1410 /* Even if the object does have an owner, it would seem that we should 1435 archetype *at = arch ? arch : archetype::empty;
1411 * still save it.
1412 */
1413 if (owner)
1414 return true;
1415 1436
1416 archetype *at = arch ? (archetype *)arch : empty_archetype;
1417
1418 f.put (KW_arch, at->name); 1437 f.put (KW_arch, at->archname);
1419 write_diff (f, this, &at->clone); 1438 write_diff (f, this, at);
1420 1439
1421 for (object *tmp = inv; tmp; tmp = tmp->below) 1440 for (object *tmp = inv; tmp; tmp = tmp->below)
1422 tmp->write (f); 1441 tmp->write (f);
1423 1442
1424 f.put (this); 1443 f.put (this);
… …
1429 1448
1430///////////////////////////////////////////////////////////////////////////// 1449/////////////////////////////////////////////////////////////////////////////
1431 1450
1432// generic resource file load, 1451// generic resource file load,
1433// currently supports: region, treasures, archetypes 1452// currently supports: region, treasures, archetypes
1453bool
1434bool load_resource_file (const char *filename) 1454load_resource_file_ (const char *filename)
1435{ 1455{
1436 object_thawer f (filename); 1456 object_thawer f (filename);
1437
1438 bool success = false;
1439 bool seen_arch = false;
1440
1441 f.next ();
1442 1457
1443 for (;;) 1458 for (;;)
1444 { 1459 {
1445 switch (f.kw) 1460 switch (f.kw)
1446 { 1461 {
1447 case KW_region: 1462 case KW_region:
1448 if (!region::read (f)) 1463 if (!region::read (f))
1449 goto finish; 1464 return false;
1450 break; 1465 break;
1451 1466
1452 case KW_treasure: 1467 case KW_treasure:
1453 case KW_treasureone: 1468 case KW_treasureone:
1454 if (!treasurelist::read (f)) 1469 if (!treasurelist::read (f))
1455 goto finish; 1470 return false;
1456 break; 1471 break;
1457 1472
1458 case KW_object: 1473 case KW_object:
1459 seen_arch = true;
1460 if (!archetype::read (f)) 1474 if (!archetype::read (f))
1461 goto finish; 1475 return false;
1462 break; 1476 break;
1463 1477
1464 case KW_EOF: 1478 case KW_EOF:
1465 success = true; 1479 return true;
1466 goto finish;
1467 1480
1468 default: 1481 default:
1469 if (!f.parse_error ("resource file")) 1482 if (!f.parse_error ("resource file"))
1470 goto finish; 1483 return false;
1471 1484
1472 f.next (); 1485 f.next ();
1473 break; 1486 break;
1474 } 1487 }
1475 } 1488 }
1476
1477finish:
1478 if (seen_arch)
1479 init_archetype_pointers ();
1480
1481 return success;
1482} 1489}
1483 1490

Diff Legend

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