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.33 by root, Sun Dec 31 17:17:22 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 {
… …
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 582 case KW_slaying: thawer.get_ornull (op->slaying); break;
541 583
542 case KW_arch: 584 case KW_arch:
543 { 585 {
544 const char *str = thawer.get_str (); 586 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
546 587
547 if (op->arch) 588 if (op->arch)
548 { 589 {
549 /* If op->arch has been set, then this new object 590 /* If op->arch has been set, then this new object
550 * must be part of the inventory. So process 591 * must be part of the inventory. So process
… …
632 if (!str) 673 if (!str)
633 { 674 {
634 op->animation_id = 0; 675 op->animation_id = 0;
635 CLEAR_FLAG (op, FLAG_ANIMATE); 676 CLEAR_FLAG (op, FLAG_ANIMATE);
636 } 677 }
637 else
638 {
639 op->animation_id = find_animation (str); 678 else if ((op->animation_id = find_animation (str)))
640 SET_FLAG (op, FLAG_ANIMATE); 679 SET_FLAG (op, FLAG_ANIMATE);
641 }
642 } 680 }
643 681
644 break; 682 break;
645 683
646 case KW_last_heal: thawer.get (op->last_heal); break; 684 case KW_last_heal: thawer.get (op->last_heal); break;
… …
653 thawer.get (op->speed); 691 thawer.get (op->speed);
654 692
655 //TODO: maybe do in check_object 693 //TODO: maybe do in check_object
656 // removed check for style maps 694 // removed check for style maps
657 if (op->speed < 0) 695 if (op->speed < 0)
658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 696 op->speed_left = op->speed_left - rndm ();
659 697
660 break; 698 break;
661 699
662 case KW_slow_move: 700 case KW_slow_move:
663 op->move_slow |= MOVE_WALK; 701 op->move_slow |= MOVE_WALK;
… …
817 CLEAR_FLAG (op, FLAG_WIZCAST); 855 CLEAR_FLAG (op, FLAG_WIZCAST);
818 } 856 }
819 break; 857 break;
820 858
821 case KW_friendly: 859 case KW_friendly:
822 GET_FLAG (op, FLAG_FRIENDLY); 860 if (thawer.get_sint32 ())
823 //TODO: move to check_object or so 861 if (op->type != PLAYER)
824 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
825 add_friendly_object (op); 862 add_friendly_object (op);
863
826 break; 864 break;
827 865
828 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 866 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
829 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 867 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
830 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 868 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
831 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;
832 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 871 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
833 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;
834 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 873 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
835 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 874 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
836 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 875 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
907 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 946 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
908 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 947 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
909 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 948 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
910 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 949 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
911 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;
912 952
913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 953 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 954 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 955 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 956 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
990 case KW_msg: 1030 case KW_msg:
991 thawer.get_ml (KW_endmsg, op->msg); 1031 thawer.get_ml (KW_endmsg, op->msg);
992 //TODO: allow longer messages 1032 //TODO: allow longer messages
993 if (strlen (op->msg) >= HUGE_BUF) 1033 if (strlen (op->msg) >= HUGE_BUF)
994 { 1034 {
995 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);
996 op->msg = "ERROR, please report: string too long, winged.\n"; 1036 op->msg = "ERROR, please report: string too long, winged.\n";
997 } 1037 }
998 break; 1038 break;
999 1039
1000 case KW_lore: 1040 case KW_lore:
… …
1002 //TODO: allow longer messages 1042 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 1043 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 1044 * about not overflowing the buffer.
1005 */ 1045 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 1046 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 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",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1048 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 break; 1049 break;
1010 1050
1011 case KW_editable: 1051 case KW_editable:
1012 case KW_editor_folder: 1052 case KW_editor_folder:
… …
1058 * 1098 *
1059 */ 1099 */
1060int 1100int
1061load_object (object_thawer &fp, object *op, int map_flags) 1101load_object (object_thawer &fp, object *op, int map_flags)
1062{ 1102{
1063 // cede every 500 objects loaded 1103 coroapi::cede_every (1000); // cede once in a while
1064 {
1065 static int cede_counter = 0;
1066
1067 if (++cede_counter >= 500)
1068 {
1069 cede_counter = 0;
1070 if (coroapi::nready ())
1071 coroapi::cede ();
1072 }
1073 }
1074 1104
1075 return parse_object (op, fp, map_flags); 1105 return parse_object (op, fp, map_flags);
1076} 1106}
1077 1107
1078/* 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
… …
1277 KW_berserk, 1307 KW_berserk,
1278 KW_neutral, 1308 KW_neutral,
1279 /* 100 */ 1309 /* 100 */
1280 KW_no_attack, 1310 KW_no_attack,
1281 KW_no_damage, 1311 KW_no_damage,
1282 KW_NULL, 1312 KW_obj_original,
1283 KW_NULL, 1313 KW_NULL,
1284 KW_activate_on_push, 1314 KW_activate_on_push,
1285 KW_activate_on_release, 1315 KW_activate_on_release,
1286 KW_is_water, 1316 KW_is_water,
1287 KW_use_content_on_gen, 1317 KW_use_content_on_gen,
1288 KW_NULL, 1318 KW_NULL,
1289 KW_is_buildable, 1319 KW_is_buildable,
1290 /* 110 */ 1320 /* 110 */
1321 KW_destroy_on_death,
1322 KW_NULL,
1291 }; 1323 };
1292 1324
1293 int i; 1325 int i;
1294 1326
1295 /* 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
1296 * keys that match field names will be overwritten by the loader. 1328 * keys that match field names will be overwritten by the loader.
1297 */ 1329 */
1298 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)
1299 { 1331 {
1300 /* Find the field in the opposing member. */ 1332 /* Find the field in the opposing member. */
1301 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);
1302 1334
1303 /* 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. */

Diff Legend

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