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.30 by root, Tue Dec 26 08:54:59 2006 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 {
… …
551 */ 550 */
552 archetype *arch = archetype::find (str); 551 archetype *arch = archetype::find (str);
553 552
554 object *tmp; 553 object *tmp;
555 554
556 if (arch != NULL) 555 if (arch)
557 tmp = arch_to_object (arch); 556 tmp = arch_to_object (arch);
558 else 557 else
559 { 558 {
560 tmp = object::create (); 559 tmp = object::create ();
561 /* record the name of the broken object */ 560 /* record the name of the broken object */
562 tmp->name = str; 561 tmp->name = str;
563 } 562 }
563
564 // decativate the object we, as we are still going
565 // to read the speed value. Objects should be activated
566 // when the map, object or player is completly loaded.
567 tmp->deactivate ();
564 568
565 parse_object (tmp, thawer, map_flags); 569 parse_object (tmp, thawer, map_flags);
566 570
567 if (tmp->arch) 571 if (tmp->arch)
568 { 572 {
… …
601 { 605 {
602 /* This is the actual archetype definition then */ 606 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 607 op->arch = archetype::find (str);
604 608
605 if (op->arch) 609 if (op->arch)
610 {
606 op->arch->clone.copy_to (op); 611 op->arch->clone.copy_to (op);
612 // copy_to activates, this should be fixed properly
613 op->deactivate ();
614 }
607 else if (!arch_init) 615 else if (!arch_init)
608 /* record the name of the broken object */ 616 /* record the name of the broken object */
609 op->name = str; 617 op->name = str;
610 } 618 }
611 } 619 }
… …
622 if (!str) 630 if (!str)
623 { 631 {
624 op->animation_id = 0; 632 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE); 633 CLEAR_FLAG (op, FLAG_ANIMATE);
626 } 634 }
627 else
628 {
629 op->animation_id = find_animation (str); 635 else if ((op->animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 636 SET_FLAG (op, FLAG_ANIMATE);
631 }
632 } 637 }
633 638
634 break; 639 break;
635 640
636 case KW_last_heal: thawer.get (op->last_heal); break; 641 case KW_last_heal: thawer.get (op->last_heal); break;
… …
638 case KW_last_grace: thawer.get (op->last_grace); break; 643 case KW_last_grace: thawer.get (op->last_grace); break;
639 case KW_last_eat: thawer.get (op->last_eat); break; 644 case KW_last_eat: thawer.get (op->last_eat); break;
640 case KW_speed_left: thawer.get (op->speed_left); break; 645 case KW_speed_left: thawer.get (op->speed_left); break;
641 646
642 case KW_speed: 647 case KW_speed:
643 {
644 float speed;
645 thawer.get (speed); 648 thawer.get (op->speed);
646 op->set_speed (speed);
647 649
648 //TODO: maybe do in check_object 650 //TODO: maybe do in check_object
649 if (!(map_flags & MAP_STYLE)) 651 // removed check for style maps
650 if (op->speed < 0) 652 if (op->speed < 0)
651 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 653 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
652 } 654
653 break; 655 break;
654 656
655 case KW_slow_move: 657 case KW_slow_move:
656 op->move_slow |= MOVE_WALK; 658 op->move_slow |= MOVE_WALK;
657 thawer.get (op->move_slow_penalty); 659 thawer.get (op->move_slow_penalty);
… …
810 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
811 } 813 }
812 break; 814 break;
813 815
814 case KW_friendly: 816 case KW_friendly:
815 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
816 //TODO: move to check_object or so 818 if (op->type != PLAYER)
817 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
818 add_friendly_object (op); 819 add_friendly_object (op);
820
819 break; 821 break;
820 822
821 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
822 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
823 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
824 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;
825 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
826 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;
827 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
828 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
829 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
900 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
901 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
902 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
903 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
904 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;
905 909
906 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 910 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
907 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 911 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
908 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 912 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
909 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 913 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
979 case KW_randomitems: 983 case KW_randomitems:
980 op->randomitems = find_treasurelist (thawer.get_str ()); 984 op->randomitems = find_treasurelist (thawer.get_str ());
981 break; 985 break;
982 986
983 case KW_msg: 987 case KW_msg:
984 {
985 thawer.get_ml (KW_endmsg, op->msg); 988 thawer.get_ml (KW_endmsg, op->msg);
986 //TODO: allow longer messages 989 //TODO: allow longer messages
987 if (strlen (op->msg) >= HUGE_BUF) 990 if (strlen (op->msg) >= HUGE_BUF)
988 { 991 {
989 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 992 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
990 op->msg = "ERROR, please report: string too long, winged.\n"; 993 op->msg = "ERROR, please report: string too long, winged.\n";
991 } 994 }
992 }
993 break; 995 break;
994 996
995 case KW_lore: 997 case KW_lore:
996 {
997 shstr msgbuf;
998
999 thawer.get_ml (KW_endlore, op->lore); 998 thawer.get_ml (KW_endlore, op->lore);
1000 //TODO: allow longer messages 999 //TODO: allow longer messages
1001 /* Just print a warning so we can be reasonably safe 1000 /* Just print a warning so we can be reasonably safe
1002 * about not overflowing the buffer. 1001 * about not overflowing the buffer.
1003 */ 1002 */
1004 if (strlen (op->lore) > (HUGE_BUF / 2)) 1003 if (strlen (op->lore) > (HUGE_BUF / 2))
1005 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1004 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1006 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1005 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1007 }
1008 break; 1006 break;
1009 1007
1010 case KW_editable: 1008 case KW_editable:
1011 case KW_editor_folder: 1009 case KW_editor_folder:
1012 break; 1010 break;
… …
1029 1027
1030 case KW_EOF: 1028 case KW_EOF:
1031 return LL_EOF; 1029 return LL_EOF;
1032 1030
1033 case KW_ERROR: 1031 case KW_ERROR:
1034 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1032 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1035 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1033 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1036
1037 //TODO: skip line, ugly, factor parsing better
1038 if (thawer.last_value)
1039 thawer.line = thawer.last_value;
1040
1041 thawer.line += strlen (thawer.line) + 1;
1042
1043 break; 1034 break;
1044 1035
1045 default: 1036 default:
1046 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1037 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1047 break; 1038 break;
… …
1064 * 1055 *
1065 */ 1056 */
1066int 1057int
1067load_object (object_thawer &fp, object *op, int map_flags) 1058load_object (object_thawer &fp, object *op, int map_flags)
1068{ 1059{
1060 coroapi::cede_every (1000); // cede once in a while
1061
1069 return parse_object (op, fp, map_flags); 1062 return parse_object (op, fp, map_flags);
1070} 1063}
1071 1064
1072/* This takes a buffer, scans it for variables, and sets those variables 1065/* This takes a buffer, scans it for variables, and sets those variables
1073 * as appropriate in op. 1066 * as appropriate in op.
… …
1271 KW_berserk, 1264 KW_berserk,
1272 KW_neutral, 1265 KW_neutral,
1273 /* 100 */ 1266 /* 100 */
1274 KW_no_attack, 1267 KW_no_attack,
1275 KW_no_damage, 1268 KW_no_damage,
1276 KW_NULL, 1269 KW_obj_original,
1277 KW_NULL, 1270 KW_NULL,
1278 KW_activate_on_push, 1271 KW_activate_on_push,
1279 KW_activate_on_release, 1272 KW_activate_on_release,
1280 KW_is_water, 1273 KW_is_water,
1281 KW_use_content_on_gen, 1274 KW_use_content_on_gen,
1282 KW_NULL, 1275 KW_NULL,
1283 KW_is_buildable, 1276 KW_is_buildable,
1284 /* 110 */ 1277 /* 110 */
1278 KW_destroy_on_death,
1279 KW_NULL,
1285 }; 1280 };
1286 1281
1287 int i; 1282 int i;
1288 1283
1289 /* 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
1290 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1291 */ 1286 */
1292 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)
1293 { 1288 {
1294 /* Find the field in the opposing member. */ 1289 /* Find the field in the opposing member. */
1295 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);
1296 1291
1297 /* 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. */
… …
1465 1460
1466 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1461 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1467 save_object (fp, tmp, flag); 1462 save_object (fp, tmp, flag);
1468 1463
1469 fp.put (op); 1464 fp.put (op);
1470 fprintf (fp, "end\n"); 1465 fp.put (KW_end);
1471} 1466}
1472 1467

Diff Legend

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