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.41 by root, Sun Jan 7 23:10:42 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
… …
26 variable. */ 27 variable. */
27 28
28 29
29#include <global.h> 30#include <global.h>
30#include <loader.h> 31#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 32#include <sproto.h>
33 33
34/* Maps the MOVE_* values to names */ 34/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 36
… …
264static void 264static void
265check_loaded_object (object *op) 265check_loaded_object (object *op)
266{ 266{
267 int ip; 267 int ip;
268 268
269 /* 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.
270 * 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 -
271 * 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
272 * 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
273 * 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
274 * 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.
275 * Otherwise, what happens is that the the plural name will lose 275 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 276 * information (appear as just 'hearts' and not 'goblins heart')
… …
280 280
281 if (!op->name_pl) 281 if (!op->name_pl)
282 op->name_pl = op->name; 282 op->name_pl = op->name;
283 283
284 /* objects now have a materialname. try to patch it in */ 284 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 285 if (!(op->is_weapon () && op->level > 0))
286 { 286 {
287 if (op->map != NULL) 287 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 288 set_materialname (op, op->map->difficulty, NULL);
289 else 289 else
290 set_materialname (op, 5, NULL); 290 set_materialname (op, 5, NULL);
… …
321 { 321 {
322 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 ());
323 op->gen_sp_armour = op->last_heal; 323 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 324 op->last_heal = 0;
325 } 325 }
326 if (editor) 326
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
330 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 329 if (!op->item_power && ip)
332 { 330 {
333 if (ip > 3) 331 if (ip > 3)
334 { 332 {
… …
488 SET_FLAG (op, flag); \ 486 SET_FLAG (op, flag); \
489 else \ 487 else \
490 CLEAR_FLAG (op, flag) \ 488 CLEAR_FLAG (op, flag) \
491 489
492int 490int
493parse_object (object *op, object_thawer & thawer, int map_flags) 491parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 492{
495 bool ismore = 0; 493 bool ismore = 0;
496 object *op_inv = op->inv; 494 object *op_inv = op->inv;
497 495
498 for (;;) 496 for (;;)
… …
503 { 501 {
504 case KW_Object: // uppercase alias 502 case KW_Object: // uppercase alias
505 case KW_object: 503 case KW_object:
506 thawer.get (op->name); 504 thawer.get (op->name);
507 505
508 if (op->arch != NULL) 506 if (op->arch)
509 op->arch->name = op->name; 507 op->arch->name = op->name;
510 508
511 break; 509 break;
512 510
513 case KW_uuid: 511 case KW_uuid:
… …
552 */ 550 */
553 archetype *arch = archetype::find (str); 551 archetype *arch = archetype::find (str);
554 552
555 object *tmp; 553 object *tmp;
556 554
557 if (arch != NULL) 555 if (arch)
558 tmp = arch_to_object (arch); 556 tmp = arch_to_object (arch);
559 else 557 else
560 { 558 {
561 tmp = object::create (); 559 tmp = object::create ();
562 /* record the name of the broken object */ 560 /* record the name of the broken object */
563 tmp->name = str; 561 tmp->name = str;
564 } 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 ();
565 568
566 parse_object (tmp, thawer, map_flags); 569 parse_object (tmp, thawer, map_flags);
567 570
568 if (tmp->arch) 571 if (tmp->arch)
569 { 572 {
… …
602 { 605 {
603 /* This is the actual archetype definition then */ 606 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 607 op->arch = archetype::find (str);
605 608
606 if (op->arch) 609 if (op->arch)
610 {
607 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 }
608 else if (!arch_init) 615 else if (!arch_init)
609 /* record the name of the broken object */ 616 /* record the name of the broken object */
610 op->name = str; 617 op->name = str;
611 } 618 }
612 } 619 }
… …
642 649
643 case KW_speed: 650 case KW_speed:
644 thawer.get (op->speed); 651 thawer.get (op->speed);
645 652
646 //TODO: maybe do in check_object 653 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 654 // removed check for style maps
648 {
649 if (op->speed < 0) 655 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
651
652 update_ob_speed (op);
653 }
654 657
655 break; 658 break;
656 659
657 case KW_slow_move: 660 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 661 op->move_slow |= MOVE_WALK;
… …
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 831 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; 832 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 833 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; 834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 835 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 836 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 837 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; 838 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
907 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;
908 911
909 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 912 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 913 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
911 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 914 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
912 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 915 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
982 case KW_randomitems: 985 case KW_randomitems:
983 op->randomitems = find_treasurelist (thawer.get_str ()); 986 op->randomitems = find_treasurelist (thawer.get_str ());
984 break; 987 break;
985 988
986 case KW_msg: 989 case KW_msg:
987 {
988 thawer.get_ml (KW_endmsg, op->msg); 990 thawer.get_ml (KW_endmsg, op->msg);
989 //TODO: allow longer messages 991 //TODO: allow longer messages
990 if (strlen (op->msg) >= HUGE_BUF) 992 if (strlen (op->msg) >= HUGE_BUF)
991 { 993 {
992 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);
993 op->msg = "ERROR, please report: string too long, winged.\n"; 995 op->msg = "ERROR, please report: string too long, winged.\n";
994 } 996 }
995 }
996 break; 997 break;
997 998
998 case KW_lore: 999 case KW_lore:
999 {
1000 shstr msgbuf;
1001
1002 thawer.get_ml (KW_endlore, op->lore); 1000 thawer.get_ml (KW_endlore, op->lore);
1003 //TODO: allow longer messages 1001 //TODO: allow longer messages
1004 /* Just print a warning so we can be reasonably safe 1002 /* Just print a warning so we can be reasonably safe
1005 * about not overflowing the buffer. 1003 * about not overflowing the buffer.
1006 */ 1004 */
1007 if (strlen (op->lore) > (HUGE_BUF / 2)) 1005 if (strlen (op->lore) > (HUGE_BUF / 2))
1008 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",
1009 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1010 }
1011 break; 1008 break;
1012 1009
1013 case KW_editable: 1010 case KW_editable:
1014 case KW_editor_folder: 1011 case KW_editor_folder:
1015 break; 1012 break;
… …
1032 1029
1033 case KW_EOF: 1030 case KW_EOF:
1034 return LL_EOF; 1031 return LL_EOF;
1035 1032
1036 case KW_ERROR: 1033 case KW_ERROR:
1037 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1034 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1038 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1035 //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; 1036 break;
1047 1037
1048 default: 1038 default:
1049 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1039 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1050 break; 1040 break;
… …
1064 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1054 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1065 * be reset. 1055 * be reset.
1066 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1056 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1067 * 1057 *
1068 */ 1058 */
1069
1070int 1059int
1071load_object (object_thawer & fp, object *op, int map_flags) 1060load_object (object_thawer &fp, object *op, int map_flags)
1072{ 1061{
1062 coroapi::cede_every (1000); // cede once in a while
1063
1073 return parse_object (op, fp, map_flags); 1064 return parse_object (op, fp, map_flags);
1074} 1065}
1075
1076 1066
1077/* 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
1078 * as appropriate in op. 1068 * as appropriate in op.
1079 * 1069 *
1080 * This function appears to be used in only 2 places - in crossedit to 1070 * This function appears to be used in only 2 places - in crossedit to
… …
1183 KW_monster, 1173 KW_monster,
1184 KW_friendly, 1174 KW_friendly,
1185 KW_generator, 1175 KW_generator,
1186 KW_is_thrown, 1176 KW_is_thrown,
1187 KW_auto_apply, 1177 KW_auto_apply,
1188 KW_treasure, 1178 KW_NULL, // was KW_treasure
1189 KW_player_sold, 1179 KW_player_sold,
1190 /* 20 */ 1180 /* 20 */
1191 KW_see_invisible, 1181 KW_see_invisible,
1192 KW_can_roll, 1182 KW_can_roll,
1193 KW_overlay_floor, 1183 KW_overlay_floor,
… …
1285 KW_is_water, 1275 KW_is_water,
1286 KW_use_content_on_gen, 1276 KW_use_content_on_gen,
1287 KW_NULL, 1277 KW_NULL,
1288 KW_is_buildable, 1278 KW_is_buildable,
1289 /* 110 */ 1279 /* 110 */
1280 KW_destroy_on_death,
1290 }; 1281 };
1291 1282
1292 int i; 1283 int i;
1293 1284
1294 /* 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
… …
1430 CMP_OUT (move_on); 1421 CMP_OUT (move_on);
1431 CMP_OUT (move_off); 1422 CMP_OUT (move_off);
1432 CMP_OUT (move_slow); 1423 CMP_OUT (move_slow);
1433 CMP_OUT (move_slow_penalty); 1424 CMP_OUT (move_slow_penalty);
1434 1425
1435 if (!COMPARE_FLAGS (op, tmp)) 1426 if (op->flag != tmp->flag)
1436 for (i = 0; i <= NUM_FLAGS; i++) 1427 for (i = 0; i <= NUM_FLAGS; i++)
1437 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1428 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1438 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1429 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1439 1430
1440 /* Save body locations */ 1431 /* Save body locations */
1441 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1432 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1442 if (op->body_info[i] != tmp->body_info[i]) 1433 if (op->body_info[i] != tmp->body_info[i])
1443 f.put (body_locations[i].save_name, op->body_info[i]); 1434 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1445 1436
1446/* 1437/*
1447 * Dumps all variables in an object to a file. 1438 * 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, 1439 * 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. 1440 * 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 */ 1441 */
1453
1454void 1442void
1455save_object (object_freezer & fp, object *op, int flag) 1443save_object (object_freezer &fp, object *op, int flag)
1456{ 1444{
1457 archetype *at;
1458 object *tmp, *old;
1459
1460 /* Even if the object does have an owner, it would seem that we should 1445 /* Even if the object does have an owner, it would seem that we should
1461 * still save it. 1446 * still save it.
1462 */ 1447 */
1463 if (op->owner) 1448 if (op->owner)
1464 return; 1449 return;
1465 1450
1466 /* If it is unpaid and we don't want to save those, just return. */ 1451 /* If it is unpaid and we don't want to save those, just return. */
1467 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1452 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1468 return; 1453 return;
1469 1454
1470 if ((at = op->arch) == NULL) 1455 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1471 at = empty_archetype;
1472 1456
1473 fp.put (KW_arch, at->name); 1457 fp.put (KW_arch, at->name);
1474
1475 put (fp, op, &at->clone); 1458 put (fp, op, &at->clone);
1476 1459
1477 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1460 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1478 1461
1479 old = NULL;
1480
1481 if (flag & 2)
1482 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1483 save_object (fp, tmp, flag); 1463 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 1464
1505 fp.put (op); 1465 fp.put (op);
1506 fprintf (fp, "end\n"); 1466 fp.put (KW_end);
1507} 1467}
1508 1468

Diff Legend

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