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.37 by pippijn, Tue Jan 2 23:39:21 2007 UTC vs.
Revision 1.45 by root, Sun Jan 14 23:15:57 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
… …
263static void 264static void
264check_loaded_object (object *op) 265check_loaded_object (object *op)
265{ 266{
266 int ip; 267 int ip;
267 268
268 /* We do some specialized handling to handle legacy cases of name_pl. 269 /* 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 - 270 * 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 271 * 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 272 * 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 273 * 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. 274 * 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 275 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 276 * information (appear as just 'hearts' and not 'goblins heart')
… …
320 { 321 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 322 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; 323 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 324 op->last_heal = 0;
324 } 325 }
325 if (editor) 326
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 329 if (!op->item_power && ip)
331 { 330 {
332 if (ip > 3) 331 if (ip > 3)
333 { 332 {
… …
631 if (!str) 630 if (!str)
632 { 631 {
633 op->animation_id = 0; 632 op->animation_id = 0;
634 CLEAR_FLAG (op, FLAG_ANIMATE); 633 CLEAR_FLAG (op, FLAG_ANIMATE);
635 } 634 }
636 else
637 {
638 op->animation_id = find_animation (str); 635 else if ((op->animation_id = find_animation (str)))
639 SET_FLAG (op, FLAG_ANIMATE); 636 SET_FLAG (op, FLAG_ANIMATE);
640 }
641 } 637 }
642 638
643 break; 639 break;
644 640
645 case KW_last_heal: thawer.get (op->last_heal); break; 641 case KW_last_heal: thawer.get (op->last_heal); break;
… …
816 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
817 } 813 }
818 break; 814 break;
819 815
820 case KW_friendly: 816 case KW_friendly:
821 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
822 //TODO: move to check_object or so 818 if (op->type != PLAYER)
823 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
824 add_friendly_object (op); 819 add_friendly_object (op);
820
825 break; 821 break;
826 822
827 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
828 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
829 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
830 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;
831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
832 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;
833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
906 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
907 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
908 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
909 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
910 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
911 909
912 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 910 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 911 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 912 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
915 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 913 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); 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 */
1278 KW_destroy_on_death,
1279 KW_NULL,
1280 }; 1280 };
1281 1281
1282 int i; 1282 int i;
1283 1283
1284 /* 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
1285 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1286 */ 1286 */
1287 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)
1288 { 1288 {
1289 /* Find the field in the opposing member. */ 1289 /* Find the field in the opposing member. */
1290 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);
1291 1291
1292 /* 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