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.150 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.166 by root, Sat Apr 23 04:56:45 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
266 type = 0; 265 type = 0;
267 } 266 }
268 267
269 switch (type) 268 switch (type)
270 { 269 {
270 case RANGED:
271 case BOW: 271 case BOW:
272 case WAND: 272 case WAND:
273 case ROD: 273 case ROD:
274 case HORN: 274 case HORN:
275 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
395 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
397#endif 397#endif
398 } 398 }
399 399
400 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
402 if ((type == ROD 402 if ((type == ROD
403 || type == WAND 403 || type == WAND
404 || type == SCROLL 404 || type == SCROLL
405 || type == HORN 405 || type == HORN
430 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
431 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
432 value = arch->value * inv->value; 432 value = arch->value * inv->value;
433 } 433 }
434 434
435 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
436 { 436 {
437 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
438 { 438 {
439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
440 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
443 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
444 if (move_type == 0) 444 if (move_type == 0)
445 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
446 } 446 }
447 447
448 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
449 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
450 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
451 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
452 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
453 */ 453 */
523 { 523 {
524 negate = 1; 524 negate = 1;
525 str++; 525 str++;
526 } 526 }
527 527
528 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
529 { 529 {
530 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
531 { 531 {
532 if (negate) 532 if (negate)
533 mt &= ~f->flags; 533 mt &= ~f->flags;
589 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
590 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
591 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
592 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
593 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
594 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
595 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
596 596
597 if (!op_inv) 597 if (!op_inv)
598 { 598 {
599 inv = tmp; 599 inv = tmp;
600 tmp->above = 0; 600 tmp->above = 0;
633 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
634 break; 634 break;
635 635
636 case KW_animation: 636 case KW_animation:
637 { 637 {
638 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
639 animation_id = 0; 639 animation_id = 0;
640 640
641 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
642 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 642 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
643 } 643 }
644 break; 644 break;
645 645
646 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
647 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
737 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
738 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
739 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
740 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
741 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
742 742 case KW_materialname: f.get (material); break;
743 case KW_materialname:
744 {
745 shstr sh;
746 f.get (sh);
747 material = name_to_material (sh);
748 }
749 break;
750 743
751 /* These are the new values */ 744 /* These are the new values */
752 case KW_move_block: set_move (move_block, f); break; 745 case KW_move_block: set_move (move_block, f); break;
753 case KW_move_allow: set_move (move_allow, f); break; 746 case KW_move_allow: set_move (move_allow, f); break;
754 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
825 818
826 819
827 case KW_identified: 820 case KW_identified:
828 GET_FLAG (this, FLAG_IDENTIFIED); 821 GET_FLAG (this, FLAG_IDENTIFIED);
829 //TODO: move to check_object or so 822 //TODO: move to check_object or so
830 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 823 if (this->flag [FLAG_IDENTIFIED])
831 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 824 this->clr_flag (FLAG_KNOWN_MAGICAL);
832 825
833 break; 826 break;
834 827
835 case KW_friendly: 828 case KW_friendly:
836 if (f.get_bool ()) 829 if (f.get_bool ())
1088 1081
1089 archetype *arch = archetype::find (f.get_str ()); 1082 archetype *arch = archetype::find (f.get_str ());
1090 1083
1091 if (!arch) 1084 if (!arch)
1092 { 1085 {
1093 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1086 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1094 arch = archetype::find (shstr_earthwall); 1087 arch = archetype::find (shstr_earthwall);
1095 } 1088 }
1096 1089
1097 assert (arch); //D maybe use exception handling of sorts? 1090 assert (arch); //D maybe use exception handling of sorts?
1098 1091
1120 * override values and in c_wiz to mutate values. 1113 * override values and in c_wiz to mutate values.
1121 */ 1114 */
1122int 1115int
1123set_variable (object *op, char *buf) 1116set_variable (object *op, char *buf)
1124{ 1117{
1125 object_thawer f (buf, (AV *)0); 1118 object_thawer f (format ("%s\nend", buf), (AV *)0);
1126 1119
1127 return op->parse_kv (f); 1120 return op->parse_kv (f);
1128} 1121}
1129 1122
1130// compare *op against *arch and output differences 1123// compare *op against *arch and output differences
1341 1334
1342 CMP_OUT (tag); 1335 CMP_OUT (tag);
1343 CMP_OUT (custom_name); 1336 CMP_OUT (custom_name);
1344 1337
1345 if (object *owner = op->owner) 1338 if (object *owner = op->owner)
1346 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1339 if (const char *ref = owner->ref ())
1340 f.put (KW(owner), ref);
1347 1341
1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1342 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1349 1343
1350 CMP_OUT (other_arch); 1344 CMP_OUT (other_arch);
1351 1345
1451 CMP_OUT (move_slow); 1445 CMP_OUT (move_slow);
1452 CMP_OUT (move_slow_penalty); 1446 CMP_OUT (move_slow_penalty);
1453 1447
1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1448 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455 1449
1450#if stdcpp // we need gcc, sorry
1456 if (diff [FLAG_OBJ_ORIGINAL]) 1451 if (diff [FLAG_OBJ_ORIGINAL])
1457 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1452 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1458 1453
1459 diff.reset (FLAG_OBJ_ORIGINAL); 1454 diff.reset (FLAG_OBJ_ORIGINAL);
1460 1455
1461 // quickly test whether any other flags differ 1456 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ())) 1457 if (expect_true (diff.any ()))
1463 for (int i = 0; i < NUM_FLAGS; i++) 1458 for (int i = 0; i < NUM_FLAGS; i++)
1464 if (expect_false (diff [i])) 1459 if (expect_false (diff [i]))
1465 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); 1460 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1461#else
1462 // use sgi extensions
1463 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1465#endif
1466 1466
1467 // save body locations. gcc's memcmp does an abysmal job when used 1467 // save body locations. gcc's memcmp does an abysmal job when used
1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1469 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1470 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].kw, op->slot[i].info);
1471} 1471}
1472 1472
1473/* 1473/*
1474 * Dumps all variables in an object to a file. 1474 * Dumps all variables in an object to a file.
1475 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1475 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1507{ 1507{
1508 object_thawer f (filename); 1508 object_thawer f (filename);
1509 1509
1510 for (;;) 1510 for (;;)
1511 { 1511 {
1512 coroapi::cede_to_tick ();
1513
1512 switch (f.kw) 1514 switch (f.kw)
1513 { 1515 {
1514 case KW_region: 1516 case KW_region:
1515 if (!region::read (f)) 1517 if (!region::read (f))
1516 return false; 1518 return false;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines