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.78 by root, Mon May 7 06:01:47 2007 UTC vs.
Revision 1.110 by root, Sun Apr 20 05:24:55 2008 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 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
29#include <global.h> 28#include <global.h>
30#include <loader.h> 29#include <loader.h>
31#include <sproto.h> 30#include <sproto.h>
32 31
33///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
34 35
35/* This table is only necessary to convert objects that existed before the 36/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 38 * 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 39 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
252 NULL 253 NULL
253}; 254};
254 255
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 256/* 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 257 * 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 258 * 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. 259 * to check for objects to make sure there are no common errors.
261 */ 260 */
262void 261void
263object::post_load_check () 262object::post_load_check ()
264{ 263{
265 // as a kind of a hack, we now adjust the range, shield and combat slots 264 if (type >= NUM_TYPES)
265 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0;
268 }
269
266 switch (type) 270 switch (type)
267 { 271 {
268 case BOW: 272 case BOW:
269 case WAND: 273 case WAND:
270 case ROD: 274 case ROD:
271 case HORN: 275 case HORN:
272 case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons
273 case SKILL_TOOL:
274 if (slot [body_range].info != 1) 276 if (slot [body_range].info != -1)
275 { 277 {
276 LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
277 slot [body_range].info = 1; 279 slot [body_range].info = -1;
278 } 280 }
279 break; 281 break;
280 282
281 case WEAPON: 283 case WEAPON:
282 if (slot [body_combat].info != 1) 284 if (slot [body_combat].info != -1)
283 { 285 {
284 LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
285 slot [body_combat].info = 1; 287 slot [body_combat].info = -1;
286 } 288 }
287 break; 289 break;
288 290
289 case SHIELD: 291 case SHIELD:
290 if (slot [body_shield].info != 1) 292 if (slot [body_shield].info != -1)
291 { 293 {
292 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
293 slot [body_shield].info = 1; 295 slot [body_shield].info = -1;
294 } 296 }
295 break; 297 break;
296 298
297 case PLAYER: 299 case PLAYER:
298 if (slot [body_shield].info != 1) 300 if (slot [body_shield].info != 1)
299 { 301 {
300 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
301 slot [body_shield].info = 1; 303 slot [body_shield].info = 1;
302 } 304 }
303 305
304 if (slot [body_combat].info != 1) 306 if (slot [body_combat].info != 1)
305 { 307 {
306 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_combat].info); 308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
307 slot [body_combat].info = 1; 309 slot [body_combat].info = 1;
310 }
311
312 if (slot [body_range].info != 1)
313 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1;
308 } 316 }
309 break; 317 break;
310 } 318 }
311 319
312 /* We do some specialised handling to handle legacy cases of name_pl. 320 /* We do some specialised handling to handle legacy cases of name_pl.
… …
316 * also have to catch is if this object is not using the normal name for 324 * also have to catch is if this object is not using the normal name for
317 * the object. In that case, we also want to use the loaded name. 325 * the object. In that case, we also want to use the loaded name.
318 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 328 */
321 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
322 name_pl = 0; 330 name_pl = 0;
323 331
324 if (!name_pl) 332 if (!name_pl)
325 name_pl = name; 333 name_pl = name;
326 334
327 /* objects now have a materialname. try to patch it in */ 335 /* objects now have a materialname. try to patch it in */
328 if (!(is_weapon () && level > 0)) 336 if (!(is_weapon () && level > 0))
329 {
330 if (map != NULL)
331 set_materialname (this, map->difficulty, NULL); 337 set_materialname (this, map ? map->difficulty : 5, 0);
332 else
333 set_materialname (this, 5, NULL);
334 }
335 338
336 /* only do these when program is first run - a bit 339 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 340 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 341 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 342 * not in the ideal fashion.
… …
358 || type == AMULET || type == GIRDLE 361 || type == AMULET || type == GIRDLE
359 || type == BRACERS || type == CLOAK) 362 || type == BRACERS || type == CLOAK)
360 { 363 {
361 if (last_heal) 364 if (last_heal)
362 { 365 {
363 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 366 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
364 gen_sp_armour = last_heal; 367 gen_sp_armour = last_heal;
365 last_heal = 0; 368 last_heal = 0;
366 } 369 }
367 370
368 int ip = calc_item_power (this, 0); 371 int ip = calc_item_power (this, 0);
… …
380 * something that has item_power 1 is probably just fine if our calculated 383 * something that has item_power 1 is probably just fine if our calculated
381 * value is 1 or 2 - these values are small enough that hard to be precise. 384 * value is 1 or 2 - these values are small enough that hard to be precise.
382 * similarly, it item_power is 0, the first check will always pass, 385 * similarly, it item_power is 0, the first check will always pass,
383 * but not the second one. 386 * but not the second one.
384 */ 387 */
388#if 0 //TODO
385 if (ip > 2 * item_power && ip > (item_power + 3)) 389 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif
387 } 392 }
388 393
389 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
390 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
391 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
392 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
393 { 398 {
394 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
395 * in that spell was stored in sp. 400 * in that spell was stored in sp.
396 */ 401 */
402 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
397 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
398 insert_ob_in_ob (tmp, this); 404 insert_ob_in_ob (tmp, this);
399 randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
400 } 406 }
401 407
402 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
403 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
404 { 410 {
411 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
405 object *tmp = get_archetype_by_object_name (slaying); 412 object *tmp = get_archetype_by_object_name (slaying);
406 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
407 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = NULL; /* So another spell isn't created for this object */
408 /* without this, value is all screwed up */ 415 /* without this, value is all screwed up */
409 value = arch->clone.value * inv->value; 416 value = arch->value * inv->value;
410 } 417 }
411 418
412 if (QUERY_FLAG (this, FLAG_MONSTER)) 419 if (QUERY_FLAG (this, FLAG_MONSTER))
413 { 420 {
414 if (stats.hp > stats.maxhp) 421 if (stats.hp > stats.maxhp)
415 { 422 {
416 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 423 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
417 stats.maxhp = stats.hp; 424 stats.maxhp = stats.hp;
418 } 425 }
419 426
420 /* The archs just need to be updated for this */ 427 /* The archs just need to be updated for this */
421 if (move_type == 0) 428 if (move_type == 0)
422 move_type = MOVE_WALK; 429 move_type = MOVE_WALK;
423 } 430 }
424 431
425 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 432 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
426 {
427 /* Object will duplicate it's content as part of the 433 /* Object will duplicate it's content as part of the
428 * generation process. To do this, we must flag inventory 434 * generation process. To do this, we must flag inventory
429 * so it remains unevaluated concerning the randomitems and 435 * so it remains unevaluated concerning the randomitems and
430 * the living (a demonlord shouldn't cast from inside generator!) 436 * the living (a demonlord shouldn't cast from inside generator!)
431 */ 437 */
438 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
432 flag_inv (this, FLAG_IS_A_TEMPLATE); 439 flag_inv (this, FLAG_IS_A_TEMPLATE);
433 }
434 440
435 /* Handle player movers. We use move_type for player movers 441 /* Handle player movers. We use move_type for player movers
436 * because they operate on their own time (move_on 442 * because they operate on their own time (move_on
437 * would potentially cause them to be triggered when someone steps 443 * would potentially cause them to be triggered when someone steps
438 * on them). If move_type is set, presume person knows what they 444 * on them). If move_type is set, presume person knows what they
439 * are doing, otherwise, set move_type based on maxhp value. 445 * are doing, otherwise, set move_type based on maxhp value.
440 */ 446 */
441 if (type == PLAYERMOVER) 447 if (type == PLAYERMOVER)
442 { 448 {
443 if (!move_type) 449 if (!move_type)
… …
505 511
506 goto next; 512 goto next;
507 } 513 }
508 } 514 }
509 515
510 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 516 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
511 517
512next: ; 518next: ;
513 } 519 }
514} 520}
515 521
516#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
517 if (f.get_sint32 ()) \
518 SET_FLAG (op, flag); \
519 else \
520 CLEAR_FLAG (op, flag) \
521 523
522bool 524bool
523object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
524{ 526{
525 object *op_inv = inv; 527 object *op_inv = inv;
… …
528 { 530 {
529 switch (f.kw) 531 switch (f.kw)
530 { 532 {
531 case KW_uuid: 533 case KW_uuid:
532 if (const char *s = f.get_str ()) 534 if (const char *s = f.get_str ())
533 { 535 if (!uuid.parse (s))
534 unsigned int version;
535 unsigned long long seq;
536
537 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
538 { 536 {
539 uuid.seq = seq; 537 f.parse_warn ("unparseable uuid");
540 break; 538 uuid = UUID::gen ();
541 } 539 }
542 }
543
544 uuid = gen_uuid ();
545 break; 540 break;
546 541
547 case KW_oid: 542 case KW_oid:
548 f.get (this, f.get_sint32 ()); 543 f.get (this, f.get_sint32 ());
549 break; 544 break;
… …
555 550
556 case KW_attach: f.get_ornull (attach); break; 551 case KW_attach: f.get_ornull (attach); break;
557 case KW_skill: f.get_ornull (skill); break; 552 case KW_skill: f.get_ornull (skill); break;
558 case KW_race: f.get_ornull (race); break; 553 case KW_race: f.get_ornull (race); break;
559 case KW_slaying: f.get_ornull (slaying); break; 554 case KW_slaying: f.get_ornull (slaying); break;
555 case KW_tag: f.get_ornull (tag); break;
560 556
561 case KW_arch: 557 case KW_arch:
562 { 558 {
563 object *tmp = object::read (f); 559 object *tmp = object::read (f);
564 tmp->deactivate (); 560 tmp->deactivate ();
… …
566 { 562 {
567 // was: insert_ob_in_ob (tmp, op); 563 // was: insert_ob_in_ob (tmp, op);
568 // but manually adding it can improve map loading times a lot 564 // but manually adding it can improve map loading times a lot
569 // also, appending instead of prepending keeps the 565 // also, appending instead of prepending keeps the
570 // save ordering the same between repeated load/saves. 566 // save ordering the same between repeated load/saves.
567 // and finally we do not want any funny effects
571 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 568 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
572 CLEAR_FLAG (tmp, FLAG_REMOVED); 569 CLEAR_FLAG (tmp, FLAG_REMOVED);
573 570
574 if (!op_inv) 571 if (!op_inv)
575 { 572 {
… …
591 } 588 }
592 } 589 }
593 continue; 590 continue;
594 591
595 case KW_other_arch: 592 case KW_other_arch:
596 other_arch =
597 loading_arch 593 if (loading_arch == this)
598 ? archetype::get (f.get_str ()) 594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
595 else
596 {
599 : archetype::find (f.get_str ()); 597 other_arch = archetype::find (f.get_str ());
600 598
601 if (!other_arch) 599 if (!other_arch)
602 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 600 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
601 }
602 break;
603
604 case KW_owner:
605 f.delayed_deref (this, owner, f.get_str ());
603 break; 606 break;
604 607
605 case KW_animation: 608 case KW_animation:
606 { 609 {
607 CLEAR_FLAG (this, FLAG_ANIMATE); 610 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
634 f.get (move_slow_penalty); 637 f.get (move_slow_penalty);
635 break; 638 break;
636 639
637 case KW_face: 640 case KW_face:
638 face = face_find (f.get_str ()); 641 face = face_find (f.get_str ());
642 break;
643
644 case KW_sound:
645 sound = sound_find (f.get_str ());
646 if (!sound)
647 f.parse_warn ("sound not found");
648 break;
649
650 case KW_sound_destroy:
651 sound_destroy = sound_find (f.get_str ());
652 if (!sound_destroy)
653 f.parse_warn ("sound not found");
639 break; 654 break;
640 655
641 case KW_x: f.get (x); break; 656 case KW_x: f.get (x); break;
642 case KW_y: f.get (y); break; 657 case KW_y: f.get (y); break;
643 658
… …
770 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 785 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
771 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 786 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
772 787
773 break; 788 break;
774 789
775 case KW_wiz:
776 GET_FLAG (this, FLAG_WIZ);
777 //TODO: move to check_object
778 if (QUERY_FLAG (this, FLAG_WIZ))
779 {
780 SET_FLAG (this, FLAG_WAS_WIZ);
781 SET_FLAG (this, FLAG_WIZPASS);
782 SET_FLAG (this, FLAG_WIZCAST);
783 }
784 else
785 {
786 CLEAR_FLAG (this, FLAG_WIZPASS);
787 CLEAR_FLAG (this, FLAG_WIZCAST);
788 }
789 break;
790
791 case KW_friendly: 790 case KW_friendly:
792 if (f.get_sint32 ()) 791 if (f.get_bool ())
793 if (type != PLAYER) 792 if (type != PLAYER)
794 add_friendly_object (this); 793 add_friendly_object (this);
795 794
796 break; 795 break;
797 796
… …
810 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
811 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 810 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
812 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
813 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
814 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 813 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
814 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
826 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 826 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
827 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 827 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
828 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 828 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
829 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 829 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
830 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 830 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
831 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
832 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 831 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
833 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
834 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
835 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 834 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
836 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
974 randomitems = 0; 973 randomitems = 0;
975 break; 974 break;
976 975
977 case KW_msg: 976 case KW_msg:
978 f.get_ml (KW_endmsg, msg); 977 f.get_ml (KW_endmsg, msg);
979 //TODO: allow longer messages
980 if (strlen (msg) >= HUGE_BUF)
981 {
982 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
983 msg = "ERROR, please report: string too long, winged.\n";
984 }
985 break; 978 break;
986 979
987 case KW_lore: 980 case KW_lore:
988 f.get_ml (KW_endlore, lore); 981 f.get_ml (KW_endlore, lore);
989 //TODO: allow longer messages
990 /* Just print a warning so we can be reasonably safe
991 * about not overflowing the buffer.
992 */
993 if (strlen (lore) > (HUGE_BUF / 2))
994 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
995 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
996 break; 982 break;
997 983
998 case KW_editable: 984 case KW_editable:
999 case KW_editor_folder: 985 case KW_editor_folder:
1000 break; 986 break;
… …
1039 f.next (); 1025 f.next ();
1040 1026
1041 object *op = object::create (); 1027 object *op = object::create ();
1042 1028
1043 op->map = map; 1029 op->map = map;
1044 arch->clone.copy_to (op); 1030 arch->copy_to (op);
1045 // copy_to activates, this should be fixed properly 1031 // copy_to activates, this should be fixed properly
1046 op->deactivate (); 1032 op->deactivate ();
1047 1033
1048 if (!op->parse_kv (f)) 1034 if (!op->parse_kv (f))
1049 { 1035 {
… …
1064int 1050int
1065set_variable (object *op, char *buf) 1051set_variable (object *op, char *buf)
1066{ 1052{
1067 object_thawer f (buf, (AV *)0); 1053 object_thawer f (buf, (AV *)0);
1068 1054
1069 f.next ();
1070 return op->parse_kv (f); 1055 return op->parse_kv (f);
1071} 1056}
1072 1057
1073/* This returns a string of the integer movement type */ 1058/* This returns a string of the integer movement type */
1074#if 0 1059#if 0
… …
1136 * the 15'th element of this array should match that name. 1121 * the 15'th element of this array should match that name.
1137 * If an entry is NULL, that is a flag not to loaded/saved. 1122 * If an entry is NULL, that is a flag not to loaded/saved.
1138 */ 1123 */
1139 static const keyword flag_names [NUM_FLAGS] = { 1124 static const keyword flag_names [NUM_FLAGS] = {
1140 KW_alive, 1125 KW_alive,
1141 KW_wiz,
1142 KW_NULL, 1126 KW_NULL,
1143 KW_NULL, 1127 KW_NULL,
1144 KW_was_wiz, 1128 KW_NULL,
1129 KW_NULL,
1145 KW_applied, 1130 KW_applied,
1146 KW_unpaid, 1131 KW_unpaid,
1147 KW_can_use_shield, 1132 KW_can_use_shield,
1148 KW_no_pick, 1133 KW_no_pick,
1149 KW_NULL, // walk_on 1134 KW_NULL, // walk_on
… …
1280 1265
1281 /* We don't need to worry about the arch's extra fields - they 1266 /* We don't need to worry about the arch's extra fields - they
1282 * will get taken care of the copy_to method. 1267 * will get taken care of the copy_to method.
1283 */ 1268 */
1284 1269
1285 { 1270 f.put (KW_uuid, op->uuid.c_str ());
1286 char uids[64];
1287 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1288 f.put (KW_uuid, (const char *)uids);
1289 }
1290 1271
1291#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1272#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1292#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1273#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1274
1275 if (object *owner = op->owner)
1276 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1293 1277
1294 CMP_OUT (name); 1278 CMP_OUT (name);
1295 CMP_OUT (name_pl); 1279 CMP_OUT (name_pl);
1296 CMP_OUT (custom_name); 1280 CMP_OUT (custom_name);
1297 CMP_OUT (title); 1281 CMP_OUT (title);
1298 CMP_OUT (race); 1282 CMP_OUT (race);
1299 CMP_OUT (slaying); 1283 CMP_OUT (slaying);
1300 1284 CMP_OUT (tag);
1301 if (op->msg != tmp->msg)
1302 f.put (KW_msg, KW_endmsg, op->msg);
1303 if (op->lore != tmp->lore)
1304 f.put (KW_lore, KW_endlore, op->lore);
1305
1306 CMP_OUT (other_arch); 1285 CMP_OUT (other_arch);
1307 1286
1287 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1288 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1289
1308 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1290 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1291 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1292 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1309 1293
1310 if (op->animation_id != tmp->animation_id) 1294 if (op->animation_id != tmp->animation_id)
1311 if (op->animation_id) 1295 if (op->animation_id)
1312 { 1296 {
1313 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1314 1298
1315 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1316 f.put (KW_is_animated, (sint32) 0); 1300 f.put (KW_is_animated, (sint32)0);
1317 } 1301 }
1318 else 1302 else
1319 f.put (KW_animation, (const char *) 0); 1303 f.put (KW_animation, (const char *)0);
1320 1304
1321 CMP_OUT2 (str, stats.Str); 1305 CMP_OUT2 (str, stats.Str);
1322 CMP_OUT2 (dex, stats.Dex); 1306 CMP_OUT2 (dex, stats.Dex);
1323 CMP_OUT2 (con, stats.Con); 1307 CMP_OUT2 (con, stats.Con);
1324 CMP_OUT2 (wis, stats.Wis); 1308 CMP_OUT2 (wis, stats.Wis);
… …
1355 CMP_OUT (type); 1339 CMP_OUT (type);
1356 CMP_OUT (subtype); 1340 CMP_OUT (subtype);
1357 CMP_OUT (attacktype); 1341 CMP_OUT (attacktype);
1358 1342
1359 for (i = 0; i < NROFATTACKS; i++) 1343 for (i = 0; i < NROFATTACKS; i++)
1360 if (op->resist[i] != tmp->resist[i]) 1344 if (expect_false (op->resist[i] != tmp->resist[i]))
1361 f.put (resist_save[i], op->resist[i]); 1345 f.put (resist_save[i], op->resist[i]);
1362 1346
1363 CMP_OUT (path_attuned); 1347 CMP_OUT (path_attuned);
1364 CMP_OUT (path_repelled); 1348 CMP_OUT (path_repelled);
1365 CMP_OUT (path_denied); 1349 CMP_OUT (path_denied);
… …
1407 CMP_OUT (move_slow); 1391 CMP_OUT (move_slow);
1408 CMP_OUT (move_slow_penalty); 1392 CMP_OUT (move_slow_penalty);
1409 1393
1410 if (op->flag != tmp->flag) 1394 if (op->flag != tmp->flag)
1411 for (i = 0; i <= NUM_FLAGS; i++) 1395 for (i = 0; i <= NUM_FLAGS; i++)
1412 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1396 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1413 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1397 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1414 1398
1415 // save body locations 1399 // save body locations
1416 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1400 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1417 if (op->slot[i].info != tmp->slot[i].info) 1401 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1418 f.put (body_locations[i].save_name, op->slot[i].info); 1402 f.put (body_locations[i].save_name, op->slot[i].info);
1419} 1403}
1420 1404
1421/* 1405/*
1422 * Dumps all variables in an object to a file. 1406 * Dumps all variables in an object to a file.
… …
1424 * the only place this is not set is when saving the player. 1408 * the only place this is not set is when saving the player.
1425 */ 1409 */
1426bool 1410bool
1427object::write (object_freezer &f) 1411object::write (object_freezer &f)
1428{ 1412{
1429 /* Even if the object does have an owner, it would seem that we should 1413 archetype *at = arch ? arch : archetype::empty;
1430 * still save it.
1431 */
1432 if (owner)
1433 return true;
1434 1414
1435 archetype *at = arch ? (archetype *)arch : empty_archetype;
1436
1437 f.put (KW_arch, at->name); 1415 f.put (KW_arch, at->archname);
1438 write_diff (f, this, &at->clone); 1416 write_diff (f, this, at);
1439 1417
1440 for (object *tmp = inv; tmp; tmp = tmp->below) 1418 for (object *tmp = inv; tmp; tmp = tmp->below)
1441 tmp->write (f); 1419 tmp->write (f);
1442 1420
1443 f.put (this); 1421 f.put (this);
… …
1448 1426
1449///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1450 1428
1451// generic resource file load, 1429// generic resource file load,
1452// currently supports: region, treasures, archetypes 1430// currently supports: region, treasures, archetypes
1431bool
1453bool load_resource_file (const char *filename) 1432load_resource_file_ (const char *filename)
1454{ 1433{
1455 object_thawer f (filename); 1434 object_thawer f (filename);
1456
1457 bool success = false;
1458 bool seen_arch = false;
1459
1460 f.next ();
1461 1435
1462 for (;;) 1436 for (;;)
1463 { 1437 {
1464 switch (f.kw) 1438 switch (f.kw)
1465 { 1439 {
1466 case KW_region: 1440 case KW_region:
1467 if (!region::read (f)) 1441 if (!region::read (f))
1468 goto finish; 1442 return false;
1469 break; 1443 break;
1470 1444
1471 case KW_treasure: 1445 case KW_treasure:
1472 case KW_treasureone: 1446 case KW_treasureone:
1473 if (!treasurelist::read (f)) 1447 if (!treasurelist::read (f))
1474 goto finish; 1448 return false;
1475 break; 1449 break;
1476 1450
1477 case KW_object: 1451 case KW_object:
1478 seen_arch = true;
1479 if (!archetype::read (f)) 1452 if (!archetype::read (f))
1480 goto finish; 1453 return false;
1481 break; 1454 break;
1482 1455
1483 case KW_EOF: 1456 case KW_EOF:
1484 success = true; 1457 return true;
1485 goto finish;
1486 1458
1487 default: 1459 default:
1488 if (!f.parse_error ("resource file")) 1460 if (!f.parse_error ("resource file"))
1489 goto finish; 1461 return false;
1490 1462
1491 f.next (); 1463 f.next ();
1492 break; 1464 break;
1493 } 1465 }
1494 } 1466 }
1495
1496finish:
1497 if (seen_arch)
1498 init_archetype_pointers ();
1499
1500 return success;
1501} 1467}
1502 1468

Diff Legend

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