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.35 by root, Mon Jan 1 00:41:02 2007 UTC vs.
Revision 1.37 by pippijn, Tue Jan 2 23:39:21 2007 UTC

989 case KW_msg: 989 case KW_msg:
990 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
991 //TODO: allow longer messages 991 //TODO: allow longer messages
992 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
993 { 993 {
994 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);
995 op->msg = "ERROR, please report: string too long, winged.\n"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
996 } 996 }
997 break; 997 break;
998 998
999 case KW_lore: 999 case KW_lore:
1001 //TODO: allow longer messages 1001 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
1004 */ 1004 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 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",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 break; 1008 break;
1009 1009
1010 case KW_editable: 1010 case KW_editable:
1011 case KW_editor_folder: 1011 case KW_editor_folder:
1057 * 1057 *
1058 */ 1058 */
1059int 1059int
1060load_object (object_thawer &fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1061{ 1061{
1062 // cede every 500 objects loaded 1062 coroapi::cede_every (1000); // cede once in a while
1063 coroapi::cede_every (500);
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
1440 * the only place this is not set is when saving the player. 1439 * the only place this is not set is when saving the player.
1441 */ 1440 */
1442void 1441void
1443save_object (object_freezer &fp, object *op, int flag) 1442save_object (object_freezer &fp, object *op, int flag)
1444{ 1443{
1445 // cede every 500 objects saved
1446 coroapi::cede_every (500);
1447
1448 /* Even if the object does have an owner, it would seem that we should 1444 /* Even if the object does have an owner, it would seem that we should
1449 * still save it. 1445 * still save it.
1450 */ 1446 */
1451 if (op->owner) 1447 if (op->owner)
1452 return; 1448 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines