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.22 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.39 by elmex, Wed Jan 3 02:51:09 2007 UTC

… …
26 variable. */ 26 variable. */
27 27
28 28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34/* Maps the MOVE_* values to names */ 33/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 35
… …
264static void 263static void
265check_loaded_object (object *op) 264check_loaded_object (object *op)
266{ 265{
267 int ip; 266 int ip;
268 267
269 /* 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.
270 * 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 -
271 * 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
272 * 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
273 * 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
274 * 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.
275 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
… …
280 279
281 if (!op->name_pl) 280 if (!op->name_pl)
282 op->name_pl = op->name; 281 op->name_pl = op->name;
283 282
284 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
286 { 285 {
287 if (op->map != NULL) 286 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
289 else 288 else
290 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
… …
321 { 320 {
322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
323 op->gen_sp_armour = op->last_heal; 322 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 323 op->last_heal = 0;
325 } 324 }
326 if (editor) 325
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 326 ip = calc_item_power (op, 0);
330 /* Legacy objects from before item power was in the game */ 327 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 328 if (!op->item_power && ip)
332 { 329 {
333 if (ip > 3) 330 if (ip > 3)
334 { 331 {
… …
488 SET_FLAG (op, flag); \ 485 SET_FLAG (op, flag); \
489 else \ 486 else \
490 CLEAR_FLAG (op, flag) \ 487 CLEAR_FLAG (op, flag) \
491 488
492int 489int
493parse_object (object *op, object_thawer & thawer, int map_flags) 490parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 491{
495 bool ismore = 0; 492 bool ismore = 0;
496 object *op_inv = op->inv; 493 object *op_inv = op->inv;
497 494
498 for (;;) 495 for (;;)
… …
503 { 500 {
504 case KW_Object: // uppercase alias 501 case KW_Object: // uppercase alias
505 case KW_object: 502 case KW_object:
506 thawer.get (op->name); 503 thawer.get (op->name);
507 504
508 if (op->arch != NULL) 505 if (op->arch)
509 op->arch->name = op->name; 506 op->arch->name = op->name;
510 507
511 break; 508 break;
512 509
513 case KW_uuid: 510 case KW_uuid:
… …
552 */ 549 */
553 archetype *arch = archetype::find (str); 550 archetype *arch = archetype::find (str);
554 551
555 object *tmp; 552 object *tmp;
556 553
557 if (arch != NULL) 554 if (arch)
558 tmp = arch_to_object (arch); 555 tmp = arch_to_object (arch);
559 else 556 else
560 { 557 {
561 tmp = object::create (); 558 tmp = object::create ();
562 /* record the name of the broken object */ 559 /* record the name of the broken object */
563 tmp->name = str; 560 tmp->name = str;
564 } 561 }
562
563 // decativate the object we, as we are still going
564 // to read the speed value. Objects should be activated
565 // when the map, object or player is completly loaded.
566 tmp->deactivate ();
565 567
566 parse_object (tmp, thawer, map_flags); 568 parse_object (tmp, thawer, map_flags);
567 569
568 if (tmp->arch) 570 if (tmp->arch)
569 { 571 {
… …
602 { 604 {
603 /* This is the actual archetype definition then */ 605 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 606 op->arch = archetype::find (str);
605 607
606 if (op->arch) 608 if (op->arch)
609 {
607 op->arch->clone.copy_to (op); 610 op->arch->clone.copy_to (op);
611 // copy_to activates, this should be fixed properly
612 op->deactivate ();
613 }
608 else if (!arch_init) 614 else if (!arch_init)
609 /* record the name of the broken object */ 615 /* record the name of the broken object */
610 op->name = str; 616 op->name = str;
611 } 617 }
612 } 618 }
… …
642 648
643 case KW_speed: 649 case KW_speed:
644 thawer.get (op->speed); 650 thawer.get (op->speed);
645 651
646 //TODO: maybe do in check_object 652 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 653 // removed check for style maps
648 {
649 if (op->speed < 0) 654 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 655 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
651
652 update_ob_speed (op);
653 }
654 656
655 break; 657 break;
656 658
657 case KW_slow_move: 659 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 660 op->move_slow |= MOVE_WALK;
… …
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 828 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 829 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 830 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 831 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 832 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 833 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 834 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 835 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 836 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 837 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
982 case KW_randomitems: 983 case KW_randomitems:
983 op->randomitems = find_treasurelist (thawer.get_str ()); 984 op->randomitems = find_treasurelist (thawer.get_str ());
984 break; 985 break;
985 986
986 case KW_msg: 987 case KW_msg:
987 {
988 thawer.get_ml (KW_endmsg, op->msg); 988 thawer.get_ml (KW_endmsg, op->msg);
989 //TODO: allow longer messages 989 //TODO: allow longer messages
990 if (strlen (op->msg) >= HUGE_BUF) 990 if (strlen (op->msg) >= HUGE_BUF)
991 { 991 {
992 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 992 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
993 op->msg = "ERROR, please report: string too long, winged.\n"; 993 op->msg = "ERROR, please report: string too long, winged.\n";
994 } 994 }
995 }
996 break; 995 break;
997 996
998 case KW_lore: 997 case KW_lore:
999 {
1000 shstr msgbuf;
1001
1002 thawer.get_ml (KW_endlore, op->lore); 998 thawer.get_ml (KW_endlore, op->lore);
1003 //TODO: allow longer messages 999 //TODO: allow longer messages
1004 /* Just print a warning so we can be reasonably safe 1000 /* Just print a warning so we can be reasonably safe
1005 * about not overflowing the buffer. 1001 * about not overflowing the buffer.
1006 */ 1002 */
1007 if (strlen (op->lore) > (HUGE_BUF / 2)) 1003 if (strlen (op->lore) > (HUGE_BUF / 2))
1008 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1004 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1009 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1005 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1010 }
1011 break; 1006 break;
1012 1007
1013 case KW_editable: 1008 case KW_editable:
1014 case KW_editor_folder: 1009 case KW_editor_folder:
1015 break; 1010 break;
… …
1032 1027
1033 case KW_EOF: 1028 case KW_EOF:
1034 return LL_EOF; 1029 return LL_EOF;
1035 1030
1036 case KW_ERROR: 1031 case KW_ERROR:
1037 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1032 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1038 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1033 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1039
1040 //TODO: skip line, ugly, factor parsing better
1041 if (thawer.last_value)
1042 thawer.line = thawer.last_value;
1043
1044 thawer.line += strlen (thawer.line) + 1;
1045
1046 break; 1034 break;
1047 1035
1048 default: 1036 default:
1049 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1037 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1050 break; 1038 break;
… …
1064 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1052 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1065 * be reset. 1053 * be reset.
1066 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1054 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1067 * 1055 *
1068 */ 1056 */
1069
1070int 1057int
1071load_object (object_thawer & fp, object *op, int map_flags) 1058load_object (object_thawer &fp, object *op, int map_flags)
1072{ 1059{
1060 coroapi::cede_every (1000); // cede once in a while
1061
1073 return parse_object (op, fp, map_flags); 1062 return parse_object (op, fp, map_flags);
1074} 1063}
1075
1076 1064
1077/* This takes a buffer, scans it for variables, and sets those variables 1065/* This takes a buffer, scans it for variables, and sets those variables
1078 * as appropriate in op. 1066 * as appropriate in op.
1079 * 1067 *
1080 * This function appears to be used in only 2 places - in crossedit to 1068 * This function appears to be used in only 2 places - in crossedit to
… …
1183 KW_monster, 1171 KW_monster,
1184 KW_friendly, 1172 KW_friendly,
1185 KW_generator, 1173 KW_generator,
1186 KW_is_thrown, 1174 KW_is_thrown,
1187 KW_auto_apply, 1175 KW_auto_apply,
1188 KW_treasure, 1176 KW_NULL, // was KW_treasure
1189 KW_player_sold, 1177 KW_player_sold,
1190 /* 20 */ 1178 /* 20 */
1191 KW_see_invisible, 1179 KW_see_invisible,
1192 KW_can_roll, 1180 KW_can_roll,
1193 KW_overlay_floor, 1181 KW_overlay_floor,
… …
1430 CMP_OUT (move_on); 1418 CMP_OUT (move_on);
1431 CMP_OUT (move_off); 1419 CMP_OUT (move_off);
1432 CMP_OUT (move_slow); 1420 CMP_OUT (move_slow);
1433 CMP_OUT (move_slow_penalty); 1421 CMP_OUT (move_slow_penalty);
1434 1422
1435 if (!COMPARE_FLAGS (op, tmp)) 1423 if (op->flag != tmp->flag)
1436 for (i = 0; i <= NUM_FLAGS; i++) 1424 for (i = 0; i <= NUM_FLAGS; i++)
1437 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1425 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1438 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1439 1427
1440 /* Save body locations */ 1428 /* Save body locations */
1441 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1442 if (op->body_info[i] != tmp->body_info[i]) 1430 if (op->body_info[i] != tmp->body_info[i])
1443 f.put (body_locations[i].save_name, op->body_info[i]); 1431 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1445 1433
1446/* 1434/*
1447 * Dumps all variables in an object to a file. 1435 * Dumps all variables in an object to a file.
1448 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1436 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1449 * the only place this is not set is when saving the player. 1437 * the only place this is not set is when saving the player.
1450 * If bit 1 of flag is set, don't remove the object after save. As of now,
1451 * all of the callers are setting this.
1452 */ 1438 */
1453
1454void 1439void
1455save_object (object_freezer & fp, object *op, int flag) 1440save_object (object_freezer &fp, object *op, int flag)
1456{ 1441{
1457 archetype *at;
1458 object *tmp, *old;
1459
1460 /* Even if the object does have an owner, it would seem that we should 1442 /* Even if the object does have an owner, it would seem that we should
1461 * still save it. 1443 * still save it.
1462 */ 1444 */
1463 if (op->owner) 1445 if (op->owner)
1464 return; 1446 return;
1465 1447
1466 /* If it is unpaid and we don't want to save those, just return. */ 1448 /* If it is unpaid and we don't want to save those, just return. */
1467 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1449 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1468 return; 1450 return;
1469 1451
1470 if ((at = op->arch) == NULL) 1452 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1471 at = empty_archetype;
1472 1453
1473 fp.put (KW_arch, at->name); 1454 fp.put (KW_arch, at->name);
1474
1475 put (fp, op, &at->clone); 1455 put (fp, op, &at->clone);
1476 1456
1477 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1457 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1478 1458
1479 old = NULL;
1480
1481 if (flag & 2)
1482 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1459 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1483 save_object (fp, tmp, flag); 1460 save_object (fp, tmp, flag);
1484 else
1485 /* Slightly different logic because tmp/op will be removed by
1486 * the save_object we call. So we just keep looking at op->inv
1487 * until there is nothing left. In theory, the variable old
1488 * should not be needed, as recursive loops shouldn't happen.
1489 */
1490 while ((tmp = op->inv) != NULL)
1491 {
1492 if (old == tmp)
1493 {
1494 LOG (llevError, " Recursive loop in inventory\n");
1495 break;
1496 }
1497
1498 save_object (fp, tmp, flag);
1499 old = tmp;
1500 }
1501
1502 if (!(flag & 2))
1503 op->destroy ();
1504 1461
1505 fp.put (op); 1462 fp.put (op);
1506 fprintf (fp, "end\n"); 1463 fp.put (KW_end);
1507} 1464}
1508 1465

Diff Legend

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