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.104 by elmex, Thu Nov 8 12:10:47 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. */
… …
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);
… …
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
398 { 398 {
399 /* Firewall 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;
… …
594 } 588 }
595 } 589 }
596 continue; 590 continue;
597 591
598 case KW_other_arch: 592 case KW_other_arch:
599 other_arch =
600 loading_arch 593 if (loading_arch == this)
601 ? archetype::get (f.get_str ()) 594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
595 else
596 {
602 : archetype::find (f.get_str ()); 597 other_arch = archetype::find (f.get_str ());
603 598
604 if (!other_arch) 599 if (!other_arch)
605 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 }
606 break; 602 break;
607 603
608 case KW_owner: 604 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ()); 605 f.delayed_deref (this, owner, f.get_str ());
610 break; 606 break;
… …
813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
814 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;
815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
817 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;
818 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 815 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
819 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 816 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
820 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 817 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
821 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 818 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
822 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 819 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
1268 1265
1269 /* 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
1270 * will get taken care of the copy_to method. 1267 * will get taken care of the copy_to method.
1271 */ 1268 */
1272 1269
1273 { 1270 f.put (KW_uuid, op->uuid.c_str ());
1274 char uids[64];
1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1276 f.put (KW_uuid, (const char *)uids);
1277 }
1278 1271
1279#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)
1280#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)
1281 1274
1282 if (object *owner = op->owner) 1275 if (object *owner = op->owner)
… …
1415 * 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.
1416 */ 1409 */
1417bool 1410bool
1418object::write (object_freezer &f) 1411object::write (object_freezer &f)
1419{ 1412{
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1413 archetype *at = arch ? (archetype *)arch : archetype::empty;
1421 1414
1422 f.put (KW_arch, at->archname); 1415 f.put (KW_arch, at->archname);
1423 write_diff (f, this, at); 1416 write_diff (f, this, at);
1424 1417
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1418 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1433 1426
1434///////////////////////////////////////////////////////////////////////////// 1427/////////////////////////////////////////////////////////////////////////////
1435 1428
1436// generic resource file load, 1429// generic resource file load,
1437// currently supports: region, treasures, archetypes 1430// currently supports: region, treasures, archetypes
1431bool
1438bool load_resource_file (const char *filename) 1432load_resource_file_ (const char *filename)
1439{ 1433{
1440 object_thawer f (filename); 1434 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444 1435
1445 for (;;) 1436 for (;;)
1446 { 1437 {
1447 switch (f.kw) 1438 switch (f.kw)
1448 { 1439 {
1449 case KW_region: 1440 case KW_region:
1450 if (!region::read (f)) 1441 if (!region::read (f))
1451 goto finish; 1442 return false;
1452 break; 1443 break;
1453 1444
1454 case KW_treasure: 1445 case KW_treasure:
1455 case KW_treasureone: 1446 case KW_treasureone:
1456 if (!treasurelist::read (f)) 1447 if (!treasurelist::read (f))
1457 goto finish; 1448 return false;
1458 break; 1449 break;
1459 1450
1460 case KW_object: 1451 case KW_object:
1461 seen_arch = true;
1462 if (!archetype::read (f)) 1452 if (!archetype::read (f))
1463 goto finish; 1453 return false;
1464 break; 1454 break;
1465 1455
1466 case KW_EOF: 1456 case KW_EOF:
1467 success = true; 1457 return true;
1468 goto finish;
1469 1458
1470 default: 1459 default:
1471 if (!f.parse_error ("resource file")) 1460 if (!f.parse_error ("resource file"))
1472 goto finish; 1461 return false;
1473 1462
1474 f.next (); 1463 f.next ();
1475 break; 1464 break;
1476 } 1465 }
1477 } 1466 }
1478
1479finish:
1480 if (seen_arch)
1481 init_archetype_pointers ();
1482
1483 return success;
1484} 1467}
1485 1468

Diff Legend

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