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.149 by root, Mon Nov 16 22:31:13 2009 UTC vs.
Revision 1.157 by root, Thu Apr 29 12:24:03 2010 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 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;
333 332
334 /* objects now have a materialname. try to patch it in */ 333 /* objects now have a materialname. try to patch it in */
335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 334 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 335 select_material (this, map ? map->difficulty : 5);
337 336
337 if (speed < 0.)
338 {
339 flag [FLAG_RANDOM_SPEED] = true;
340 speed = -speed;
341 // speed_left will be randomised in instantiate () and copy_to ()
342 }
343
338 /* only do these when program is first run - a bit 344 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 345 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 346 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 347 * not in the ideal fashion.
342 */ 348 */
388 if (ip > 2 * item_power && ip > (item_power + 3)) 394 if (ip > 2 * item_power && ip > (item_power + 3))
389 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 395 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
390#endif 396#endif
391 } 397 }
392 398
393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 399 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
394 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 400 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD 401 if ((type == ROD
396 || type == WAND 402 || type == WAND
397 || type == SCROLL 403 || type == SCROLL
398 || type == HORN 404 || type == HORN
423 randomitems = 0; /* So another spell isn't created for this object */ 429 randomitems = 0; /* So another spell isn't created for this object */
424 /* without this, value is all screwed up */ 430 /* without this, value is all screwed up */
425 value = arch->value * inv->value; 431 value = arch->value * inv->value;
426 } 432 }
427 433
428 if (QUERY_FLAG (this, FLAG_MONSTER)) 434 if (this->flag [FLAG_MONSTER])
429 { 435 {
430 if (stats.hp > stats.maxhp) 436 if (stats.hp > stats.maxhp)
431 { 437 {
432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 438 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
433 stats.maxhp = stats.hp; 439 stats.maxhp = stats.hp;
436 /* The archs just need to be updated for this */ 442 /* The archs just need to be updated for this */
437 if (move_type == 0) 443 if (move_type == 0)
438 move_type = MOVE_WALK; 444 move_type = MOVE_WALK;
439 } 445 }
440 446
441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 447 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
442 /* Object will duplicate it's content as part of the 448 /* Object will duplicate it's content as part of the
443 * generation process. To do this, we must flag inventory 449 * generation process. To do this, we must flag inventory
444 * so it remains unevaluated concerning the randomitems and 450 * so it remains unevaluated concerning the randomitems and
445 * the living (a demonlord shouldn't cast from inside generator!) 451 * the living (a demonlord shouldn't cast from inside generator!)
446 */ 452 */
582 // was: insert_ob_in_ob (tmp, op); 588 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot 589 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the 590 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves. 591 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects 592 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 593 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED); 594 tmp->clr_flag (FLAG_REMOVED);
589 595
590 if (!op_inv) 596 if (!op_inv)
591 { 597 {
592 inv = tmp; 598 inv = tmp;
593 tmp->above = 0; 599 tmp->above = 0;
626 f.delayed_deref (this, owner, f.get_str ()); 632 f.delayed_deref (this, owner, f.get_str ());
627 break; 633 break;
628 634
629 case KW_animation: 635 case KW_animation:
630 { 636 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 637 this->clr_flag (FLAG_ANIMATE);
632 animation_id = 0; 638 animation_id = 0;
633 639
634 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 640 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 641 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
636 } 642 }
637 break; 643 break;
638 644
639 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
640 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
641 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
642 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
643 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
644 651
645 case KW_speed: 652 case KW_speed:
646 f.get (speed); 653 f.get (speed);
647 654
729 case KW_invisible: f.get (invisible); break; 736 case KW_invisible: f.get (invisible); break;
730 case KW_magic: f.get (magic); break; 737 case KW_magic: f.get (magic); break;
731 case KW_state: f.get (state); break; 738 case KW_state: f.get (state); break;
732 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 739 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
733 case KW_material: f.get (materials); break; //TODO: nuke 740 case KW_material: f.get (materials); break; //TODO: nuke
734 741 case KW_materialname: f.get (material); break;
735 case KW_materialname:
736 {
737 shstr sh;
738 f.get (sh);
739 material = name_to_material (sh);
740 }
741 break;
742 742
743 /* These are the new values */ 743 /* These are the new values */
744 case KW_move_block: set_move (move_block, f); break; 744 case KW_move_block: set_move (move_block, f); break;
745 case KW_move_allow: set_move (move_allow, f); break; 745 case KW_move_allow: set_move (move_allow, f); break;
746 case KW_move_type: set_move (move_type , f); break; 746 case KW_move_type: set_move (move_type , f); break;
817 817
818 818
819 case KW_identified: 819 case KW_identified:
820 GET_FLAG (this, FLAG_IDENTIFIED); 820 GET_FLAG (this, FLAG_IDENTIFIED);
821 //TODO: move to check_object or so 821 //TODO: move to check_object or so
822 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 822 if (this->flag [FLAG_IDENTIFIED])
823 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 823 this->clr_flag (FLAG_KNOWN_MAGICAL);
824 824
825 break; 825 break;
826 826
827 case KW_friendly: 827 case KW_friendly:
828 if (f.get_bool ()) 828 if (f.get_bool ())
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
918 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 918 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
921 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
921 922
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 923 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 924 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 925 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 926 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1246 /* 100 */ 1247 /* 100 */
1247 KW_neutral, 1248 KW_neutral,
1248 KW_no_attack, 1249 KW_no_attack,
1249 KW_no_damage, 1250 KW_no_damage,
1250 KW_obj_original, 1251 KW_obj_original,
1251 KW_NULL, 1252 KW_random_speed,
1252 KW_activate_on_push, 1253 KW_activate_on_push,
1253 KW_activate_on_release, 1254 KW_activate_on_release,
1254 KW_is_water, 1255 KW_is_water,
1255 KW_use_content_on_gen, 1256 KW_use_content_on_gen,
1256 KW_NULL, 1257 KW_NULL,
1303 CMP_OUT (subtype); 1304 CMP_OUT (subtype);
1304 CMP_OUT (direction); 1305 CMP_OUT (direction);
1305 1306
1306 CMP_OUT (name); 1307 CMP_OUT (name);
1307 CMP_OUT (name_pl); 1308 CMP_OUT (name_pl);
1308
1309 CMP_OUT (speed); 1309 CMP_OUT (speed);
1310 1310
1311 // speed_left is a major time-burner, and has good locality, so 1311 // speed_left is a major time-burner, and has good locality, so
1312 // we use a simple lookup-cache to avoid the very slow printf. 1312 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left) 1313 if (op->speed_left != arch->speed_left)
1314 { 1314 {
1315 static double last_speed_left = 0.; 1315 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n"; 1316 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1317 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318 1318
1319 if (last_speed_left != op->speed_left) 1319 if (last_speed_left != op->speed_left)
1320 { 1320 {
1321 last_speed_left = op->speed_left; 1321 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("speed_left ") - 1 1322 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1323 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 } 1324 }
1325 1325
1326 f.add (last_speed_left_str, last_speed_left_len); 1326 f.add (last_speed_left_str, last_speed_left_len);
1327 } 1327 }
1328 1328
1333 1333
1334 CMP_OUT (tag); 1334 CMP_OUT (tag);
1335 CMP_OUT (custom_name); 1335 CMP_OUT (custom_name);
1336 1336
1337 if (object *owner = op->owner) 1337 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ())); 1338 if (const char *ref = owner->ref ())
1339 f.put (KW(owner), ref);
1339 1340
1340 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1341 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1341 1342
1342 CMP_OUT (other_arch); 1343 CMP_OUT (other_arch);
1343 1344
1416 if (op->flag [FLAG_IS_LINKED]) 1417 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ())) 1418 if (auto (ol, op->find_link ()))
1418 f.put (KW(connected), ol->id); 1419 f.put (KW(connected), ol->id);
1419 1420
1420 CMP_OUT (randomitems); 1421 CMP_OUT (randomitems);
1422
1421 CMP_OUT2 (container, weight_limit); 1423 CMP_OUT2 (container, weight_limit);
1422 1424
1423 CMP_OUT (run_away); 1425 CMP_OUT (run_away);
1424 CMP_OUT (pick_up); 1426 CMP_OUT (pick_up);
1425 CMP_OUT (will_apply); 1427 CMP_OUT (will_apply);
1442 CMP_OUT (move_slow); 1444 CMP_OUT (move_slow);
1443 CMP_OUT (move_slow_penalty); 1445 CMP_OUT (move_slow_penalty);
1444 1446
1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1447 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446 1448
1449#if stdcpp // we need gcc, sorry
1447 if (diff [FLAG_OBJ_ORIGINAL]) 1450 if (diff [FLAG_OBJ_ORIGINAL])
1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); 1451 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1449 1452
1450 diff.reset (FLAG_OBJ_ORIGINAL); 1453 diff.reset (FLAG_OBJ_ORIGINAL);
1451 1454
1452 // quickly test whether any other flags differ 1455 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ())) 1456 if (expect_true (diff.any ()))
1454 for (int i = 0; i < NUM_FLAGS; i++) 1457 for (int i = 0; i < NUM_FLAGS; i++)
1455 if (expect_false (diff [i])) 1458 if (expect_false (diff [i]))
1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); 1459 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1460#else
1461 // use sgi extensions
1462 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1463 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1464#endif
1457 1465
1458 // save body locations. gcc's memcmp does an abysmal job when used 1466 // save body locations. gcc's memcmp does an abysmal job when used
1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1460 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1461 f.put (body_locations[i].save_name, op->slot[i].info); 1469 f.put (body_locations[i].save_name, op->slot[i].info);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines