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.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.48 by root, Fri Jan 19 17:50:10 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
28 29
29#include <global.h> 30#include <global.h>
30#include <loader.h> 31#include <loader.h>
31#include <sproto.h> 32#include <sproto.h>
33
34// future resource loader base class
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39
40 virtual object *get_object (const char *name);
41 virtual void put_object (object *op);
42
43 virtual player *get_player ();
44 virtual void put_player (player *pl);
45
46 virtual region *get_region ();
47 virtual void put_region (region *region);
48
49 virtual facetile *get_face (const char *name);
50 virtual void put_face (facetile *face);
51
52 virtual treasurelist *get_treasure (const char *name, bool one = false);
53 virtual void put_treasure (treasurelist *treasure);
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{
64 virtual region *get_region ();
65 virtual void put_region (region *region);
66
67 virtual facetile *get_face (const char *name);
68 virtual void put_face (facetile *face);
69
70 virtual treasurelist *get_treasure (const char *name, bool one = false);
71 virtual void put_treasure (treasurelist *treasure);
72
73 virtual animation *get_animation (const char *name);
74 virtual void put_animation (animation *anim);
75};
32 76
33/* Maps the MOVE_* values to names */ 77/* Maps the MOVE_* values to names */
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 78static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35 79
36/* This table is only necessary to convert objects that existed before the 80/* This table is only necessary to convert objects that existed before the
… …
263static void 307static void
264check_loaded_object (object *op) 308check_loaded_object (object *op)
265{ 309{
266 int ip; 310 int ip;
267 311
268 /* We do some specialized handling to handle legacy cases of name_pl. 312 /* 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 - 313 * 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 314 * 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 315 * 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 316 * 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. 317 * 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 318 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 319 * information (appear as just 'hearts' and not 'goblins heart')
… …
320 { 364 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 365 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; 366 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 367 op->last_heal = 0;
324 } 368 }
325 if (editor) 369
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 370 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 371 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 372 if (!op->item_power && ip)
331 { 373 {
332 if (ip > 3) 374 if (ip > 3)
333 { 375 {
… …
487 SET_FLAG (op, flag); \ 529 SET_FLAG (op, flag); \
488 else \ 530 else \
489 CLEAR_FLAG (op, flag) \ 531 CLEAR_FLAG (op, flag) \
490 532
491int 533int
492parse_object (object *op, object_thawer & thawer, int map_flags) 534parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 535{
494 bool ismore = 0; 536 bool ismore = 0;
495 object *op_inv = op->inv; 537 object *op_inv = op->inv;
496 538
497 for (;;) 539 for (;;)
… …
502 { 544 {
503 case KW_Object: // uppercase alias 545 case KW_Object: // uppercase alias
504 case KW_object: 546 case KW_object:
505 thawer.get (op->name); 547 thawer.get (op->name);
506 548
507 if (op->arch != NULL) 549 if (op->arch)
508 op->arch->name = op->name; 550 op->arch->name = op->name;
509 551
510 break; 552 break;
511 553
512 case KW_uuid: 554 case KW_uuid:
… …
551 */ 593 */
552 archetype *arch = archetype::find (str); 594 archetype *arch = archetype::find (str);
553 595
554 object *tmp; 596 object *tmp;
555 597
556 if (arch != NULL) 598 if (arch)
557 tmp = arch_to_object (arch); 599 tmp = arch_to_object (arch);
558 else 600 else
559 { 601 {
560 tmp = object::create (); 602 tmp = object::create ();
561 /* record the name of the broken object */ 603 /* record the name of the broken object */
562 tmp->name = str; 604 tmp->name = str;
563 } 605 }
606
607 // decativate the object we, as we are still going
608 // to read the speed value. Objects should be activated
609 // when the map, object or player is completly loaded.
610 tmp->deactivate ();
564 611
565 parse_object (tmp, thawer, map_flags); 612 parse_object (tmp, thawer, map_flags);
566 613
567 if (tmp->arch) 614 if (tmp->arch)
568 { 615 {
… …
601 { 648 {
602 /* This is the actual archetype definition then */ 649 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 650 op->arch = archetype::find (str);
604 651
605 if (op->arch) 652 if (op->arch)
653 {
606 op->arch->clone.copy_to (op); 654 op->arch->clone.copy_to (op);
655 // copy_to activates, this should be fixed properly
656 op->deactivate ();
657 }
607 else if (!arch_init) 658 else if (!arch_init)
608 /* record the name of the broken object */ 659 /* record the name of the broken object */
609 op->name = str; 660 op->name = str;
610 } 661 }
611 } 662 }
… …
622 if (!str) 673 if (!str)
623 { 674 {
624 op->animation_id = 0; 675 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE); 676 CLEAR_FLAG (op, FLAG_ANIMATE);
626 } 677 }
627 else
628 {
629 op->animation_id = find_animation (str); 678 else if ((op->animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 679 SET_FLAG (op, FLAG_ANIMATE);
631 }
632 } 680 }
633 681
634 break; 682 break;
635 683
636 case KW_last_heal: thawer.get (op->last_heal); break; 684 case KW_last_heal: thawer.get (op->last_heal); break;
… …
641 689
642 case KW_speed: 690 case KW_speed:
643 thawer.get (op->speed); 691 thawer.get (op->speed);
644 692
645 //TODO: maybe do in check_object 693 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 694 // removed check for style maps
647 {
648 if (op->speed < 0) 695 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 696 op->speed_left = op->speed_left - rndm ();
650
651 update_ob_speed (op);
652 }
653 697
654 break; 698 break;
655 699
656 case KW_slow_move: 700 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 701 op->move_slow |= MOVE_WALK;
… …
811 CLEAR_FLAG (op, FLAG_WIZCAST); 855 CLEAR_FLAG (op, FLAG_WIZCAST);
812 } 856 }
813 break; 857 break;
814 858
815 case KW_friendly: 859 case KW_friendly:
816 GET_FLAG (op, FLAG_FRIENDLY); 860 if (thawer.get_sint32 ())
817 //TODO: move to check_object or so 861 if (op->type != PLAYER)
818 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819 add_friendly_object (op); 862 add_friendly_object (op);
863
820 break; 864 break;
821 865
822 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 866 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 867 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 868 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 869 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
870 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 871 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 872 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 873 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 874 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 875 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
901 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 946 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
902 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 947 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
903 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 948 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
904 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 949 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
905 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 950 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
951 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
906 952
907 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 953 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
908 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 954 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 955 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
910 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 956 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
980 case KW_randomitems: 1026 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 1027 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 1028 break;
983 1029
984 case KW_msg: 1030 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 1031 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 1032 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 1033 if (strlen (op->msg) >= HUGE_BUF)
989 { 1034 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 1035 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 1036 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 1037 }
993 }
994 break; 1038 break;
995 1039
996 case KW_lore: 1040 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 1041 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1042 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1043 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1044 * about not overflowing the buffer.
1004 */ 1045 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1046 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1047 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1048 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1049 break;
1010 1050
1011 case KW_editable: 1051 case KW_editable:
1012 case KW_editor_folder: 1052 case KW_editor_folder:
1013 break; 1053 break;
… …
1030 1070
1031 case KW_EOF: 1071 case KW_EOF:
1032 return LL_EOF; 1072 return LL_EOF;
1033 1073
1034 case KW_ERROR: 1074 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1075 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1076 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037
1038 //TODO: skip line, ugly, factor parsing better
1039 if (thawer.last_value)
1040 thawer.line = thawer.last_value;
1041
1042 thawer.line += strlen (thawer.line) + 1;
1043
1044 break; 1077 break;
1045 1078
1046 default: 1079 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1080 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1081 break;
… …
1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1095 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063 * be reset. 1096 * be reset.
1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1097 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065 * 1098 *
1066 */ 1099 */
1067
1068int 1100int
1069load_object (object_thawer & fp, object *op, int map_flags) 1101load_object (object_thawer &fp, object *op, int map_flags)
1070{ 1102{
1103 coroapi::cede_every (1000); // cede once in a while
1104
1071 return parse_object (op, fp, map_flags); 1105 return parse_object (op, fp, map_flags);
1072} 1106}
1073
1074 1107
1075/* This takes a buffer, scans it for variables, and sets those variables 1108/* This takes a buffer, scans it for variables, and sets those variables
1076 * as appropriate in op. 1109 * as appropriate in op.
1077 * 1110 *
1078 * This function appears to be used in only 2 places - in crossedit to 1111 * This function appears to be used in only 2 places - in crossedit to
… …
1274 KW_berserk, 1307 KW_berserk,
1275 KW_neutral, 1308 KW_neutral,
1276 /* 100 */ 1309 /* 100 */
1277 KW_no_attack, 1310 KW_no_attack,
1278 KW_no_damage, 1311 KW_no_damage,
1279 KW_NULL, 1312 KW_obj_original,
1280 KW_NULL, 1313 KW_NULL,
1281 KW_activate_on_push, 1314 KW_activate_on_push,
1282 KW_activate_on_release, 1315 KW_activate_on_release,
1283 KW_is_water, 1316 KW_is_water,
1284 KW_use_content_on_gen, 1317 KW_use_content_on_gen,
1285 KW_NULL, 1318 KW_NULL,
1286 KW_is_buildable, 1319 KW_is_buildable,
1287 /* 110 */ 1320 /* 110 */
1321 KW_destroy_on_death,
1322 KW_NULL,
1288 }; 1323 };
1289 1324
1290 int i; 1325 int i;
1291 1326
1292 /* This saves the key/value lists. We do it first so that any 1327 /* This saves the key/value lists. We do it first so that any
1293 * keys that match field names will be overwritten by the loader. 1328 * keys that match field names will be overwritten by the loader.
1294 */ 1329 */
1295 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1330 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1296 { 1331 {
1297 /* Find the field in the opposing member. */ 1332 /* Find the field in the opposing member. */
1298 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1333 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1299 1334
1300 /* If there's no partnering field, or it's got a different value, save our field. */ 1335 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1443 1478
1444/* 1479/*
1445 * Dumps all variables in an object to a file. 1480 * Dumps all variables in an object to a file.
1446 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1481 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1447 * the only place this is not set is when saving the player. 1482 * the only place this is not set is when saving the player.
1448 * If bit 1 of flag is set, don't remove the object after save. As of now,
1449 * all of the callers are setting this.
1450 */ 1483 */
1451
1452void 1484void
1453save_object (object_freezer & fp, object *op, int flag) 1485save_object (object_freezer &fp, object *op, int flag)
1454{ 1486{
1455 archetype *at;
1456 object *tmp, *old;
1457
1458 /* Even if the object does have an owner, it would seem that we should 1487 /* Even if the object does have an owner, it would seem that we should
1459 * still save it. 1488 * still save it.
1460 */ 1489 */
1461 if (op->owner) 1490 if (op->owner)
1462 return; 1491 return;
1463 1492
1464 /* If it is unpaid and we don't want to save those, just return. */ 1493 /* If it is unpaid and we don't want to save those, just return. */
1465 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1494 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466 return; 1495 return;
1467 1496
1468 if ((at = op->arch) == NULL) 1497 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1469 at = empty_archetype;
1470 1498
1471 fp.put (KW_arch, at->name); 1499 fp.put (KW_arch, at->name);
1472
1473 put (fp, op, &at->clone); 1500 put (fp, op, &at->clone);
1474 1501
1475 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1502 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476 1503
1477 old = NULL;
1478
1479 if (flag & 2)
1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1504 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481 save_object (fp, tmp, flag); 1505 save_object (fp, tmp, flag);
1482 else
1483 /* Slightly different logic because tmp/op will be removed by
1484 * the save_object we call. So we just keep looking at op->inv
1485 * until there is nothing left. In theory, the variable old
1486 * should not be needed, as recursive loops shouldn't happen.
1487 */
1488 while ((tmp = op->inv) != NULL)
1489 {
1490 if (old == tmp)
1491 {
1492 LOG (llevError, " Recursive loop in inventory\n");
1493 break;
1494 }
1495
1496 save_object (fp, tmp, flag);
1497 old = tmp;
1498 }
1499
1500 if (!(flag & 2))
1501 op->destroy ();
1502 1506
1503 fp.put (op); 1507 fp.put (op);
1504 fprintf (fp, "end\n"); 1508 fp.put (KW_end);
1505} 1509}
1506 1510

Diff Legend

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