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.151 by root, Sat Jan 16 13:41:37 2010 UTC vs.
Revision 1.169 by root, Sun May 1 16:58:15 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,2010 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.
… …
265 type = 0; 265 type = 0;
266 } 266 }
267 267
268 switch (type) 268 switch (type)
269 { 269 {
270 case RANGED:
270 case BOW: 271 case BOW:
271 case WAND: 272 case WAND:
272 case ROD: 273 case ROD:
273 case HORN: 274 case HORN:
274 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
… …
394 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
395 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);
396#endif 397#endif
397 } 398 }
398 399
399 /* 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 */
400 /* (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 */
401 if ((type == ROD 402 if ((type == ROD
402 || type == WAND 403 || type == WAND
403 || type == SCROLL 404 || type == SCROLL
404 || type == HORN 405 || type == HORN
… …
413 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
414 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
415 * in that spell was stored in sp. 416 * in that spell was stored in sp.
416 */ 417 */
417 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
418 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
419 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
420 randomitems = 0; 421 randomitems = 0;
421 } 422 }
422 423
423 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
… …
429 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
430 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
431 value = arch->value * inv->value; 432 value = arch->value * inv->value;
432 } 433 }
433 434
434 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
435 { 436 {
436 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
437 { 438 {
438 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);
439 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
… …
442 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
443 if (move_type == 0) 444 if (move_type == 0)
444 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
445 } 446 }
446 447
447 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)
448 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
449 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
450 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
451 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
452 */ 453 */
… …
522 { 523 {
523 negate = 1; 524 negate = 1;
524 str++; 525 str++;
525 } 526 }
526 527
527 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)
528 { 529 {
529 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
530 { 531 {
531 if (negate) 532 if (negate)
532 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
549 550
550bool 551bool
551object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
552{ 553{
553 object *op_inv = inv; 554 object *op_inv = inv;
554 key_value *last_kv = key_values; 555 key_value *last_kv = kv.first;
555 556
556 for (;;) 557 for (;;)
557 { 558 {
558 switch (f.kw) 559 switch (f.kw)
559 { 560 {
… …
588 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
589 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
590 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
591 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
592 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
593 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
594 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
595 596
596 if (!op_inv) 597 if (!op_inv)
597 { 598 {
598 inv = tmp; 599 inv = tmp;
599 tmp->above = 0; 600 tmp->above = 0;
… …
632 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
633 break; 634 break;
634 635
635 case KW_animation: 636 case KW_animation:
636 { 637 {
637 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
638 animation_id = 0; 639 animation_id = 0;
639 640
640 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 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
642 } 643 }
643 break; 644 break;
644 645
645 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
… …
736 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
737 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
738 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
739 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
740 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
741 742 case KW_materialname: f.get (material); break;
742 case KW_materialname:
743 {
744 shstr sh;
745 f.get (sh);
746 material = name_to_material (sh);
747 }
748 break;
749 743
750 /* These are the new values */ 744 /* These are the new values */
751 case KW_move_block: set_move (move_block, f); break; 745 case KW_move_block: set_move (move_block, f); break;
752 case KW_move_allow: set_move (move_allow, f); break; 746 case KW_move_allow: set_move (move_allow, f); break;
753 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
… …
824 818
825 819
826 case KW_identified: 820 case KW_identified:
827 GET_FLAG (this, FLAG_IDENTIFIED); 821 GET_FLAG (this, FLAG_IDENTIFIED);
828 //TODO: move to check_object or so 822 //TODO: move to check_object or so
829 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 823 if (this->flag [FLAG_IDENTIFIED])
830 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 824 this->clr_flag (FLAG_KNOWN_MAGICAL);
831 825
832 break; 826 break;
833 827
834 case KW_friendly: 828 case KW_friendly:
835 if (f.get_bool ()) 829 if (f.get_bool ())
… …
924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 918 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
925 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 919 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 920 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 921 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; 922 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
923 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
929 924
930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 925 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 926 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 927 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 928 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1045 1040
1046 f.next (); 1041 f.next ();
1047 return true; 1042 return true;
1048 1043
1049 case KW_ERROR: 1044 case KW_ERROR:
1050 // append as key value pair (do not use kv_set as it prepends)
1051 // we also do not even try to find old values, duplicate keys stay duplicate 1045 // we do not even try to find old values, duplicate keys stay duplicate
1052 { 1046 // the list gets reversed after loading
1053 key_value *kv = new key_value; 1047 kv.add (shstr (f.kw_str), shstr (f.value));
1054
1055 kv->next = 0;
1056 kv->key = shstr (f.kw_str);
1057 kv->value = shstr (f.value);
1058
1059 if (!last_kv)
1060 key_values = last_kv = kv;
1061 else
1062 {
1063 while (last_kv->next)
1064 last_kv = last_kv->next;
1065
1066 last_kv->next = kv;
1067 last_kv = kv;
1068 }
1069 }
1070 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1071 break; 1048 break;
1072 1049
1073 default: 1050 default:
1074 if (!f.parse_error ("object", name)) 1051 if (!f.parse_error ("object", name))
1075 return false; 1052 return false;
… …
1087 1064
1088 archetype *arch = archetype::find (f.get_str ()); 1065 archetype *arch = archetype::find (f.get_str ());
1089 1066
1090 if (!arch) 1067 if (!arch)
1091 { 1068 {
1092 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1069 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1093 arch = archetype::find (shstr_earthwall); 1070 arch = archetype::find (shstr_earthwall);
1094 } 1071 }
1095 1072
1096 assert (arch); //D maybe use exception handling of sorts? 1073 assert (arch); //D maybe use exception handling of sorts?
1097 1074
… …
1105 if (!op->parse_kv (f)) 1082 if (!op->parse_kv (f))
1106 { 1083 {
1107 op->destroy (); 1084 op->destroy ();
1108 return 0; 1085 return 0;
1109 } 1086 }
1087
1088 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1089 // that greatly simplifies the loading code.
1090 op->kv.reverse ();
1110 1091
1111 op->post_load_check (); 1092 op->post_load_check ();
1112 return op; 1093 return op;
1113} 1094}
1114 1095
… …
1119 * override values and in c_wiz to mutate values. 1100 * override values and in c_wiz to mutate values.
1120 */ 1101 */
1121int 1102int
1122set_variable (object *op, char *buf) 1103set_variable (object *op, char *buf)
1123{ 1104{
1124 object_thawer f (buf, (AV *)0); 1105 object_thawer f (format ("%s\nend", buf), (AV *)0);
1125 1106
1126 return op->parse_kv (f); 1107 return op->parse_kv (f);
1127} 1108}
1128 1109
1129// compare *op against *arch and output differences 1110// compare *op against *arch and output differences
… …
1281 } flagmask; 1262 } flagmask;
1282 1263
1283 /* This saves the key/value lists. We do it first so that any 1264 /* This saves the key/value lists. We do it first so that any
1284 * keys that match field names will be overwritten by the loader. 1265 * keys that match field names will be overwritten by the loader.
1285 */ 1266 */
1286 for (key_value *kv = op->key_values; kv; kv = kv->next) 1267 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1287 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1268 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1288 f.put (kv->key, kv->value); 1269 f.put (kv->key, kv->value);
1289 1270
1290 if (op->uuid) 1271 if (op->uuid)
1291 { 1272 {
1292 // highly optimised - this is often 25% of all data written 1273 // highly optimised - this is often 25% of all data written
… …
1340 1321
1341 CMP_OUT (tag); 1322 CMP_OUT (tag);
1342 CMP_OUT (custom_name); 1323 CMP_OUT (custom_name);
1343 1324
1344 if (object *owner = op->owner) 1325 if (object *owner = op->owner)
1345 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1326 if (const char *ref = owner->ref ())
1327 f.put (KW(owner), ref);
1346 1328
1347 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1329 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1348 1330
1349 CMP_OUT (other_arch); 1331 CMP_OUT (other_arch);
1350 1332
… …
1450 CMP_OUT (move_slow); 1432 CMP_OUT (move_slow);
1451 CMP_OUT (move_slow_penalty); 1433 CMP_OUT (move_slow_penalty);
1452 1434
1453 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1435 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1454 1436
1437#if stdcpp // we need gcc, sorry
1455 if (diff [FLAG_OBJ_ORIGINAL]) 1438 if (diff [FLAG_OBJ_ORIGINAL])
1456 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1439 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1457 1440
1458 diff.reset (FLAG_OBJ_ORIGINAL); 1441 diff.reset (FLAG_OBJ_ORIGINAL);
1459 1442
1460 // quickly test whether any other flags differ 1443 // quickly test whether any other flags differ
1461 if (expect_true (diff.any ())) 1444 if (expect_true (diff.any ()))
1462 for (int i = 0; i < NUM_FLAGS; i++) 1445 for (int i = 0; i < NUM_FLAGS; i++)
1463 if (expect_false (diff [i])) 1446 if (expect_false (diff [i]))
1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); 1447 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1448#else
1449 // use sgi extensions
1450 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1451 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1452#endif
1465 1453
1466 // save body locations. gcc's memcmp does an abysmal job when used 1454 // save body locations. gcc's memcmp does an abysmal job when used
1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1455 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1468 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1456 if (expect_false (op->slot[i].info != arch->slot[i].info))
1469 f.put (body_locations[i].save_name, op->slot[i].info); 1457 f.put (body_locations[i].kw, op->slot[i].info);
1470} 1458}
1471 1459
1472/* 1460/*
1473 * Dumps all variables in an object to a file. 1461 * Dumps all variables in an object to a file.
1474 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1462 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1506{ 1494{
1507 object_thawer f (filename); 1495 object_thawer f (filename);
1508 1496
1509 for (;;) 1497 for (;;)
1510 { 1498 {
1499 coroapi::cede_to_tick ();
1500
1511 switch (f.kw) 1501 switch (f.kw)
1512 { 1502 {
1513 case KW_region: 1503 case KW_region:
1514 if (!region::read (f)) 1504 if (!region::read (f))
1515 return false; 1505 return false;

Diff Legend

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