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.26 by elmex, Mon Dec 18 17:10:07 2006 UTC vs.
Revision 1.40 by pippijn, Sat Jan 6 14:42:29 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 {
… …
487 SET_FLAG (op, flag); \ 486 SET_FLAG (op, flag); \
488 else \ 487 else \
489 CLEAR_FLAG (op, flag) \ 488 CLEAR_FLAG (op, flag) \
490 489
491int 490int
492parse_object (object *op, object_thawer & thawer, int map_flags) 491parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 492{
494 bool ismore = 0; 493 bool ismore = 0;
495 object *op_inv = op->inv; 494 object *op_inv = op->inv;
496 495
497 for (;;) 496 for (;;)
… …
502 { 501 {
503 case KW_Object: // uppercase alias 502 case KW_Object: // uppercase alias
504 case KW_object: 503 case KW_object:
505 thawer.get (op->name); 504 thawer.get (op->name);
506 505
507 if (op->arch != NULL) 506 if (op->arch)
508 op->arch->name = op->name; 507 op->arch->name = op->name;
509 508
510 break; 509 break;
511 510
512 case KW_uuid: 511 case KW_uuid:
… …
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;
… …
980 case KW_randomitems: 984 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 985 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 986 break;
983 987
984 case KW_msg: 988 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 989 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 990 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 991 if (strlen (op->msg) >= HUGE_BUF)
989 { 992 {
990 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 993 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"; 994 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 995 }
993 }
994 break; 996 break;
995 997
996 case KW_lore: 998 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 999 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1000 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1001 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1002 * about not overflowing the buffer.
1004 */ 1003 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1004 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1005 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1006 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1007 break;
1010 1008
1011 case KW_editable: 1009 case KW_editable:
1012 case KW_editor_folder: 1010 case KW_editor_folder:
1013 break; 1011 break;
… …
1030 1028
1031 case KW_EOF: 1029 case KW_EOF:
1032 return LL_EOF; 1030 return LL_EOF;
1033 1031
1034 case KW_ERROR: 1032 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1033 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1034 //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; 1035 break;
1045 1036
1046 default: 1037 default:
1047 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1038 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1048 break; 1039 break;
… …
1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1053 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063 * be reset. 1054 * be reset.
1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1055 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065 * 1056 *
1066 */ 1057 */
1067
1068int 1058int
1069load_object (object_thawer & fp, object *op, int map_flags) 1059load_object (object_thawer &fp, object *op, int map_flags)
1070{ 1060{
1061 coroapi::cede_every (1000); // cede once in a while
1062
1071 return parse_object (op, fp, map_flags); 1063 return parse_object (op, fp, map_flags);
1072} 1064}
1073
1074 1065
1075/* This takes a buffer, scans it for variables, and sets those variables 1066/* This takes a buffer, scans it for variables, and sets those variables
1076 * as appropriate in op. 1067 * as appropriate in op.
1077 * 1068 *
1078 * This function appears to be used in only 2 places - in crossedit to 1069 * This function appears to be used in only 2 places - in crossedit to
… …
1428 CMP_OUT (move_on); 1419 CMP_OUT (move_on);
1429 CMP_OUT (move_off); 1420 CMP_OUT (move_off);
1430 CMP_OUT (move_slow); 1421 CMP_OUT (move_slow);
1431 CMP_OUT (move_slow_penalty); 1422 CMP_OUT (move_slow_penalty);
1432 1423
1433 if (op->flags != tmp->flags) 1424 if (op->flag != tmp->flag)
1434 for (i = 0; i <= NUM_FLAGS; i++) 1425 for (i = 0; i <= NUM_FLAGS; i++)
1435 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1426 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1436 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1427 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1437 1428
1438 /* Save body locations */ 1429 /* Save body locations */
1439 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1430 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1440 if (op->body_info[i] != tmp->body_info[i]) 1431 if (op->body_info[i] != tmp->body_info[i])
1441 f.put (body_locations[i].save_name, op->body_info[i]); 1432 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1443 1434
1444/* 1435/*
1445 * Dumps all variables in an object to a file. 1436 * Dumps all variables in an object to a file.
1446 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1437 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1447 * the only place this is not set is when saving the player. 1438 * the only place this is not set is when saving the player.
1448 * If bit 1 of flag is set, don't remove the object after save. As of now,
1449 * all of the callers are setting this.
1450 */ 1439 */
1451
1452void 1440void
1453save_object (object_freezer & fp, object *op, int flag) 1441save_object (object_freezer &fp, object *op, int flag)
1454{ 1442{
1455 archetype *at;
1456 object *tmp, *old;
1457
1458 /* Even if the object does have an owner, it would seem that we should 1443 /* Even if the object does have an owner, it would seem that we should
1459 * still save it. 1444 * still save it.
1460 */ 1445 */
1461 if (op->owner) 1446 if (op->owner)
1462 return; 1447 return;
1463 1448
1464 /* If it is unpaid and we don't want to save those, just return. */ 1449 /* If it is unpaid and we don't want to save those, just return. */
1465 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1450 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466 return; 1451 return;
1467 1452
1468 if ((at = op->arch) == NULL) 1453 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1469 at = empty_archetype;
1470 1454
1471 fp.put (KW_arch, at->name); 1455 fp.put (KW_arch, at->name);
1472
1473 put (fp, op, &at->clone); 1456 put (fp, op, &at->clone);
1474 1457
1475 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1458 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476 1459
1477 old = NULL;
1478
1479 if (flag & 2)
1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1460 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481 save_object (fp, tmp, flag); 1461 save_object (fp, tmp, flag);
1482 else
1483 /* Slightly different logic because tmp/op will be removed by
1484 * the save_object we call. So we just keep looking at op->inv
1485 * until there is nothing left. In theory, the variable old
1486 * should not be needed, as recursive loops shouldn't happen.
1487 */
1488 while ((tmp = op->inv) != NULL)
1489 {
1490 if (old == tmp)
1491 {
1492 LOG (llevError, " Recursive loop in inventory\n");
1493 break;
1494 }
1495
1496 save_object (fp, tmp, flag);
1497 old = tmp;
1498 }
1499
1500 if (!(flag & 2))
1501 op->destroy ();
1502 1462
1503 fp.put (op); 1463 fp.put (op);
1504 fprintf (fp, "end\n"); 1464 fp.put (KW_end);
1505} 1465}
1506 1466

Diff Legend

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