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.32 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.38 by pippijn, Wed Jan 3 00:21:35 2007 UTC

… …
263static void 263static void
264check_loaded_object (object *op) 264check_loaded_object (object *op)
265{ 265{
266 int ip; 266 int ip;
267 267
268 /* We do some specialized handling to handle legacy cases of name_pl. 268 /* 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 - 269 * 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 270 * 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 271 * 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 272 * 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. 273 * 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 274 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
… …
551 */ 551 */
552 archetype *arch = archetype::find (str); 552 archetype *arch = archetype::find (str);
553 553
554 object *tmp; 554 object *tmp;
555 555
556 if (arch != NULL) 556 if (arch)
557 tmp = arch_to_object (arch); 557 tmp = arch_to_object (arch);
558 else 558 else
559 { 559 {
560 tmp = object::create (); 560 tmp = object::create ();
561 /* record the name of the broken object */ 561 /* record the name of the broken object */
… …
563 } 563 }
564 564
565 // decativate the object we, as we are still going 565 // decativate the object we, as we are still going
566 // to read the speed value. Objects should be activated 566 // to read the speed value. Objects should be activated
567 // when the map, object or player is completly loaded. 567 // when the map, object or player is completly loaded.
568 tmp->deactivate (false); 568 tmp->deactivate ();
569 569
570 parse_object (tmp, thawer, map_flags); 570 parse_object (tmp, thawer, map_flags);
571 571
572 if (tmp->arch) 572 if (tmp->arch)
573 { 573 {
… …
606 { 606 {
607 /* This is the actual archetype definition then */ 607 /* This is the actual archetype definition then */
608 op->arch = archetype::find (str); 608 op->arch = archetype::find (str);
609 609
610 if (op->arch) 610 if (op->arch)
611 {
611 op->arch->clone.copy_to (op); 612 op->arch->clone.copy_to (op);
613 // copy_to activates, this should be fixed properly
614 op->deactivate ();
615 }
612 else if (!arch_init) 616 else if (!arch_init)
613 /* record the name of the broken object */ 617 /* record the name of the broken object */
614 op->name = str; 618 op->name = str;
615 } 619 }
616 } 620 }
… …
985 case KW_msg: 989 case KW_msg:
986 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 991 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
989 { 993 {
990 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);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 996 }
993 break; 997 break;
994 998
995 case KW_lore: 999 case KW_lore:
… …
997 //TODO: allow longer messages 1001 //TODO: allow longer messages
998 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
999 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
1000 */ 1004 */
1001 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
1002 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",
1003 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1004 break; 1008 break;
1005 1009
1006 case KW_editable: 1010 case KW_editable:
1007 case KW_editor_folder: 1011 case KW_editor_folder:
… …
1053 * 1057 *
1054 */ 1058 */
1055int 1059int
1056load_object (object_thawer &fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1057{ 1061{
1058 // cede every 500 objects loaded 1062 coroapi::cede_every (1000); // cede once in a while
1059 {
1060 static int cede_counter = 0;
1061
1062 if (++cede_counter >= 500)
1063 {
1064 cede_counter = 0;
1065 if (coroapi::nready ())
1066 coroapi::cede ();
1067 }
1068 }
1069 1063
1070 return parse_object (op, fp, map_flags); 1064 return parse_object (op, fp, map_flags);
1071} 1065}
1072 1066
1073/* 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
… …
1466 1460
1467 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1461 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1468 save_object (fp, tmp, flag); 1462 save_object (fp, tmp, flag);
1469 1463
1470 fp.put (op); 1464 fp.put (op);
1471 fp.put (KW_end, 0); 1465 fp.put (KW_end);
1472} 1466}
1473 1467

Diff Legend

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