ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.40 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.44 by root, Mon Dec 18 04:07:30 2006 UTC

… …
27 27
28#include <loader.h> 28#include <loader.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include "path.h" 31#include "path.h"
32
33 32
34/* 33/*
35 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
36 * return NULL if no match is found. 35 * return NULL if no match is found.
37 */ 36 */
… …
550 } 549 }
551 550
552 551
553 switch (i) 552 switch (i)
554 { 553 {
555 case LL_NORMAL: 554 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 555 /* if we are loading an overlay, put the floors on the bottom */
557 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 556 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 557 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
559 else 558 else
560 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 559 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
561 560
562 if (op->inv) 561 if (op->inv)
563 sum_weight (op); 562 sum_weight (op);
564 563
565 prev = op, last_more = op; 564 prev = op, last_more = op;
566 break; 565 break;
567 566
568 case LL_MORE: 567 case LL_MORE:
569 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 568 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
570 op->head = prev, last_more->more = op, last_more = op; 569 op->head = prev, last_more->more = op, last_more = op;
571 break; 570 break;
572 } 571 }
573 572
574 if (mapflags & MAP_STYLE) 573 if (mapflags & MAP_STYLE)
575 remove_from_active_list (op); 574 remove_from_active_list (op);
576 575
… …
586 /* check for unique items, or unique squares */ 585 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 586 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above)
588 { 587 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 588 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 589 unique = 1;
590
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
593 } 593 }
594 } 594 }
595 } 595 }
… …
729 char *shop_string, *p, *q, *next_semicolon, *next_colon; 729 char *shop_string, *p, *q, *next_semicolon, *next_colon;
730 shopitems *items = NULL; 730 shopitems *items = NULL;
731 int i = 0, number_of_entries = 0; 731 int i = 0, number_of_entries = 0;
732 const typedata *current_type; 732 const typedata *current_type;
733 733
734 shop_string = strdup_local (input_string); 734 shop_string = strdup (input_string);
735 p = shop_string; 735 p = shop_string;
736 /* first we'll count the entries, we'll need that for allocating the array shortly */ 736 /* first we'll count the entries, we'll need that for allocating the array shortly */
737 while (p) 737 while (p)
738 { 738 {
739 p = strchr (p, ';'); 739 p = strchr (p, ';');
… …
925 * with nothing between). There is no reason in those cases to 925 * with nothing between). There is no reason in those cases to
926 * keep the empty message. Also, msgbuf contains garbage data 926 * keep the empty message. Also, msgbuf contains garbage data
927 * when msgpos is zero, so copying it results in crashes 927 * when msgpos is zero, so copying it results in crashes
928 */ 928 */
929 if (msgpos != 0) 929 if (msgpos != 0)
930 m->msg = strdup_local (msgbuf); 930 m->msg = strdup (msgbuf);
931 } 931 }
932 else if (!strcmp (key, "maplore")) 932 else if (!strcmp (key, "maplore"))
933 { 933 {
934 while (fgets (buf, HUGE_BUF, fp) != NULL) 934 while (fgets (buf, HUGE_BUF, fp) != NULL)
935 { 935 {
… …
941 strcpy (maplorebuf + maplorepos, buf); 941 strcpy (maplorebuf + maplorepos, buf);
942 maplorepos += strlen (buf); 942 maplorepos += strlen (buf);
943 } 943 }
944 } 944 }
945 if (maplorepos != 0) 945 if (maplorepos != 0)
946 m->maplore = strdup_local (maplorebuf); 946 m->maplore = strdup (maplorebuf);
947 } 947 }
948 else if (!strcmp (key, "end")) 948 else if (!strcmp (key, "end"))
949 { 949 {
950 break; 950 break;
951 } 951 }
… …
960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
961 } 961 }
962 else if (!strcmp (key, "name")) 962 else if (!strcmp (key, "name"))
963 { 963 {
964 *end = 0; 964 *end = 0;
965 m->name = strdup_local (value); 965 m->name = strdup (value);
966 } 966 }
967 /* first strcmp value on these are old names supported 967 /* first strcmp value on these are old names supported
968 * for compatibility reasons. The new values (second) are 968 * for compatibility reasons. The new values (second) are
969 * what really should be used. 969 * what really should be used.
970 */ 970 */
971 else if (!strcmp (key, "oid")) 971 else if (!strcmp (key, "oid"))
972 {
973 fp.get (m, atoi (value)); 972 fp.get (m, atoi (value));
974 }
975 else if (!strcmp (key, "attach")) 973 else if (!strcmp (key, "attach"))
976 {
977 m->attach = value; 974 m->attach = value;
978 }
979 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 975 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980 {
981 m->enter_x = atoi (value); 976 m->enter_x = atoi (value);
982 }
983 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 977 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984 {
985 m->enter_y = atoi (value); 978 m->enter_y = atoi (value);
986 }
987 else if (!strcmp (key, "x") || !strcmp (key, "width")) 979 else if (!strcmp (key, "x") || !strcmp (key, "width"))
988 {
989 m->width = atoi (value); 980 m->width = atoi (value);
990 }
991 else if (!strcmp (key, "y") || !strcmp (key, "height")) 981 else if (!strcmp (key, "y") || !strcmp (key, "height"))
992 {
993 m->height = atoi (value); 982 m->height = atoi (value);
994 }
995 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 983 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996 {
997 m->reset_timeout = atoi (value); 984 m->reset_timeout = atoi (value);
998 }
999 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 985 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000 {
1001 m->timeout = atoi (value); 986 m->timeout = atoi (value);
1002 }
1003 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 987 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004 { 988 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1005 m->difficulty = atoi (value);
1006 }
1007 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 989 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008 {
1009 m->darkness = atoi (value); 990 m->darkness = atoi (value);
1010 }
1011 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 991 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012 {
1013 m->fixed_resettime = atoi (value); 992 m->fixed_resettime = atoi (value);
1014 }
1015 else if (!strcmp (key, "unique")) 993 else if (!strcmp (key, "unique"))
1016 {
1017 m->unique = atoi (value); 994 m->unique = atoi (value);
1018 }
1019 else if (!strcmp (key, "template")) 995 else if (!strcmp (key, "template"))
1020 {
1021 m->templatemap = atoi (value); 996 m->templatemap = atoi (value);
1022 }
1023 else if (!strcmp (key, "region")) 997 else if (!strcmp (key, "region"))
1024 {
1025 m->region = get_region_by_name (value); 998 m->region = get_region_by_name (value);
1026 }
1027 else if (!strcmp (key, "shopitems")) 999 else if (!strcmp (key, "shopitems"))
1028 { 1000 {
1029 *end = 0; 1001 *end = 0;
1030 m->shopitems = parse_shop_string (value); 1002 m->shopitems = parse_shop_string (value);
1031 } 1003 }
1032 else if (!strcmp (key, "shopgreed")) 1004 else if (!strcmp (key, "shopgreed"))
1033 {
1034 m->shopgreed = atof (value); 1005 m->shopgreed = atof (value);
1035 }
1036 else if (!strcmp (key, "shopmin")) 1006 else if (!strcmp (key, "shopmin"))
1037 {
1038 m->shopmin = atol (value); 1007 m->shopmin = atol (value);
1039 }
1040 else if (!strcmp (key, "shopmax")) 1008 else if (!strcmp (key, "shopmax"))
1041 {
1042 m->shopmax = atol (value); 1009 m->shopmax = atol (value);
1043 }
1044 else if (!strcmp (key, "shoprace")) 1010 else if (!strcmp (key, "shoprace"))
1045 { 1011 {
1046 *end = 0; 1012 *end = 0;
1047 m->shoprace = strdup_local (value); 1013 m->shoprace = strdup (value);
1048 } 1014 }
1049 else if (!strcmp (key, "outdoor")) 1015 else if (!strcmp (key, "outdoor"))
1050 {
1051 m->outdoor = atoi (value); 1016 m->outdoor = atoi (value);
1052 }
1053 else if (!strcmp (key, "temp")) 1017 else if (!strcmp (key, "temp"))
1054 {
1055 m->temp = atoi (value); 1018 m->temp = atoi (value);
1056 }
1057 else if (!strcmp (key, "pressure")) 1019 else if (!strcmp (key, "pressure"))
1058 {
1059 m->pressure = atoi (value); 1020 m->pressure = atoi (value);
1060 }
1061 else if (!strcmp (key, "humid")) 1021 else if (!strcmp (key, "humid"))
1062 {
1063 m->humid = atoi (value); 1022 m->humid = atoi (value);
1064 }
1065 else if (!strcmp (key, "windspeed")) 1023 else if (!strcmp (key, "windspeed"))
1066 {
1067 m->windspeed = atoi (value); 1024 m->windspeed = atoi (value);
1068 }
1069 else if (!strcmp (key, "winddir")) 1025 else if (!strcmp (key, "winddir"))
1070 {
1071 m->winddir = atoi (value); 1026 m->winddir = atoi (value);
1072 }
1073 else if (!strcmp (key, "sky")) 1027 else if (!strcmp (key, "sky"))
1074 {
1075 m->sky = atoi (value); 1028 m->sky = atoi (value);
1076 }
1077 else if (!strcmp (key, "nosmooth")) 1029 else if (!strcmp (key, "nosmooth"))
1078 {
1079 m->nosmooth = atoi (value); 1030 m->nosmooth = atoi (value);
1080 }
1081 else if (!strncmp (key, "tile_path_", 10)) 1031 else if (!strncmp (key, "tile_path_", 10))
1082 { 1032 {
1083 int tile = atoi (key + 10); 1033 int tile = atoi (key + 10);
1084 1034
1085 if (tile < 1 || tile > 4) 1035 if (tile < 1 || tile > 4)
… …
1118 } 1068 }
1119 1069
1120 if (editor) 1070 if (editor)
1121 { 1071 {
1122 /* Use the value as in the file. */ 1072 /* Use the value as in the file. */
1123 m->tile_path[tile - 1] = strdup_local (value); 1073 m->tile_path[tile - 1] = strdup (value);
1124 } 1074 }
1125 else if (path != NULL) 1075 else if (path != NULL)
1126 { 1076 {
1127 /* Use the normalized value. */ 1077 /* Use the normalized value. */
1128 m->tile_path[tile - 1] = strdup_local (path); 1078 m->tile_path[tile - 1] = strdup (path);
1129 } 1079 }
1130 } /* end if tile direction (in)valid */ 1080 } /* end if tile direction (in)valid */
1131 } 1081 }
1132 else 1082 else
1133 {
1134 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1083 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1135 }
1136 } 1084 }
1085
1137 if (!key || strcmp (key, "end")) 1086 if (!key || strcmp (key, "end"))
1138 { 1087 {
1139 LOG (llevError, "Got premature eof on map header!\n"); 1088 LOG (llevError, "Got premature eof on map header!\n");
1140 return 1; 1089 return 1;
1141 } 1090 }
1091
1142 return 0; 1092 return 0;
1143} 1093}
1144 1094
1145/* 1095/*
1146 * Opens the file "filename" and reads information about the map 1096 * Opens the file "filename" and reads information about the map
… …
1392 make_path_to_file (filename); 1342 make_path_to_file (filename);
1393 } 1343 }
1394 else 1344 else
1395 { 1345 {
1396 if (!m->tmpname) 1346 if (!m->tmpname)
1397 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1347 m->tmpname = tempnam (settings.tmpdir, NULL);
1398 1348
1399 strcpy (filename, m->tmpname); 1349 strcpy (filename, m->tmpname);
1400 } 1350 }
1401 1351
1402 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1352 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1581 if (!m->in_memory) 1531 if (!m->in_memory)
1582 { 1532 {
1583 LOG (llevError, "Trying to free freed map.\n"); 1533 LOG (llevError, "Trying to free freed map.\n");
1584 return; 1534 return;
1585 } 1535 }
1536
1537 // TODO: use new/delete
1538#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1539
1586 if (flag && m->spaces) 1540 if (flag && m->spaces)
1587 free_all_objects (m); 1541 free_all_objects (m);
1588 if (m->name) 1542 if (m->name)
1589 FREE_AND_CLEAR (m->name); 1543 FREE_AND_CLEAR (m->name);
1590 if (m->spaces) 1544 if (m->spaces)
1591 FREE_AND_CLEAR (m->spaces); 1545 FREE_AND_CLEAR (m->spaces);
1592 if (m->msg) 1546 if (m->msg)
1593 FREE_AND_CLEAR (m->msg); 1547 FREE_AND_CLEAR (m->msg);
1594 if (m->maplore) 1548 if (m->maplore)
1595 FREE_AND_CLEAR (m->maplore); 1549 FREE_AND_CLEAR (m->maplore);
1596 if (m->shopitems) 1550
1597 delete[]m->shopitems; 1551 delete [] m->shopitems;
1598 m->shopitems = 0; 1552 m->shopitems = 0;
1553
1599 if (m->shoprace) 1554 if (m->shoprace)
1600 FREE_AND_CLEAR (m->shoprace); 1555 FREE_AND_CLEAR (m->shoprace);
1556
1601 if (m->buttons) 1557 if (m->buttons)
1602 free_objectlinkpt (m->buttons); 1558 free_objectlinkpt (m->buttons);
1559
1603 m->buttons = NULL; 1560 m->buttons = NULL;
1561
1604 for (i = 0; i < 4; i++) 1562 for (i = 0; i < 4; i++)
1605 { 1563 {
1606 if (m->tile_path[i]) 1564 if (m->tile_path[i])
1607 FREE_AND_CLEAR (m->tile_path[i]); 1565 FREE_AND_CLEAR (m->tile_path[i]);
1608 m->tile_map[i] = NULL; 1566 m->tile_map[i] = NULL;
1609 } 1567 }
1568
1610 m->in_memory = MAP_SWAPPED; 1569 m->in_memory = MAP_SWAPPED;
1570
1571#undef FREE_AND_CLEAR
1572
1611} 1573}
1612 1574
1613/* 1575/*
1614 * function: vanish maptile 1576 * function: vanish maptile
1615 * m : pointer to maptile, if NULL no action 1577 * m : pointer to maptile, if NULL no action
… …
1675 else 1637 else
1676 last->next = m->next; 1638 last->next = m->next;
1677 1639
1678 delete m; 1640 delete m;
1679} 1641}
1680
1681
1682 1642
1683/* 1643/*
1684 * Makes sure the given map is loaded and swapped in. 1644 * Makes sure the given map is loaded and swapped in.
1685 * name is path name of the map. 1645 * name is path name of the map.
1686 * flags meaning: 1646 * flags meaning:
… …
1689 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1649 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1690 * dont do any more name translation on it. 1650 * dont do any more name translation on it.
1691 * 1651 *
1692 * Returns a pointer to the given map. 1652 * Returns a pointer to the given map.
1693 */ 1653 */
1694
1695maptile * 1654maptile *
1696ready_map_name (const char *name, int flags) 1655ready_map_name (const char *name, int flags)
1697{ 1656{
1698 maptile *m; 1657 maptile *m;
1699 1658
… …
2145 timeout = MAP_RESET_TIMEOUT (map); 2104 timeout = MAP_RESET_TIMEOUT (map);
2146 if (timeout <= 0) 2105 if (timeout <= 0)
2147 timeout = MAP_DEFAULTRESET; 2106 timeout = MAP_DEFAULTRESET;
2148 if (timeout >= MAP_MAXRESET) 2107 if (timeout >= MAP_MAXRESET)
2149 timeout = MAP_MAXRESET; 2108 timeout = MAP_MAXRESET;
2150 MAP_WHEN_RESET (map) = seconds () + timeout; 2109 MAP_WHEN_RESET (map) = time (0) + timeout;
2151} 2110}
2152 2111
2153/* this updates the orig_map->tile_map[tile_num] value after loading 2112/* this updates the orig_map->tile_map[tile_num] value after loading
2154 * the map. It also takes care of linking back the freshly loaded 2113 * the map. It also takes care of linking back the freshly loaded
2155 * maps tile_map values if it tiles back to this one. It returns 2114 * maps tile_map values if it tiles back to this one. It returns

Diff Legend

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