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.41 by root, Sun Jan 7 23:10:42 2007 UTC vs.
Revision 1.46 by pippijn, Mon Jan 15 21:06:18 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
… …
630 if (!str) 630 if (!str)
631 { 631 {
632 op->animation_id = 0; 632 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE); 633 CLEAR_FLAG (op, FLAG_ANIMATE);
634 } 634 }
635 else
636 {
637 op->animation_id = find_animation (str); 635 else if ((op->animation_id = find_animation (str)))
638 SET_FLAG (op, FLAG_ANIMATE); 636 SET_FLAG (op, FLAG_ANIMATE);
639 }
640 } 637 }
641 638
642 break; 639 break;
643 640
644 case KW_last_heal: thawer.get (op->last_heal); break; 641 case KW_last_heal: thawer.get (op->last_heal); break;
… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 813 }
817 break; 814 break;
818 815
819 case KW_friendly: 816 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 818 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 819 add_friendly_object (op);
820
824 break; 821 break;
825 822
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 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;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 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;
832 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
1266 KW_berserk, 1264 KW_berserk,
1267 KW_neutral, 1265 KW_neutral,
1268 /* 100 */ 1266 /* 100 */
1269 KW_no_attack, 1267 KW_no_attack,
1270 KW_no_damage, 1268 KW_no_damage,
1271 KW_NULL, 1269 KW_obj_original,
1272 KW_NULL, 1270 KW_NULL,
1273 KW_activate_on_push, 1271 KW_activate_on_push,
1274 KW_activate_on_release, 1272 KW_activate_on_release,
1275 KW_is_water, 1273 KW_is_water,
1276 KW_use_content_on_gen, 1274 KW_use_content_on_gen,
1277 KW_NULL, 1275 KW_NULL,
1278 KW_is_buildable, 1276 KW_is_buildable,
1279 /* 110 */ 1277 /* 110 */
1280 KW_destroy_on_death, 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. */

Diff Legend

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