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.31 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.47 by root, Thu Jan 18 19:42:09 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27 28
… …
263static void 264static void
264check_loaded_object (object *op) 265check_loaded_object (object *op)
265{ 266{
266 int ip; 267 int ip;
267 268
268 /* We do some specialized handling to handle legacy cases of name_pl. 269 /* We do some specialised handling to handle legacy cases of name_pl.
269 * If the object doesn't have a name_pl, we just use the object name - 270 * If the object doesn't have a name_pl, we just use the object name -
270 * this isn't perfect (things won't be properly pluralized), but works to 271 * this isn't perfect (things won't be properly pluralised), but works to
271 * that degree (5 heart is still quite understandable). But the case we 272 * that degree (5 heart is still quite understandable). But the case we
272 * also have to catch is if this object is not using the normal name for 273 * also have to catch is if this object is not using the normal name for
273 * the object. In that case, we also want to use the loaded name. 274 * the object. In that case, we also want to use the loaded name.
274 * Otherwise, what happens is that the the plural name will lose 275 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 276 * information (appear as just 'hearts' and not 'goblins heart')
… …
320 { 321 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322 op->gen_sp_armour = op->last_heal; 323 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 324 op->last_heal = 0;
324 } 325 }
325 if (editor) 326
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 329 if (!op->item_power && ip)
331 { 330 {
332 if (ip > 3) 331 if (ip > 3)
333 { 332 {
… …
551 */ 550 */
552 archetype *arch = archetype::find (str); 551 archetype *arch = archetype::find (str);
553 552
554 object *tmp; 553 object *tmp;
555 554
556 if (arch != NULL) 555 if (arch)
557 tmp = arch_to_object (arch); 556 tmp = arch_to_object (arch);
558 else 557 else
559 { 558 {
560 tmp = object::create (); 559 tmp = object::create ();
561 /* record the name of the broken object */ 560 /* record the name of the broken object */
562 tmp->name = str; 561 tmp->name = str;
563 } 562 }
563
564 // decativate the object we, as we are still going
565 // to read the speed value. Objects should be activated
566 // when the map, object or player is completly loaded.
567 tmp->deactivate ();
564 568
565 parse_object (tmp, thawer, map_flags); 569 parse_object (tmp, thawer, map_flags);
566 570
567 if (tmp->arch) 571 if (tmp->arch)
568 { 572 {
… …
601 { 605 {
602 /* This is the actual archetype definition then */ 606 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 607 op->arch = archetype::find (str);
604 608
605 if (op->arch) 609 if (op->arch)
610 {
606 op->arch->clone.copy_to (op); 611 op->arch->clone.copy_to (op);
612 // copy_to activates, this should be fixed properly
613 op->deactivate ();
614 }
607 else if (!arch_init) 615 else if (!arch_init)
608 /* record the name of the broken object */ 616 /* record the name of the broken object */
609 op->name = str; 617 op->name = str;
610 } 618 }
611 } 619 }
… …
622 if (!str) 630 if (!str)
623 { 631 {
624 op->animation_id = 0; 632 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE); 633 CLEAR_FLAG (op, FLAG_ANIMATE);
626 } 634 }
627 else
628 {
629 op->animation_id = find_animation (str); 635 else if ((op->animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 636 SET_FLAG (op, FLAG_ANIMATE);
631 }
632 } 637 }
633 638
634 break; 639 break;
635 640
636 case KW_last_heal: thawer.get (op->last_heal); break; 641 case KW_last_heal: thawer.get (op->last_heal); break;
… …
643 thawer.get (op->speed); 648 thawer.get (op->speed);
644 649
645 //TODO: maybe do in check_object 650 //TODO: maybe do in check_object
646 // removed check for style maps 651 // removed check for style maps
647 if (op->speed < 0) 652 if (op->speed < 0)
648 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 653 op->speed_left = op->speed_left - rndm ();
649 654
650 break; 655 break;
651 656
652 case KW_slow_move: 657 case KW_slow_move:
653 op->move_slow |= MOVE_WALK; 658 op->move_slow |= MOVE_WALK;
… …
807 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
808 } 813 }
809 break; 814 break;
810 815
811 case KW_friendly: 816 case KW_friendly:
812 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
813 //TODO: move to check_object or so 818 if (op->type != PLAYER)
814 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
815 add_friendly_object (op); 819 add_friendly_object (op);
820
816 break; 821 break;
817 822
818 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
819 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
820 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
821 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
822 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
823 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 829 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
824 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
825 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
826 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
897 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
898 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
899 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
900 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
901 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
902 909
903 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 910 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
904 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 911 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
905 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 912 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
906 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 913 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
980 case KW_msg: 987 case KW_msg:
981 thawer.get_ml (KW_endmsg, op->msg); 988 thawer.get_ml (KW_endmsg, op->msg);
982 //TODO: allow longer messages 989 //TODO: allow longer messages
983 if (strlen (op->msg) >= HUGE_BUF) 990 if (strlen (op->msg) >= HUGE_BUF)
984 { 991 {
985 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 992 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
986 op->msg = "ERROR, please report: string too long, winged.\n"; 993 op->msg = "ERROR, please report: string too long, winged.\n";
987 } 994 }
988 break; 995 break;
989 996
990 case KW_lore: 997 case KW_lore:
… …
992 //TODO: allow longer messages 999 //TODO: allow longer messages
993 /* Just print a warning so we can be reasonably safe 1000 /* Just print a warning so we can be reasonably safe
994 * about not overflowing the buffer. 1001 * about not overflowing the buffer.
995 */ 1002 */
996 if (strlen (op->lore) > (HUGE_BUF / 2)) 1003 if (strlen (op->lore) > (HUGE_BUF / 2))
997 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1004 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
998 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1005 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
999 break; 1006 break;
1000 1007
1001 case KW_editable: 1008 case KW_editable:
1002 case KW_editor_folder: 1009 case KW_editor_folder:
… …
1048 * 1055 *
1049 */ 1056 */
1050int 1057int
1051load_object (object_thawer &fp, object *op, int map_flags) 1058load_object (object_thawer &fp, object *op, int map_flags)
1052{ 1059{
1053 // cede every 500 objects loaded 1060 coroapi::cede_every (1000); // cede once in a while
1054 {
1055 static int cede_counter = 0;
1056
1057 if (++cede_counter >= 500)
1058 {
1059 cede_counter = 0;
1060 if (coroapi::nready ())
1061 coroapi::cede ();
1062 }
1063 }
1064 1061
1065 return parse_object (op, fp, map_flags); 1062 return parse_object (op, fp, map_flags);
1066} 1063}
1067 1064
1068/* This takes a buffer, scans it for variables, and sets those variables 1065/* This takes a buffer, scans it for variables, and sets those variables
… …
1267 KW_berserk, 1264 KW_berserk,
1268 KW_neutral, 1265 KW_neutral,
1269 /* 100 */ 1266 /* 100 */
1270 KW_no_attack, 1267 KW_no_attack,
1271 KW_no_damage, 1268 KW_no_damage,
1272 KW_NULL, 1269 KW_obj_original,
1273 KW_NULL, 1270 KW_NULL,
1274 KW_activate_on_push, 1271 KW_activate_on_push,
1275 KW_activate_on_release, 1272 KW_activate_on_release,
1276 KW_is_water, 1273 KW_is_water,
1277 KW_use_content_on_gen, 1274 KW_use_content_on_gen,
1278 KW_NULL, 1275 KW_NULL,
1279 KW_is_buildable, 1276 KW_is_buildable,
1280 /* 110 */ 1277 /* 110 */
1278 KW_destroy_on_death,
1279 KW_NULL,
1281 }; 1280 };
1282 1281
1283 int i; 1282 int i;
1284 1283
1285 /* This saves the key/value lists. We do it first so that any 1284 /* This saves the key/value lists. We do it first so that any
1286 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1287 */ 1286 */
1288 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1287 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1289 { 1288 {
1290 /* Find the field in the opposing member. */ 1289 /* Find the field in the opposing member. */
1291 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1290 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1292 1291
1293 /* If there's no partnering field, or it's got a different value, save our field. */ 1292 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1461 1460
1462 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1461 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1463 save_object (fp, tmp, flag); 1462 save_object (fp, tmp, flag);
1464 1463
1465 fp.put (op); 1464 fp.put (op);
1466 fp.put (KW_end, 0); 1465 fp.put (KW_end);
1467} 1466}
1468 1467

Diff Legend

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