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.40 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.50 by root, Fri Jan 19 18:06:51 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28 28
29 29
30#include <global.h> 30#include <global.h>
31#include <loader.h> 31#include <loader.h>
32#include <sproto.h> 32#include <sproto.h>
33
34// future resource loader base class
35struct loader_base
36{
37 const char *filename;
38 virtual const char *type () const = 0;
39
40 virtual archetype *get_arch (const char *name);
41 virtual void put_arch (archetype *arch);
42
43 virtual object *get_object (const char *name);
44 virtual void put_object (object *op);
45
46 virtual player *get_player ();
47 virtual void put_player (player *pl);
48
49 virtual region *get_region (const char *name);
50 virtual void put_region (region *region);
51
52 virtual facetile *get_face (const char *name);
53 virtual void put_face (facetile *face);
54
55 virtual treasurelist *get_treasure (const char *name, bool one = false);
56 virtual void put_treasure (treasurelist *treasure);
57
58 virtual animation *get_animation (const char *name);
59 virtual void put_animation (animation *anim);
60};
61
62// future generic resource loader
63// handles generic stuff valid in most files, such as
64// animations, treasures, faces and so on
65struct loader_generic : loader_base
66{
67 const char *type () const = 0;
68
69 region *get_region ();
70 void put_region (region *region);
71
72 facetile *get_face (const char *name);
73 void put_face (facetile *face);
74
75 treasurelist *get_treasure (const char *name, bool one = false);
76 void put_treasure (treasurelist *treasure);
77
78 animation *get_animation (const char *name);
79 void put_animation (animation *anim);
80};
81
82// the base class warns about and skips everything
83archetype *
84loader_base::get_arch (const char *name)
85{
86 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
87 filename, name, type ());
88
89 return new archetype;
90}
91
92object *
93loader_base::get_object (const char *name)
94{
95 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
96 filename, name, type ());
97
98 return object::create ();
99}
100
101player *
102loader_base::get_player ()
103{
104 LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
105 filename, type ());
106
107 return player::create ();
108}
109
110region *
111loader_base::get_region (const char *name)
112{
113 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
114 filename, name, type ());
115
116 return new region;
117}
118
119facetile *
120loader_base::get_face (const char *name)
121{
122 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
123 filename, name, type ());
124
125 return new facetile;
126}
127
128treasurelist *
129loader_base::get_treasure (const char *name, bool one)
130{
131 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
132 filename, name, type ());
133
134 return new treasurelist;//D
135}
136
137animation *
138loader_base::get_animation (const char *name)
139{
140 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
141 filename, name, type ());
142
143 return new animation;
144}
145
146void
147loader_base::put_arch (archetype *arch)
148{
149 delete arch;
150}
151
152void
153loader_base::put_object (object *op)
154{
155 op->destroy ();
156}
157
158void
159loader_base::put_player (player *pl)
160{
161 delete pl;
162}
163
164void
165loader_base::put_region (region *region)
166{
167 delete region;
168}
169
170void
171loader_base::put_face (facetile *face)
172{
173 delete face;
174}
175
176void
177loader_base::put_treasure (treasurelist *treasure)
178{
179 delete treasure;
180}
181
182void
183loader_base::put_animation (animation *anim)
184{
185 delete anim;
186}
33 187
34/* Maps the MOVE_* values to names */ 188/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 189static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 190
37/* This table is only necessary to convert objects that existed before the 191/* This table is only necessary to convert objects that existed before the
… …
374 } 528 }
375 529
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 530 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 531 {
378 if (op->stats.hp > op->stats.maxhp) 532 if (op->stats.hp > op->stats.maxhp)
533 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 534 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
535 op->stats.maxhp = op->stats.hp;
536 }
380 537
381 /* The archs just need to be updated for this */ 538 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 539 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 540 op->move_type = MOVE_WALK;
384 } 541 }
… …
630 if (!str) 787 if (!str)
631 { 788 {
632 op->animation_id = 0; 789 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE); 790 CLEAR_FLAG (op, FLAG_ANIMATE);
634 } 791 }
635 else
636 {
637 op->animation_id = find_animation (str); 792 else if ((op->animation_id = find_animation (str)))
638 SET_FLAG (op, FLAG_ANIMATE); 793 SET_FLAG (op, FLAG_ANIMATE);
639 }
640 } 794 }
641 795
642 break; 796 break;
643 797
644 case KW_last_heal: thawer.get (op->last_heal); break; 798 case KW_last_heal: thawer.get (op->last_heal); break;
… …
651 thawer.get (op->speed); 805 thawer.get (op->speed);
652 806
653 //TODO: maybe do in check_object 807 //TODO: maybe do in check_object
654 // removed check for style maps 808 // removed check for style maps
655 if (op->speed < 0) 809 if (op->speed < 0)
656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 810 op->speed_left = op->speed_left - rndm ();
657 811
658 break; 812 break;
659 813
660 case KW_slow_move: 814 case KW_slow_move:
661 op->move_slow |= MOVE_WALK; 815 op->move_slow |= MOVE_WALK;
… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 969 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 970 }
817 break; 971 break;
818 972
819 case KW_friendly: 973 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 974 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 975 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 976 add_friendly_object (op);
977
824 break; 978 break;
825 979
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 980 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 981 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 982 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 983 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
984 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 985 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 986 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
832 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 987 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 988 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 989 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1060 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1061 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1062 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1063 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 1064 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
1065 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
910 1066
911 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1067 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
912 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1068 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1069 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
914 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1070 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
1265 KW_berserk, 1421 KW_berserk,
1266 KW_neutral, 1422 KW_neutral,
1267 /* 100 */ 1423 /* 100 */
1268 KW_no_attack, 1424 KW_no_attack,
1269 KW_no_damage, 1425 KW_no_damage,
1270 KW_NULL, 1426 KW_obj_original,
1271 KW_NULL, 1427 KW_NULL,
1272 KW_activate_on_push, 1428 KW_activate_on_push,
1273 KW_activate_on_release, 1429 KW_activate_on_release,
1274 KW_is_water, 1430 KW_is_water,
1275 KW_use_content_on_gen, 1431 KW_use_content_on_gen,
1276 KW_NULL, 1432 KW_NULL,
1277 KW_is_buildable, 1433 KW_is_buildable,
1278 /* 110 */ 1434 /* 110 */
1435 KW_destroy_on_death,
1436 KW_NULL,
1279 }; 1437 };
1280 1438
1281 int i; 1439 int i;
1282 1440
1283 /* This saves the key/value lists. We do it first so that any 1441 /* 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. 1442 * keys that match field names will be overwritten by the loader.
1285 */ 1443 */
1286 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1444 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1287 { 1445 {
1288 /* Find the field in the opposing member. */ 1446 /* Find the field in the opposing member. */
1289 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1447 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1290 1448
1291 /* If there's no partnering field, or it's got a different value, save our field. */ 1449 /* 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