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.100 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.109 by root, Sun Apr 20 00:44:12 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
28#include <global.h> 28#include <global.h>
29#include <loader.h> 29#include <loader.h>
30#include <sproto.h> 30#include <sproto.h>
31 31
32///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
33 35
34/* 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
35 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
36 * 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
37 * 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
… …
167 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
168 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
169 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
170 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
171 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
172 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
173 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
174 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
175 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
176 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
177 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
249 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
250 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
251 NULL 253 NULL
252}; 254};
253 255
254extern bool loading_arch;
255
256/* 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
257 * 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
258 * 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
259 * 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.
260 */ 260 */
… …
361 || type == AMULET || type == GIRDLE 361 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 362 || type == BRACERS || type == CLOAK)
363 { 363 {
364 if (last_heal) 364 if (last_heal)
365 { 365 {
366 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 ());
367 gen_sp_armour = last_heal; 367 gen_sp_armour = last_heal;
368 last_heal = 0; 368 last_heal = 0;
369 } 369 }
370 370
371 int ip = calc_item_power (this, 0); 371 int ip = calc_item_power (this, 0);
… …
394 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
396 /* 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 */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
398 { 398 {
399 /* 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'
400 * in that spell was stored in sp. 400 * in that spell was stored in sp.
401 */ 401 */
402 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 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]);
403 insert_ob_in_ob (tmp, this); 404 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 405 randomitems = NULL; /* So another spell isn't created for this object */
405 } 406 }
406 407
407 /* 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 */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 410 {
411 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 412 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = NULL; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 415 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 416 value = arch->value * inv->value;
… …
416 418
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 419 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 420 {
419 if (stats.hp > stats.maxhp) 421 if (stats.hp > stats.maxhp)
420 { 422 {
421 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);
422 stats.maxhp = stats.hp; 424 stats.maxhp = stats.hp;
423 } 425 }
424 426
425 /* The archs just need to be updated for this */ 427 /* The archs just need to be updated for this */
426 if (move_type == 0) 428 if (move_type == 0)
427 move_type = MOVE_WALK; 429 move_type = MOVE_WALK;
428 } 430 }
429 431
430 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)
431 {
432 /* Object will duplicate it's content as part of the 433 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 434 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 435 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 436 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 437 */
438 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 439 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 440
440 /* Handle player movers. We use move_type for player movers 441 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 442 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 443 * would potentially cause them to be triggered when someone steps
443 * 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
444 * are doing, otherwise, set move_type based on maxhp value. 445 * are doing, otherwise, set move_type based on maxhp value.
445 */ 446 */
446 if (type == PLAYERMOVER) 447 if (type == PLAYERMOVER)
447 { 448 {
448 if (!move_type) 449 if (!move_type)
… …
510 511
511 goto next; 512 goto next;
512 } 513 }
513 } 514 }
514 515
515 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);
516 517
517next: ; 518next: ;
518 } 519 }
519} 520}
520 521
… …
529 { 530 {
530 switch (f.kw) 531 switch (f.kw)
531 { 532 {
532 case KW_uuid: 533 case KW_uuid:
533 if (const char *s = f.get_str ()) 534 if (const char *s = f.get_str ())
534 { 535 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 536 {
540 uuid.seq = seq; 537 f.parse_warn ("unparseable uuid");
541 break; 538 uuid = UUID::gen ();
542 } 539 }
543 }
544
545 uuid = gen_uuid ();
546 break; 540 break;
547 541
548 case KW_oid: 542 case KW_oid:
549 f.get (this, f.get_sint32 ()); 543 f.get (this, f.get_sint32 ());
550 break; 544 break;
… …
556 550
557 case KW_attach: f.get_ornull (attach); break; 551 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 552 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 553 case KW_race: f.get_ornull (race); break;
560 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;
561 556
562 case KW_arch: 557 case KW_arch:
563 { 558 {
564 object *tmp = object::read (f); 559 object *tmp = object::read (f);
565 tmp->deactivate (); 560 tmp->deactivate ();
… …
567 { 562 {
568 // was: insert_ob_in_ob (tmp, op); 563 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 564 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 565 // also, appending instead of prepending keeps the
571 // 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
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 568 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 569 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 570
575 if (!op_inv) 571 if (!op_inv)
576 { 572 {
… …
592 } 588 }
593 } 589 }
594 continue; 590 continue;
595 591
596 case KW_other_arch: 592 case KW_other_arch:
597 other_arch =
598 loading_arch 593 if (loading_arch == this)
599 ? archetype::get (f.get_str ()) 594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
595 else
596 {
600 : archetype::find (f.get_str ()); 597 other_arch = archetype::find (f.get_str ());
601 598
602 if (!other_arch) 599 if (!other_arch)
603 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 }
604 break; 602 break;
605 603
606 case KW_owner: 604 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ()); 605 f.delayed_deref (this, owner, f.get_str ());
608 break; 606 break;
… …
811 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
812 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;
813 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
814 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
815 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;
816 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
817 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
818 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
819 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
820 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
1266 1265
1267 /* 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
1268 * will get taken care of the copy_to method. 1267 * will get taken care of the copy_to method.
1269 */ 1268 */
1270 1269
1271 { 1270 f.put (KW_uuid, op->uuid.c_str ());
1272 char uids[64];
1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1274 f.put (KW_uuid, (const char *)uids);
1275 }
1276 1271
1277#define CMP_OUT(v) if (expect_false (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)
1278#define CMP_OUT2(k,v) if (expect_false (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)
1279 1274
1280 if (object *owner = op->owner) 1275 if (object *owner = op->owner)
… …
1284 CMP_OUT (name_pl); 1279 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1280 CMP_OUT (custom_name);
1286 CMP_OUT (title); 1281 CMP_OUT (title);
1287 CMP_OUT (race); 1282 CMP_OUT (race);
1288 CMP_OUT (slaying); 1283 CMP_OUT (slaying);
1284 CMP_OUT (tag);
1289 CMP_OUT (other_arch); 1285 CMP_OUT (other_arch);
1290 1286
1291 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1287 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1292 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1288 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1293 1289
… …
1412 * 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.
1413 */ 1409 */
1414bool 1410bool
1415object::write (object_freezer &f) 1411object::write (object_freezer &f)
1416{ 1412{
1417 archetype *at = arch ? (archetype *)arch : empty_archetype; 1413 archetype *at = arch ? (archetype *)arch : archetype::empty;
1418 1414
1419 f.put (KW_arch, at->archname); 1415 f.put (KW_arch, at->archname);
1420 write_diff (f, this, at); 1416 write_diff (f, this, at);
1421 1417
1422 for (object *tmp = inv; tmp; tmp = tmp->below) 1418 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1430 1426
1431///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1432 1428
1433// generic resource file load, 1429// generic resource file load,
1434// currently supports: region, treasures, archetypes 1430// currently supports: region, treasures, archetypes
1431bool
1435bool load_resource_file (const char *filename) 1432load_resource_file_ (const char *filename)
1436{ 1433{
1437 object_thawer f (filename); 1434 object_thawer f (filename);
1438
1439 bool success = false;
1440 bool seen_arch = false;
1441 1435
1442 for (;;) 1436 for (;;)
1443 { 1437 {
1444 switch (f.kw) 1438 switch (f.kw)
1445 { 1439 {
1446 case KW_region: 1440 case KW_region:
1447 if (!region::read (f)) 1441 if (!region::read (f))
1448 goto finish; 1442 return false;
1449 break; 1443 break;
1450 1444
1451 case KW_treasure: 1445 case KW_treasure:
1452 case KW_treasureone: 1446 case KW_treasureone:
1453 if (!treasurelist::read (f)) 1447 if (!treasurelist::read (f))
1454 goto finish; 1448 return false;
1455 break; 1449 break;
1456 1450
1457 case KW_object: 1451 case KW_object:
1458 seen_arch = true;
1459 if (!archetype::read (f)) 1452 if (!archetype::read (f))
1460 goto finish; 1453 return false;
1461 break; 1454 break;
1462 1455
1463 case KW_EOF: 1456 case KW_EOF:
1464 success = true; 1457 return true;
1465 goto finish;
1466 1458
1467 default: 1459 default:
1468 if (!f.parse_error ("resource file")) 1460 if (!f.parse_error ("resource file"))
1469 goto finish; 1461 return false;
1470 1462
1471 f.next (); 1463 f.next ();
1472 break; 1464 break;
1473 } 1465 }
1474 } 1466 }
1475
1476finish:
1477 if (seen_arch)
1478 init_archetype_pointers ();
1479
1480 return success;
1481} 1467}
1482 1468

Diff Legend

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