1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * 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 |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
… | |
… | |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
26 | variable. */ |
26 | variable. */ |
… | |
… | |
33 | #include <sproto.h> |
33 | #include <sproto.h> |
34 | #include <loader.h> |
34 | #include <loader.h> |
35 | |
35 | |
36 | #include <bitset> |
36 | #include <bitset> |
37 | |
37 | |
38 | int nrofallocobjects = 0; |
38 | UUID UUID::cur; |
39 | static UUID uuid; |
|
|
40 | const uint64 UUID_SKIP = 1<<19; |
39 | static const uint64 UUID_SKIP = 1<<19; |
41 | |
40 | |
42 | objectvec objects; |
41 | objectvec objects; |
43 | activevec actives; |
42 | activevec actives; |
44 | |
43 | |
45 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | short freearr_x[SIZEOFFREE] = { |
|
|
45 | 0, |
|
|
46 | 0, 1, 1, 1, 0, -1, -1, -1, |
|
|
47 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
46 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
48 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
47 | }; |
49 | }; |
48 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
50 | short freearr_y[SIZEOFFREE] = { |
|
|
51 | 0, |
|
|
52 | -1, -1, 0, 1, 1, 1, 0, -1, |
|
|
53 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
49 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
54 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
50 | }; |
55 | }; |
51 | int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, |
56 | int maxfree[SIZEOFFREE] = { |
|
|
57 | 0, |
|
|
58 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
59 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
52 | 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
60 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
53 | }; |
61 | }; |
54 | int freedir[SIZEOFFREE] = { |
62 | int freedir[SIZEOFFREE] = { |
55 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 0, |
|
|
64 | 1, 2, 3, 4, 5, 6, 7, 8, |
|
|
65 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
56 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
66 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
57 | }; |
67 | }; |
58 | |
68 | |
59 | static void |
69 | static void |
60 | write_uuid (void) |
70 | write_uuid (uval64 skip, bool sync) |
61 | { |
71 | { |
62 | char filename1[MAX_BUF], filename2[MAX_BUF]; |
72 | CALL_BEGIN (2); |
63 | |
73 | CALL_ARG_SV (newSVval64 (skip)); |
64 | sprintf (filename1, "%s/uuid", settings.localdir); |
74 | CALL_ARG_SV (boolSV (sync)); |
65 | sprintf (filename2, "%s/uuid~", settings.localdir); |
75 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
66 | |
76 | CALL_END; |
67 | FILE *fp; |
|
|
68 | |
|
|
69 | if (!(fp = fopen (filename2, "w"))) |
|
|
70 | { |
|
|
71 | LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); |
|
|
72 | return; |
|
|
73 | } |
|
|
74 | |
|
|
75 | fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); |
|
|
76 | fclose (fp); |
|
|
77 | rename (filename2, filename1); |
|
|
78 | } |
77 | } |
79 | |
78 | |
80 | static void |
79 | static void |
81 | read_uuid (void) |
80 | read_uuid (void) |
82 | { |
81 | { |
… | |
… | |
89 | if (!(fp = fopen (filename, "r"))) |
88 | if (!(fp = fopen (filename, "r"))) |
90 | { |
89 | { |
91 | if (errno == ENOENT) |
90 | if (errno == ENOENT) |
92 | { |
91 | { |
93 | LOG (llevInfo, "RESET uid to 1\n"); |
92 | LOG (llevInfo, "RESET uid to 1\n"); |
94 | uuid.seq = 0; |
93 | UUID::cur.seq = 0; |
95 | write_uuid (); |
94 | write_uuid (UUID_SKIP, true); |
96 | return; |
95 | return; |
97 | } |
96 | } |
98 | |
97 | |
99 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
98 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
100 | _exit (1); |
99 | _exit (1); |
101 | } |
100 | } |
102 | |
101 | |
103 | int version; |
102 | UUID::BUF buf; |
104 | unsigned long long uid; |
103 | buf[0] = 0; |
105 | if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) |
104 | fgets (buf, sizeof (buf), fp); |
|
|
105 | |
|
|
106 | if (!UUID::cur.parse (buf)) |
106 | { |
107 | { |
107 | LOG (llevError, "FATAL: error reading uid from %s!\n", filename); |
108 | LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf); |
108 | _exit (1); |
109 | _exit (1); |
109 | } |
110 | } |
110 | |
111 | |
111 | uuid.seq = uid; |
112 | LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ()); |
112 | write_uuid (); |
113 | |
113 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
114 | write_uuid (UUID_SKIP, true); |
114 | fclose (fp); |
115 | fclose (fp); |
115 | } |
116 | } |
116 | |
117 | |
117 | UUID |
118 | UUID |
118 | gen_uuid () |
119 | UUID::gen () |
119 | { |
120 | { |
120 | UUID uid; |
121 | UUID uid; |
121 | |
122 | |
122 | uid.seq = ++uuid.seq; |
123 | uid.seq = ++cur.seq; |
123 | |
124 | |
124 | if (!(uuid.seq & (UUID_SKIP - 1))) |
125 | if (expect_false (!(cur.seq & (UUID_SKIP - 1)))) |
125 | write_uuid (); |
126 | write_uuid (UUID_SKIP, false); |
126 | |
127 | |
127 | return uid; |
128 | return uid; |
128 | } |
129 | } |
129 | |
130 | |
130 | void |
131 | void |
131 | init_uuid () |
132 | UUID::init () |
132 | { |
133 | { |
133 | read_uuid (); |
134 | read_uuid (); |
134 | } |
135 | } |
135 | |
136 | |
136 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
137 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
… | |
… | |
254 | /* This is really a spellbook check - really, we should |
255 | /* This is really a spellbook check - really, we should |
255 | * check all objects in the inventory. |
256 | * check all objects in the inventory. |
256 | */ |
257 | */ |
257 | if (ob1->inv || ob2->inv) |
258 | if (ob1->inv || ob2->inv) |
258 | { |
259 | { |
259 | /* if one object has inventory but the other doesn't, not equiv */ |
260 | if (!(ob1->inv && ob2->inv)) |
260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
261 | return 0; /* inventories differ in length */ |
261 | return 0; |
|
|
262 | |
262 | |
263 | /* Now check to see if the two inventory objects could merge */ |
263 | if (ob1->inv->below || ob2->inv->below) |
|
|
264 | return 0; /* more than one object in inv */ |
|
|
265 | |
264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | return 0; |
267 | return 0; /* inventory objexts differ */ |
266 | |
268 | |
267 | /* inventory ok - still need to check rest of this object to see |
269 | /* inventory ok - still need to check rest of this object to see |
268 | * if it is valid. |
270 | * if it is valid. |
269 | */ |
271 | */ |
270 | } |
272 | } |
… | |
… | |
305 | { |
307 | { |
306 | ob1->optimise (); |
308 | ob1->optimise (); |
307 | ob2->optimise (); |
309 | ob2->optimise (); |
308 | |
310 | |
309 | if (ob1->self || ob2->self) |
311 | if (ob1->self || ob2->self) |
310 | if (!cfperl_can_merge (ob1, ob2)) |
312 | { |
|
|
313 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
314 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
315 | |
|
|
316 | if (k1 != k2) |
311 | return 0; |
317 | return 0; |
|
|
318 | else if (k1 == 0) |
|
|
319 | return 1; |
|
|
320 | else if (!cfperl_can_merge (ob1, ob2)) |
|
|
321 | return 0; |
|
|
322 | } |
312 | } |
323 | } |
313 | |
324 | |
314 | /* Everything passes, must be OK. */ |
325 | /* Everything passes, must be OK. */ |
315 | return 1; |
326 | return 1; |
316 | } |
327 | } |
… | |
… | |
419 | break; |
430 | break; |
420 | |
431 | |
421 | return op; |
432 | return op; |
422 | } |
433 | } |
423 | |
434 | |
424 | void |
|
|
425 | free_all_object_data () |
|
|
426 | { |
|
|
427 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
|
|
428 | } |
|
|
429 | |
|
|
430 | /* |
435 | /* |
431 | * Sets the owner and sets the skill and exp pointers to owner's current |
436 | * Sets the owner and sets the skill and exp pointers to owner's current |
432 | * skill and experience objects. |
437 | * skill and experience objects. |
433 | * ACTUALLY NO! investigate! TODO |
438 | * ACTUALLY NO! investigate! TODO |
434 | */ |
439 | */ |
… | |
… | |
437 | { |
442 | { |
438 | // allow objects which own objects |
443 | // allow objects which own objects |
439 | if (owner) |
444 | if (owner) |
440 | while (owner->owner) |
445 | while (owner->owner) |
441 | owner = owner->owner; |
446 | owner = owner->owner; |
|
|
447 | |
|
|
448 | if (flag [FLAG_FREED]) |
|
|
449 | { |
|
|
450 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
451 | return; |
|
|
452 | } |
442 | |
453 | |
443 | this->owner = owner; |
454 | this->owner = owner; |
444 | } |
455 | } |
445 | |
456 | |
446 | int |
457 | int |
… | |
… | |
587 | |
598 | |
588 | void |
599 | void |
589 | object::instantiate () |
600 | object::instantiate () |
590 | { |
601 | { |
591 | if (!uuid.seq) // HACK |
602 | if (!uuid.seq) // HACK |
592 | uuid = gen_uuid (); |
603 | uuid = UUID::gen (); |
593 | |
604 | |
594 | speed_left = -0.1f; |
605 | speed_left = -0.1f; |
595 | /* copy the body_info to the body_used - this is only really |
606 | /* copy the body_info to the body_used - this is only really |
596 | * need for monsters, but doesn't hurt to do it for everything. |
607 | * need for monsters, but doesn't hurt to do it for everything. |
597 | * by doing so, when a monster is created, it has good starting |
608 | * by doing so, when a monster is created, it has good starting |
… | |
… | |
756 | static int object_count; |
767 | static int object_count; |
757 | |
768 | |
758 | void object::link () |
769 | void object::link () |
759 | { |
770 | { |
760 | assert (!index);//D |
771 | assert (!index);//D |
761 | uuid = gen_uuid (); |
772 | uuid = UUID::gen (); |
762 | count = ++object_count; |
773 | count = ++object_count; |
763 | |
774 | |
764 | refcnt_inc (); |
775 | refcnt_inc (); |
765 | objects.insert (this); |
776 | objects.insert (this); |
766 | } |
777 | } |
… | |
… | |
919 | |
930 | |
920 | freed_map->path = "<freed objects map>"; |
931 | freed_map->path = "<freed objects map>"; |
921 | freed_map->name = "/internal/freed_objects_map"; |
932 | freed_map->name = "/internal/freed_objects_map"; |
922 | freed_map->width = 3; |
933 | freed_map->width = 3; |
923 | freed_map->height = 3; |
934 | freed_map->height = 3; |
|
|
935 | freed_map->nodrop = 1; |
924 | |
936 | |
925 | freed_map->alloc (); |
937 | freed_map->alloc (); |
926 | freed_map->in_memory = MAP_IN_MEMORY; |
938 | freed_map->in_memory = MAP_IN_MEMORY; |
927 | } |
939 | } |
928 | |
940 | |
… | |
… | |
1140 | merge_ob (object *op, object *top) |
1152 | merge_ob (object *op, object *top) |
1141 | { |
1153 | { |
1142 | if (!op->nrof) |
1154 | if (!op->nrof) |
1143 | return 0; |
1155 | return 0; |
1144 | |
1156 | |
1145 | if (top) |
1157 | if (!top) |
1146 | for (top = op; top && top->above; top = top->above) |
1158 | for (top = op; top && top->above; top = top->above) |
1147 | ; |
1159 | ; |
1148 | |
1160 | |
1149 | for (; top; top = top->below) |
1161 | for (; top; top = top->below) |
1150 | { |
1162 | { |
… | |
… | |
1290 | else |
1302 | else |
1291 | { |
1303 | { |
1292 | top = ms.bot; |
1304 | top = ms.bot; |
1293 | |
1305 | |
1294 | /* If there are other objects, then */ |
1306 | /* If there are other objects, then */ |
1295 | if ((!(flag & INS_MAP_LOAD)) && top) |
1307 | if (top) |
1296 | { |
1308 | { |
1297 | object *last = 0; |
1309 | object *last = 0; |
1298 | |
1310 | |
1299 | /* |
1311 | /* |
1300 | * If there are multiple objects on this space, we do some trickier handling. |
1312 | * If there are multiple objects on this space, we do some trickier handling. |
… | |
… | |
1352 | */ |
1364 | */ |
1353 | if (last && last->below && last != floor) |
1365 | if (last && last->below && last != floor) |
1354 | top = last->below; |
1366 | top = last->below; |
1355 | } |
1367 | } |
1356 | } /* If objects on this space */ |
1368 | } /* If objects on this space */ |
1357 | if (flag & INS_MAP_LOAD) |
|
|
1358 | top = ms.top; |
|
|
1359 | |
1369 | |
1360 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1370 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1361 | top = floor; |
1371 | top = floor; |
1362 | |
1372 | |
1363 | /* Top is the object that our object (op) is going to get inserted above. |
1373 | /* Top is the object that our object (op) is going to get inserted above. |
… | |
… | |
1396 | op->map->touch (); |
1406 | op->map->touch (); |
1397 | } |
1407 | } |
1398 | |
1408 | |
1399 | op->map->dirty = true; |
1409 | op->map->dirty = true; |
1400 | |
1410 | |
1401 | if (!(flag & INS_MAP_LOAD)) |
|
|
1402 | if (object *pl = ms.player ()) |
1411 | if (object *pl = ms.player ()) |
1403 | pl->contr->ns->floorbox_update (); |
1412 | pl->contr->ns->floorbox_update (); |
1404 | |
1413 | |
1405 | /* If this object glows, it may affect lighting conditions that are |
1414 | /* If this object glows, it may affect lighting conditions that are |
1406 | * visible to others on this map. But update_all_los is really |
1415 | * visible to others on this map. But update_all_los is really |
1407 | * an inefficient way to do this, as it means los for all players |
1416 | * an inefficient way to do this, as it means los for all players |
1408 | * on the map will get recalculated. The players could very well |
1417 | * on the map will get recalculated. The players could very well |
… | |
… | |
1945 | * activate recursively a flag on an object inventory |
1954 | * activate recursively a flag on an object inventory |
1946 | */ |
1955 | */ |
1947 | void |
1956 | void |
1948 | flag_inv (object *op, int flag) |
1957 | flag_inv (object *op, int flag) |
1949 | { |
1958 | { |
1950 | if (op->inv) |
|
|
1951 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1959 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1952 | { |
1960 | { |
1953 | SET_FLAG (tmp, flag); |
1961 | SET_FLAG (tmp, flag); |
1954 | flag_inv (tmp, flag); |
1962 | flag_inv (tmp, flag); |
1955 | } |
1963 | } |
1956 | } |
1964 | } |
1957 | |
1965 | |
1958 | /* |
1966 | /* |
1959 | * deactivate recursively a flag on an object inventory |
1967 | * deactivate recursively a flag on an object inventory |
1960 | */ |
1968 | */ |
1961 | void |
1969 | void |
1962 | unflag_inv (object *op, int flag) |
1970 | unflag_inv (object *op, int flag) |
1963 | { |
1971 | { |
1964 | if (op->inv) |
|
|
1965 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1972 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1966 | { |
1973 | { |
1967 | CLEAR_FLAG (tmp, flag); |
1974 | CLEAR_FLAG (tmp, flag); |
1968 | unflag_inv (tmp, flag); |
1975 | unflag_inv (tmp, flag); |
1969 | } |
1976 | } |
1970 | } |
1977 | } |
1971 | |
1978 | |
1972 | /* |
1979 | /* |
1973 | * find_free_spot(object, map, x, y, start, stop) will search for |
1980 | * find_free_spot(object, map, x, y, start, stop) will search for |
1974 | * a spot at the given map and coordinates which will be able to contain |
1981 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
1976 | * to search (see the freearr_x/y[] definition). |
1983 | * to search (see the freearr_x/y[] definition). |
1977 | * It returns a random choice among the alternatives found. |
1984 | * It returns a random choice among the alternatives found. |
1978 | * start and stop are where to start relative to the free_arr array (1,9 |
1985 | * start and stop are where to start relative to the free_arr array (1,9 |
1979 | * does all 4 immediate directions). This returns the index into the |
1986 | * does all 4 immediate directions). This returns the index into the |
1980 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1987 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1981 | * Note - this only checks to see if there is space for the head of the |
|
|
1982 | * object - if it is a multispace object, this should be called for all |
|
|
1983 | * pieces. |
|
|
1984 | * Note2: This function does correctly handle tiled maps, but does not |
1988 | * Note: This function does correctly handle tiled maps, but does not |
1985 | * inform the caller. However, insert_ob_in_map will update as |
1989 | * inform the caller. However, insert_ob_in_map will update as |
1986 | * necessary, so the caller shouldn't need to do any special work. |
1990 | * necessary, so the caller shouldn't need to do any special work. |
1987 | * Note - updated to take an object instead of archetype - this is necessary |
1991 | * Note - updated to take an object instead of archetype - this is necessary |
1988 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1992 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1989 | * to know if the space in question will block the object. We can't use |
1993 | * to know if the space in question will block the object. We can't use |
… | |
… | |
1991 | * customized, changed states, etc. |
1995 | * customized, changed states, etc. |
1992 | */ |
1996 | */ |
1993 | int |
1997 | int |
1994 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1998 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1995 | { |
1999 | { |
|
|
2000 | int altern[SIZEOFFREE]; |
1996 | int index = 0, flag; |
2001 | int index = 0, flag; |
1997 | int altern[SIZEOFFREE]; |
|
|
1998 | |
2002 | |
1999 | for (int i = start; i < stop; i++) |
2003 | for (int i = start; i < stop; i++) |
2000 | { |
2004 | { |
2001 | mapxy pos (m, x, y); pos.move (i); |
2005 | mapxy pos (m, x, y); pos.move (i); |
2002 | |
2006 | |
… | |
… | |
2010 | |
2014 | |
2011 | /* However, often |
2015 | /* However, often |
2012 | * ob doesn't have any move type (when used to place exits) |
2016 | * ob doesn't have any move type (when used to place exits) |
2013 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
2017 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
2014 | */ |
2018 | */ |
2015 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
2019 | if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2020 | { |
|
|
2021 | altern [index++] = i; |
2016 | continue; |
2022 | continue; |
|
|
2023 | } |
2017 | |
2024 | |
2018 | /* Basically, if we find a wall on a space, we cut down the search size. |
2025 | /* Basically, if we find a wall on a space, we cut down the search size. |
2019 | * In this way, we won't return spaces that are on another side of a wall. |
2026 | * In this way, we won't return spaces that are on another side of a wall. |
2020 | * This mostly work, but it cuts down the search size in all directions - |
2027 | * This mostly work, but it cuts down the search size in all directions - |
2021 | * if the space being examined only has a wall to the north and empty |
2028 | * if the space being examined only has a wall to the north and empty |
… | |
… | |
2031 | |
2038 | |
2032 | /* Note it is intentional that we check ob - the movement type of the |
2039 | /* Note it is intentional that we check ob - the movement type of the |
2033 | * head of the object should correspond for the entire object. |
2040 | * head of the object should correspond for the entire object. |
2034 | */ |
2041 | */ |
2035 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2042 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2043 | continue; |
|
|
2044 | |
|
|
2045 | if (ob->blocked (m, pos.x, pos.y)) |
2036 | continue; |
2046 | continue; |
2037 | |
2047 | |
2038 | altern [index++] = i; |
2048 | altern [index++] = i; |
2039 | } |
2049 | } |
2040 | |
2050 | |
… | |
… | |
2599 | { |
2609 | { |
2600 | char flagdesc[512]; |
2610 | char flagdesc[512]; |
2601 | char info2[256 * 4]; |
2611 | char info2[256 * 4]; |
2602 | char *p = info; |
2612 | char *p = info; |
2603 | |
2613 | |
2604 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2614 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2605 | count, uuid.seq, |
2615 | count, |
|
|
2616 | uuid.c_str (), |
2606 | &name, |
2617 | &name, |
2607 | title ? "\",title:\"" : "", |
2618 | title ? "\",title:\"" : "", |
2608 | title ? (const char *)title : "", |
2619 | title ? (const char *)title : "", |
2609 | flag_desc (flagdesc, 512), type); |
2620 | flag_desc (flagdesc, 512), type); |
2610 | |
2621 | |