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.31 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.42 by root, Mon Jan 8 01:19:02 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 }
… …
807 CLEAR_FLAG (op, FLAG_WIZCAST); 815 CLEAR_FLAG (op, FLAG_WIZCAST);
808 } 816 }
809 break; 817 break;
810 818
811 case KW_friendly: 819 case KW_friendly:
812 GET_FLAG (op, FLAG_FRIENDLY); 820 if (thawer.get_sint32 ())
813 //TODO: move to check_object or so 821 if (op->type != PLAYER)
814 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
815 add_friendly_object (op); 822 add_friendly_object (op);
823
816 break; 824 break;
817 825
818 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
819 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
820 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
… …
897 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
898 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
899 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
900 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
901 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
910 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
902 911
903 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 912 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
904 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 913 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
905 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 914 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
906 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 915 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
980 case KW_msg: 989 case KW_msg:
981 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
982 //TODO: allow longer messages 991 //TODO: allow longer messages
983 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
984 { 993 {
985 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 994 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
986 op->msg = "ERROR, please report: string too long, winged.\n"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
987 } 996 }
988 break; 997 break;
989 998
990 case KW_lore: 999 case KW_lore:
… …
992 //TODO: allow longer messages 1001 //TODO: allow longer messages
993 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
994 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
995 */ 1004 */
996 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
997 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1006 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
998 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
999 break; 1008 break;
1000 1009
1001 case KW_editable: 1010 case KW_editable:
1002 case KW_editor_folder: 1011 case KW_editor_folder:
… …
1048 * 1057 *
1049 */ 1058 */
1050int 1059int
1051load_object (object_thawer &fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1052{ 1061{
1053 // cede every 500 objects loaded 1062 coroapi::cede_every (1000); // cede once in a while
1054 {
1055 static int cede_counter = 0;
1056
1057 if (++cede_counter >= 500)
1058 {
1059 cede_counter = 0;
1060 if (coroapi::nready ())
1061 coroapi::cede ();
1062 }
1063 }
1064 1063
1065 return parse_object (op, fp, map_flags); 1064 return parse_object (op, fp, map_flags);
1066} 1065}
1067 1066
1068/* This takes a buffer, scans it for variables, and sets those variables 1067/* This takes a buffer, scans it for variables, and sets those variables
… …
1276 KW_is_water, 1275 KW_is_water,
1277 KW_use_content_on_gen, 1276 KW_use_content_on_gen,
1278 KW_NULL, 1277 KW_NULL,
1279 KW_is_buildable, 1278 KW_is_buildable,
1280 /* 110 */ 1279 /* 110 */
1280 KW_destroy_on_death,
1281 }; 1281 };
1282 1282
1283 int i; 1283 int i;
1284 1284
1285 /* This saves the key/value lists. We do it first so that any 1285 /* This saves the key/value lists. We do it first so that any
… …
1461 1461
1462 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1463 save_object (fp, tmp, flag); 1463 save_object (fp, tmp, flag);
1464 1464
1465 fp.put (op); 1465 fp.put (op);
1466 fp.put (KW_end, 0); 1466 fp.put (KW_end);
1467} 1467}
1468 1468

Diff Legend

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