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.29 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.43 by root, Mon Jan 8 12:44:34 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 }
… …
641 649
642 case KW_speed: 650 case KW_speed:
643 thawer.get (op->speed); 651 thawer.get (op->speed);
644 652
645 //TODO: maybe do in check_object 653 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 654 // removed check for style maps
647 {
648 if (op->speed < 0) 655 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 657
654 break; 658 break;
655 659
656 case KW_slow_move: 660 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 661 op->move_slow |= MOVE_WALK;
… …
811 CLEAR_FLAG (op, FLAG_WIZCAST); 815 CLEAR_FLAG (op, FLAG_WIZCAST);
812 } 816 }
813 break; 817 break;
814 818
815 case KW_friendly: 819 case KW_friendly:
816 GET_FLAG (op, FLAG_FRIENDLY); 820 if (thawer.get_sint32 ())
817 //TODO: move to check_object or so 821 if (op->type != PLAYER)
818 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819 add_friendly_object (op); 822 add_friendly_object (op);
823
820 break; 824 break;
821 825
822 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
830 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 832 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
901 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 906 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
902 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 907 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
903 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 908 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
904 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 909 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
905 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 910 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
911 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
906 912
907 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
908 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
910 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
980 case KW_randomitems: 986 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 987 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 988 break;
983 989
984 case KW_msg: 990 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 991 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 992 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 993 if (strlen (op->msg) >= HUGE_BUF)
989 { 994 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 995 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 996 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 997 }
993 }
994 break; 998 break;
995 999
996 case KW_lore: 1000 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 1001 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1002 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1003 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1004 * about not overflowing the buffer.
1004 */ 1005 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1006 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1007 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1009 break;
1010 1010
1011 case KW_editable: 1011 case KW_editable:
1012 case KW_editor_folder: 1012 case KW_editor_folder:
1013 break; 1013 break;
… …
1030 1030
1031 case KW_EOF: 1031 case KW_EOF:
1032 return LL_EOF; 1032 return LL_EOF;
1033 1033
1034 case KW_ERROR: 1034 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1036 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037
1038 //TODO: skip line, ugly, factor parsing better
1039 if (thawer.last_value)
1040 thawer.line = thawer.last_value;
1041
1042 thawer.line += strlen (thawer.line) + 1;
1043
1044 break; 1037 break;
1045 1038
1046 default: 1039 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1041 break;
… …
1065 * 1058 *
1066 */ 1059 */
1067int 1060int
1068load_object (object_thawer &fp, object *op, int map_flags) 1061load_object (object_thawer &fp, object *op, int map_flags)
1069{ 1062{
1063 coroapi::cede_every (1000); // cede once in a while
1064
1070 return parse_object (op, fp, map_flags); 1065 return parse_object (op, fp, map_flags);
1071} 1066}
1072 1067
1073/* This takes a buffer, scans it for variables, and sets those variables 1068/* This takes a buffer, scans it for variables, and sets those variables
1074 * as appropriate in op. 1069 * as appropriate in op.
… …
1272 KW_berserk, 1267 KW_berserk,
1273 KW_neutral, 1268 KW_neutral,
1274 /* 100 */ 1269 /* 100 */
1275 KW_no_attack, 1270 KW_no_attack,
1276 KW_no_damage, 1271 KW_no_damage,
1277 KW_NULL, 1272 KW_obj_original,
1278 KW_NULL, 1273 KW_NULL,
1279 KW_activate_on_push, 1274 KW_activate_on_push,
1280 KW_activate_on_release, 1275 KW_activate_on_release,
1281 KW_is_water, 1276 KW_is_water,
1282 KW_use_content_on_gen, 1277 KW_use_content_on_gen,
1283 KW_NULL, 1278 KW_NULL,
1284 KW_is_buildable, 1279 KW_is_buildable,
1285 /* 110 */ 1280 /* 110 */
1281 KW_destroy_on_death,
1286 }; 1282 };
1287 1283
1288 int i; 1284 int i;
1289 1285
1290 /* This saves the key/value lists. We do it first so that any 1286 /* This saves the key/value lists. We do it first so that any
… …
1466 1462
1467 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1463 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1468 save_object (fp, tmp, flag); 1464 save_object (fp, tmp, flag);
1469 1465
1470 fp.put (op); 1466 fp.put (op);
1471 fprintf (fp, "end\n"); 1467 fp.put (KW_end);
1472} 1468}
1473 1469

Diff Legend

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