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.49 by root, Fri Jan 19 17:54:15 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 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};
33 76
34/* Maps the MOVE_* values to names */ 77/* Maps the MOVE_* values to names */
35static 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 };
36 79
37/* 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
… …
374 } 417 }
375 418
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 419 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 420 {
378 if (op->stats.hp > op->stats.maxhp) 421 if (op->stats.hp > op->stats.maxhp)
422 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 423 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
424 op->stats.maxhp = op->stats.hp;
425 }
380 426
381 /* The archs just need to be updated for this */ 427 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 428 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 429 op->move_type = MOVE_WALK;
384 } 430 }
… …
630 if (!str) 676 if (!str)
631 { 677 {
632 op->animation_id = 0; 678 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE); 679 CLEAR_FLAG (op, FLAG_ANIMATE);
634 } 680 }
635 else
636 {
637 op->animation_id = find_animation (str); 681 else if ((op->animation_id = find_animation (str)))
638 SET_FLAG (op, FLAG_ANIMATE); 682 SET_FLAG (op, FLAG_ANIMATE);
639 }
640 } 683 }
641 684
642 break; 685 break;
643 686
644 case KW_last_heal: thawer.get (op->last_heal); break; 687 case KW_last_heal: thawer.get (op->last_heal); break;
… …
651 thawer.get (op->speed); 694 thawer.get (op->speed);
652 695
653 //TODO: maybe do in check_object 696 //TODO: maybe do in check_object
654 // removed check for style maps 697 // removed check for style maps
655 if (op->speed < 0) 698 if (op->speed < 0)
656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 699 op->speed_left = op->speed_left - rndm ();
657 700
658 break; 701 break;
659 702
660 case KW_slow_move: 703 case KW_slow_move:
661 op->move_slow |= MOVE_WALK; 704 op->move_slow |= MOVE_WALK;
… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 858 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 859 }
817 break; 860 break;
818 861
819 case KW_friendly: 862 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 863 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 864 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 865 add_friendly_object (op);
866
824 break; 867 break;
825 868
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 869 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 870 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 871 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 872 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
873 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 874 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 875 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; 876 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 877 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 878 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 949 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 950 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 951 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 952 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 953 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
954 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
910 955
911 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 956 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
912 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 957 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 958 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
914 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 959 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
1265 KW_berserk, 1310 KW_berserk,
1266 KW_neutral, 1311 KW_neutral,
1267 /* 100 */ 1312 /* 100 */
1268 KW_no_attack, 1313 KW_no_attack,
1269 KW_no_damage, 1314 KW_no_damage,
1270 KW_NULL, 1315 KW_obj_original,
1271 KW_NULL, 1316 KW_NULL,
1272 KW_activate_on_push, 1317 KW_activate_on_push,
1273 KW_activate_on_release, 1318 KW_activate_on_release,
1274 KW_is_water, 1319 KW_is_water,
1275 KW_use_content_on_gen, 1320 KW_use_content_on_gen,
1276 KW_NULL, 1321 KW_NULL,
1277 KW_is_buildable, 1322 KW_is_buildable,
1278 /* 110 */ 1323 /* 110 */
1324 KW_destroy_on_death,
1325 KW_NULL,
1279 }; 1326 };
1280 1327
1281 int i; 1328 int i;
1282 1329
1283 /* This saves the key/value lists. We do it first so that any 1330 /* 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. 1331 * keys that match field names will be overwritten by the loader.
1285 */ 1332 */
1286 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1333 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1287 { 1334 {
1288 /* Find the field in the opposing member. */ 1335 /* Find the field in the opposing member. */
1289 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1336 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1290 1337
1291 /* If there's no partnering field, or it's got a different value, save our field. */ 1338 /* 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