1 | |
|
|
2 | /* |
|
|
3 | * static char *rcsid_object_c = |
|
|
4 | * "$Id: object.C,v 1.27 2006/09/11 12:08:45 root Exp $"; |
|
|
5 | */ |
|
|
6 | |
|
|
7 | /* |
1 | /* |
8 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
9 | |
3 | |
10 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
11 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
22 | |
16 | |
23 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License |
24 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
25 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | |
20 | |
27 | The authors can be reached via e-mail at crossfire-devel@real-time.com |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
28 | */ |
22 | */ |
29 | |
23 | |
30 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
31 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
32 | variable. */ |
26 | variable. */ |
33 | #include <global.h> |
27 | #include <global.h> |
34 | #ifndef WIN32 /* ---win32 exclude headers */ |
|
|
35 | # include <stdio.h> |
28 | #include <stdio.h> |
36 | # include <sys/types.h> |
29 | #include <sys/types.h> |
37 | # include <sys/uio.h> |
30 | #include <sys/uio.h> |
38 | #endif /* win32 */ |
|
|
39 | #include <object.h> |
31 | #include <object.h> |
40 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
41 | #include <skills.h> |
|
|
42 | #include <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
|
|
36 | |
43 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
|
|
38 | static UUID uuid; |
|
|
39 | const uint64 UUID_SKIP = 1<<19; |
44 | |
40 | |
45 | object *objects; /* Pointer to the list of used objects */ |
|
|
46 | object *active_objects; /* List of active objects that need to be processed */ |
41 | object *active_objects; /* List of active objects that need to be processed */ |
47 | |
42 | |
48 | 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, |
43 | 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, |
49 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
50 | }; |
45 | }; |
… | |
… | |
57 | int freedir[SIZEOFFREE] = { |
52 | int freedir[SIZEOFFREE] = { |
58 | 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, |
53 | 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, |
59 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
54 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
60 | }; |
55 | }; |
61 | |
56 | |
|
|
57 | static void |
|
|
58 | write_uuid (void) |
|
|
59 | { |
|
|
60 | char filename1[MAX_BUF], filename2[MAX_BUF]; |
|
|
61 | |
|
|
62 | sprintf (filename1, "%s/uuid", settings.localdir); |
|
|
63 | sprintf (filename2, "%s/uuid~", settings.localdir); |
|
|
64 | |
|
|
65 | FILE *fp; |
|
|
66 | |
|
|
67 | if (!(fp = fopen (filename2, "w"))) |
|
|
68 | { |
|
|
69 | LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); |
|
|
70 | return; |
|
|
71 | } |
|
|
72 | |
|
|
73 | fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); |
|
|
74 | fclose (fp); |
|
|
75 | rename (filename2, filename1); |
|
|
76 | } |
|
|
77 | |
|
|
78 | static void |
|
|
79 | read_uuid (void) |
|
|
80 | { |
|
|
81 | char filename[MAX_BUF]; |
|
|
82 | |
|
|
83 | sprintf (filename, "%s/uuid", settings.localdir); |
|
|
84 | |
|
|
85 | FILE *fp; |
|
|
86 | |
|
|
87 | if (!(fp = fopen (filename, "r"))) |
|
|
88 | { |
|
|
89 | if (errno == ENOENT) |
|
|
90 | { |
|
|
91 | LOG (llevInfo, "RESET uid to 1\n"); |
|
|
92 | uuid.seq = 0; |
|
|
93 | write_uuid (); |
|
|
94 | return; |
|
|
95 | } |
|
|
96 | |
|
|
97 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
|
|
98 | _exit (1); |
|
|
99 | } |
|
|
100 | |
|
|
101 | int version; |
|
|
102 | unsigned long long uid; |
|
|
103 | if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) |
|
|
104 | { |
|
|
105 | LOG (llevError, "FATAL: error reading uid from %s!\n", filename); |
|
|
106 | _exit (1); |
|
|
107 | } |
|
|
108 | |
|
|
109 | uuid.seq = uid; |
|
|
110 | write_uuid (); |
|
|
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
|
|
112 | fclose (fp); |
|
|
113 | } |
|
|
114 | |
|
|
115 | UUID |
|
|
116 | gen_uuid () |
|
|
117 | { |
|
|
118 | UUID uid; |
|
|
119 | |
|
|
120 | uid.seq = ++uuid.seq; |
|
|
121 | |
|
|
122 | if (!(uuid.seq & (UUID_SKIP - 1))) |
|
|
123 | write_uuid (); |
|
|
124 | |
|
|
125 | return uid; |
|
|
126 | } |
|
|
127 | |
|
|
128 | void |
|
|
129 | init_uuid () |
|
|
130 | { |
|
|
131 | read_uuid (); |
|
|
132 | } |
|
|
133 | |
62 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
134 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
63 | static int |
135 | static int |
64 | compare_ob_value_lists_one (const object *wants, const object *has) |
136 | compare_ob_value_lists_one (const object *wants, const object *has) |
65 | { |
137 | { |
66 | key_value *wants_field; |
138 | key_value *wants_field; |
… | |
… | |
113 | * |
185 | * |
114 | * Note that this function appears a lot longer than the macro it |
186 | * Note that this function appears a lot longer than the macro it |
115 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
116 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
117 | * |
189 | * |
118 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
119 | * |
191 | * |
120 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
121 | * check weight |
193 | * check weight |
122 | */ |
194 | */ |
123 | |
195 | |
124 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
125 | { |
197 | { |
126 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
127 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
128 | return 0; |
204 | return 0; |
129 | |
205 | |
130 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
131 | return 0; |
|
|
132 | |
|
|
133 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
134 | * value could not be stored in a sint32 (which unfortunately sometimes is |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
135 | * used to store nrof). |
209 | * used to store nrof). |
136 | */ |
210 | */ |
137 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
147 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
148 | |
222 | |
149 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
150 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
151 | |
225 | |
152 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
153 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
154 | * being locked in inventory should prevent merging. |
|
|
155 | * 0x4 in flags3 is CLIENT_SENT |
|
|
156 | */ |
|
|
157 | if ((ob1->arch != ob2->arch) || |
|
|
158 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
159 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
160 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
161 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
162 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
163 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
164 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
165 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
166 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
167 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
168 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
169 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
170 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
171 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
172 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
173 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
174 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
175 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
176 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
177 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
178 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
179 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
180 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
181 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
182 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
183 | return 0; |
251 | return 0; |
184 | |
252 | |
185 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
186 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
187 | */ |
255 | */ |
… | |
… | |
190 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
191 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
192 | return 0; |
260 | return 0; |
193 | |
261 | |
194 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
195 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
196 | return 0; |
264 | return 0; |
197 | |
265 | |
198 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
199 | * if it is valid. |
267 | * if it is valid. |
200 | */ |
268 | */ |
… | |
… | |
214 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
215 | return 0; |
283 | return 0; |
216 | |
284 | |
217 | switch (ob1->type) |
285 | switch (ob1->type) |
218 | { |
286 | { |
219 | case SCROLL: |
287 | case SCROLL: |
220 | if (ob1->level != ob2->level) |
288 | if (ob1->level != ob2->level) |
221 | return 0; |
289 | return 0; |
222 | break; |
290 | break; |
223 | } |
291 | } |
224 | |
292 | |
225 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
293 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
226 | { |
294 | { |
227 | /* At least one of these has key_values. */ |
295 | /* At least one of these has key_values. */ |
… | |
… | |
249 | /* |
317 | /* |
250 | * sum_weight() is a recursive function which calculates the weight |
318 | * sum_weight() is a recursive function which calculates the weight |
251 | * an object is carrying. It goes through in figures out how much |
319 | * an object is carrying. It goes through in figures out how much |
252 | * containers are carrying, and sums it up. |
320 | * containers are carrying, and sums it up. |
253 | */ |
321 | */ |
254 | signed long |
322 | long |
255 | sum_weight (object *op) |
323 | sum_weight (object *op) |
256 | { |
324 | { |
257 | signed long sum; |
325 | long sum; |
258 | object *inv; |
326 | object *inv; |
259 | |
327 | |
260 | for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) |
328 | for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) |
261 | { |
329 | { |
262 | if (inv->inv) |
330 | if (inv->inv) |
263 | sum_weight (inv); |
331 | sum_weight (inv); |
264 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
332 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
265 | } |
333 | } |
|
|
334 | |
266 | if (op->type == CONTAINER && op->stats.Str) |
335 | if (op->type == CONTAINER && op->stats.Str) |
267 | sum = (sum * (100 - op->stats.Str)) / 100; |
336 | sum = (sum * (100 - op->stats.Str)) / 100; |
|
|
337 | |
268 | if (op->carrying != sum) |
338 | if (op->carrying != sum) |
269 | op->carrying = sum; |
339 | op->carrying = sum; |
|
|
340 | |
270 | return sum; |
341 | return sum; |
271 | } |
342 | } |
272 | |
343 | |
273 | /** |
344 | /** |
274 | * Return the outermost environment object for a given object. |
345 | * Return the outermost environment object for a given object. |
… | |
… | |
301 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
372 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
302 | * Some error messages. |
373 | * Some error messages. |
303 | * The result of the dump is stored in the static global errmsg array. |
374 | * The result of the dump is stored in the static global errmsg array. |
304 | */ |
375 | */ |
305 | |
376 | |
306 | void |
377 | char * |
307 | dump_object2 (object *op) |
|
|
308 | { |
|
|
309 | errmsg[0] = 0; |
|
|
310 | return; |
|
|
311 | //TODO//D#d# |
|
|
312 | #if 0 |
|
|
313 | char *cp; |
|
|
314 | |
|
|
315 | /* object *tmp;*/ |
|
|
316 | |
|
|
317 | if (op->arch != NULL) |
|
|
318 | { |
|
|
319 | strcat (errmsg, "arch "); |
|
|
320 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
321 | strcat (errmsg, "\n"); |
|
|
322 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
323 | strcat (errmsg, cp); |
|
|
324 | # if 0 |
|
|
325 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
326 | * will overflow the buffer. |
|
|
327 | * Changed so that we don't dump inventory either. This may |
|
|
328 | * also overflow the buffer. |
|
|
329 | */ |
|
|
330 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
331 | strcat (errmsg, cp); |
|
|
332 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
333 | dump_object2 (tmp); |
|
|
334 | # endif |
|
|
335 | strcat (errmsg, "end\n"); |
|
|
336 | } |
|
|
337 | else |
|
|
338 | { |
|
|
339 | strcat (errmsg, "Object "); |
|
|
340 | if (op->name == NULL) |
|
|
341 | strcat (errmsg, "(null)"); |
|
|
342 | else |
|
|
343 | strcat (errmsg, op->name); |
|
|
344 | strcat (errmsg, "\n"); |
|
|
345 | # if 0 |
|
|
346 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
347 | strcat (errmsg, cp); |
|
|
348 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
349 | dump_object2 (tmp); |
|
|
350 | # endif |
|
|
351 | strcat (errmsg, "end\n"); |
|
|
352 | } |
|
|
353 | #endif |
|
|
354 | } |
|
|
355 | |
|
|
356 | /* |
|
|
357 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
358 | */ |
|
|
359 | |
|
|
360 | void |
|
|
361 | dump_object (object *op) |
378 | dump_object (object *op) |
362 | { |
379 | { |
363 | if (op == NULL) |
380 | if (!op) |
364 | { |
381 | return strdup ("[NULLOBJ]"); |
365 | strcpy (errmsg, "[NULL pointer]"); |
|
|
366 | return; |
|
|
367 | } |
|
|
368 | errmsg[0] = '\0'; |
|
|
369 | dump_object2 (op); |
|
|
370 | } |
|
|
371 | |
382 | |
372 | void |
383 | object_freezer freezer; |
373 | dump_all_objects (void) |
384 | save_object (freezer, op, 3); |
374 | { |
385 | return freezer.as_string (); |
375 | object *op; |
|
|
376 | |
|
|
377 | for (op = objects; op != NULL; op = op->next) |
|
|
378 | { |
|
|
379 | dump_object (op); |
|
|
380 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
381 | } |
|
|
382 | } |
386 | } |
383 | |
387 | |
384 | /* |
388 | /* |
385 | * get_nearest_part(multi-object, object 2) returns the part of the |
389 | * get_nearest_part(multi-object, object 2) returns the part of the |
386 | * multi-object 1 which is closest to the second object. |
390 | * multi-object 1 which is closest to the second object. |
… | |
… | |
406 | */ |
410 | */ |
407 | |
411 | |
408 | object * |
412 | object * |
409 | find_object (tag_t i) |
413 | find_object (tag_t i) |
410 | { |
414 | { |
411 | object *op; |
415 | for (object *op = object::first; op; op = op->next) |
412 | |
|
|
413 | for (op = objects; op != NULL; op = op->next) |
|
|
414 | if (op->count == i) |
416 | if (op->count == i) |
415 | break; |
417 | return op; |
|
|
418 | |
416 | return op; |
419 | return 0; |
417 | } |
420 | } |
418 | |
421 | |
419 | /* |
422 | /* |
420 | * Returns the first object which has a name equal to the argument. |
423 | * Returns the first object which has a name equal to the argument. |
421 | * Used only by the patch command, but not all that useful. |
424 | * Used only by the patch command, but not all that useful. |
… | |
… | |
423 | */ |
426 | */ |
424 | |
427 | |
425 | object * |
428 | object * |
426 | find_object_name (const char *str) |
429 | find_object_name (const char *str) |
427 | { |
430 | { |
428 | const char *name = shstr::find (str); |
431 | shstr_cmp str_ (str); |
429 | object *op; |
432 | object *op; |
430 | |
433 | |
431 | for (op = objects; op != NULL; op = op->next) |
434 | for (op = object::first; op != NULL; op = op->next) |
432 | if (&op->name == name) |
435 | if (op->name == str_) |
433 | break; |
436 | break; |
434 | |
437 | |
435 | return op; |
438 | return op; |
436 | } |
439 | } |
437 | |
440 | |
… | |
… | |
440 | { |
443 | { |
441 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
444 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
442 | } |
445 | } |
443 | |
446 | |
444 | /* |
447 | /* |
445 | * Returns the object which this object marks as being the owner. |
|
|
446 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
447 | * freed and are now reused. If this is detected, the owner is |
|
|
448 | * set to NULL, and NULL is returned. |
|
|
449 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
450 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
451 | * anything, so check removed flag. I don't expect that this should break |
|
|
452 | * anything - once an object is removed, it is basically dead anyways. |
|
|
453 | */ |
|
|
454 | |
|
|
455 | object * |
|
|
456 | get_owner (object *op) |
|
|
457 | { |
|
|
458 | if (op->owner == NULL) |
|
|
459 | return NULL; |
|
|
460 | |
|
|
461 | if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount) |
|
|
462 | return op->owner; |
|
|
463 | |
|
|
464 | op->owner = NULL; |
|
|
465 | op->ownercount = 0; |
|
|
466 | return NULL; |
|
|
467 | } |
|
|
468 | |
|
|
469 | void |
|
|
470 | clear_owner (object *op) |
|
|
471 | { |
|
|
472 | if (!op) |
|
|
473 | return; |
|
|
474 | |
|
|
475 | if (op->owner && op->ownercount == op->owner->count) |
|
|
476 | op->owner->refcount--; |
|
|
477 | |
|
|
478 | op->owner = NULL; |
|
|
479 | op->ownercount = 0; |
|
|
480 | } |
|
|
481 | |
|
|
482 | /* |
|
|
483 | * Sets the owner and sets the skill and exp pointers to owner's current |
448 | * Sets the owner and sets the skill and exp pointers to owner's current |
484 | * skill and experience objects. |
449 | * skill and experience objects. |
485 | */ |
450 | */ |
486 | void |
451 | void |
487 | set_owner (object *op, object *owner) |
452 | object::set_owner (object *owner) |
488 | { |
453 | { |
489 | if (owner == NULL || op == NULL) |
454 | if (!owner) |
490 | return; |
455 | return; |
491 | |
456 | |
492 | /* next line added to allow objects which own objects */ |
457 | /* next line added to allow objects which own objects */ |
493 | /* Add a check for ownercounts in here, as I got into an endless loop |
458 | /* Add a check for ownercounts in here, as I got into an endless loop |
494 | * with the fireball owning a poison cloud which then owned the |
459 | * with the fireball owning a poison cloud which then owned the |
495 | * fireball. I believe that was caused by one of the objects getting |
460 | * fireball. I believe that was caused by one of the objects getting |
496 | * freed and then another object replacing it. Since the ownercounts |
461 | * freed and then another object replacing it. Since the ownercounts |
497 | * didn't match, this check is valid and I believe that cause is valid. |
462 | * didn't match, this check is valid and I believe that cause is valid. |
498 | */ |
463 | */ |
499 | while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) |
464 | while (owner->owner) |
500 | owner = owner->owner; |
465 | owner = owner->owner; |
501 | |
466 | |
502 | /* IF the owner still has an owner, we did not resolve to a final owner. |
|
|
503 | * so lets not add to that. |
|
|
504 | */ |
|
|
505 | if (owner->owner) |
|
|
506 | return; |
|
|
507 | |
|
|
508 | op->owner = owner; |
467 | this->owner = owner; |
509 | |
|
|
510 | op->ownercount = owner->count; |
|
|
511 | owner->refcount++; |
|
|
512 | } |
|
|
513 | |
|
|
514 | /* Set the owner to clone's current owner and set the skill and experience |
|
|
515 | * objects to clone's objects (typically those objects that where the owner's |
|
|
516 | * current skill and experience objects at the time when clone's owner was |
|
|
517 | * set - not the owner's current skill and experience objects). |
|
|
518 | * |
|
|
519 | * Use this function if player created an object (e.g. fire bullet, swarm |
|
|
520 | * spell), and this object creates further objects whose kills should be |
|
|
521 | * accounted for the player's original skill, even if player has changed |
|
|
522 | * skills meanwhile. |
|
|
523 | */ |
|
|
524 | void |
|
|
525 | copy_owner (object *op, object *clone) |
|
|
526 | { |
|
|
527 | object *owner = get_owner (clone); |
|
|
528 | |
|
|
529 | if (owner == NULL) |
|
|
530 | { |
|
|
531 | /* players don't have owners - they own themselves. Update |
|
|
532 | * as appropriate. |
|
|
533 | */ |
|
|
534 | if (clone->type == PLAYER) |
|
|
535 | owner = clone; |
|
|
536 | else |
|
|
537 | return; |
|
|
538 | } |
|
|
539 | |
|
|
540 | set_owner (op, owner); |
|
|
541 | } |
468 | } |
542 | |
469 | |
543 | /* Zero the key_values on op, decrementing the shared-string |
470 | /* Zero the key_values on op, decrementing the shared-string |
544 | * refcounts and freeing the links. |
471 | * refcounts and freeing the links. |
545 | */ |
472 | */ |
… | |
… | |
561 | { |
488 | { |
562 | attachable_base::clear (); |
489 | attachable_base::clear (); |
563 | |
490 | |
564 | free_key_values (this); |
491 | free_key_values (this); |
565 | |
492 | |
566 | clear_owner (this); |
493 | owner = 0; |
567 | |
|
|
568 | name = 0; |
494 | name = 0; |
569 | name_pl = 0; |
495 | name_pl = 0; |
570 | title = 0; |
496 | title = 0; |
571 | race = 0; |
497 | race = 0; |
572 | slaying = 0; |
498 | slaying = 0; |
573 | skill = 0; |
499 | skill = 0; |
574 | msg = 0; |
500 | msg = 0; |
575 | lore = 0; |
501 | lore = 0; |
576 | custom_name = 0; |
502 | custom_name = 0; |
577 | materialname = 0; |
503 | materialname = 0; |
|
|
504 | contr = 0; |
|
|
505 | below = 0; |
|
|
506 | above = 0; |
|
|
507 | inv = 0; |
|
|
508 | container = 0; |
|
|
509 | env = 0; |
|
|
510 | more = 0; |
|
|
511 | head = 0; |
|
|
512 | map = 0; |
|
|
513 | active_next = 0; |
|
|
514 | active_prev = 0; |
578 | |
515 | |
579 | memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); |
516 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
580 | |
517 | |
581 | SET_FLAG (this, FLAG_REMOVED); |
518 | SET_FLAG (this, FLAG_REMOVED); |
582 | } |
|
|
583 | |
519 | |
584 | void object::clone (object *destination) |
|
|
585 | { |
|
|
586 | *(object_copy *) destination = *this; |
|
|
587 | *(object_pod *) destination = *this; |
|
|
588 | |
|
|
589 | if (self || cb) |
|
|
590 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
591 | } |
|
|
592 | |
|
|
593 | /* |
|
|
594 | * clear_object() frees everything allocated by an object, and also |
|
|
595 | * clears all variables and flags to default settings. |
|
|
596 | */ |
|
|
597 | |
|
|
598 | void |
|
|
599 | clear_object (object *op) |
|
|
600 | { |
|
|
601 | op->clear (); |
|
|
602 | |
|
|
603 | op->contr = NULL; |
|
|
604 | op->below = NULL; |
|
|
605 | op->above = NULL; |
|
|
606 | op->inv = NULL; |
|
|
607 | op->container = NULL; |
|
|
608 | op->env = NULL; |
|
|
609 | op->more = NULL; |
|
|
610 | op->head = NULL; |
|
|
611 | op->map = NULL; |
|
|
612 | op->refcount = 0; |
|
|
613 | op->active_next = NULL; |
|
|
614 | op->active_prev = NULL; |
|
|
615 | /* What is not cleared is next, prev, and count */ |
520 | /* What is not cleared is next, prev, and count */ |
616 | |
521 | |
617 | op->expmul = 1.0; |
522 | expmul = 1.0; |
618 | op->face = blank_face; |
523 | face = blank_face; |
619 | op->attacked_by_count = -1; |
|
|
620 | |
524 | |
621 | if (settings.casting_time) |
525 | if (settings.casting_time) |
622 | op->casting_time = -1; |
526 | casting_time = -1; |
623 | } |
527 | } |
624 | |
528 | |
625 | /* |
529 | /* |
626 | * copy object first frees everything allocated by the second object, |
530 | * copy_to first frees everything allocated by the dst object, |
627 | * and then copies the contends of the first object into the second |
531 | * and then copies the contents of itself into the second |
628 | * object, allocating what needs to be allocated. Basically, any |
532 | * object, allocating what needs to be allocated. Basically, any |
629 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
533 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
630 | * if the first object is freed, the pointers in the new object |
534 | * if the first object is freed, the pointers in the new object |
631 | * will point at garbage. |
535 | * will point at garbage. |
632 | */ |
536 | */ |
633 | |
|
|
634 | void |
537 | void |
635 | copy_object (object *op2, object *op) |
538 | object::copy_to (object *dst) |
636 | { |
539 | { |
637 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
540 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
638 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
541 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
639 | |
542 | |
640 | op2->clone (op); |
543 | *(object_copy *)dst = *this; |
|
|
544 | *(object_pod *)dst = *this; |
|
|
545 | |
|
|
546 | if (self || cb) |
|
|
547 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
641 | |
548 | |
642 | if (is_freed) |
549 | if (is_freed) |
643 | SET_FLAG (op, FLAG_FREED); |
550 | SET_FLAG (dst, FLAG_FREED); |
|
|
551 | |
644 | if (is_removed) |
552 | if (is_removed) |
645 | SET_FLAG (op, FLAG_REMOVED); |
553 | SET_FLAG (dst, FLAG_REMOVED); |
646 | |
554 | |
647 | if (op2->speed < 0) |
555 | if (speed < 0) |
648 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
556 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
649 | |
557 | |
650 | /* Copy over key_values, if any. */ |
558 | /* Copy over key_values, if any. */ |
651 | if (op2->key_values) |
559 | if (key_values) |
652 | { |
560 | { |
653 | key_value *tail = 0; |
561 | key_value *tail = 0; |
654 | key_value *i; |
562 | key_value *i; |
655 | |
563 | |
656 | op->key_values = 0; |
564 | dst->key_values = 0; |
657 | |
565 | |
658 | for (i = op2->key_values; i; i = i->next) |
566 | for (i = key_values; i; i = i->next) |
659 | { |
567 | { |
660 | key_value *new_link = new key_value; |
568 | key_value *new_link = new key_value; |
661 | |
569 | |
662 | new_link->next = 0; |
570 | new_link->next = 0; |
663 | new_link->key = i->key; |
571 | new_link->key = i->key; |
664 | new_link->value = i->value; |
572 | new_link->value = i->value; |
665 | |
573 | |
666 | /* Try and be clever here, too. */ |
574 | /* Try and be clever here, too. */ |
667 | if (!op->key_values) |
575 | if (!dst->key_values) |
668 | { |
576 | { |
669 | op->key_values = new_link; |
577 | dst->key_values = new_link; |
670 | tail = new_link; |
578 | tail = new_link; |
671 | } |
579 | } |
672 | else |
580 | else |
673 | { |
581 | { |
674 | tail->next = new_link; |
582 | tail->next = new_link; |
675 | tail = new_link; |
583 | tail = new_link; |
676 | } |
584 | } |
677 | } |
585 | } |
678 | } |
586 | } |
679 | |
587 | |
680 | update_ob_speed (op); |
588 | update_ob_speed (dst); |
|
|
589 | } |
|
|
590 | |
|
|
591 | object * |
|
|
592 | object::clone () |
|
|
593 | { |
|
|
594 | object *neu = create (); |
|
|
595 | copy_to (neu); |
|
|
596 | return neu; |
681 | } |
597 | } |
682 | |
598 | |
683 | /* |
599 | /* |
684 | * If an object with the IS_TURNABLE() flag needs to be turned due |
600 | * If an object with the IS_TURNABLE() flag needs to be turned due |
685 | * to the closest player being on the other side, this function can |
601 | * to the closest player being on the other side, this function can |
… | |
… | |
698 | /* |
614 | /* |
699 | * Updates the speed of an object. If the speed changes from 0 to another |
615 | * Updates the speed of an object. If the speed changes from 0 to another |
700 | * value, or vice versa, then add/remove the object from the active list. |
616 | * value, or vice versa, then add/remove the object from the active list. |
701 | * This function needs to be called whenever the speed of an object changes. |
617 | * This function needs to be called whenever the speed of an object changes. |
702 | */ |
618 | */ |
703 | |
|
|
704 | void |
619 | void |
705 | update_ob_speed (object *op) |
620 | update_ob_speed (object *op) |
706 | { |
621 | { |
707 | extern int arch_init; |
622 | extern int arch_init; |
708 | |
623 | |
… | |
… | |
717 | abort (); |
632 | abort (); |
718 | #else |
633 | #else |
719 | op->speed = 0; |
634 | op->speed = 0; |
720 | #endif |
635 | #endif |
721 | } |
636 | } |
|
|
637 | |
722 | if (arch_init) |
638 | if (arch_init) |
723 | { |
|
|
724 | return; |
639 | return; |
725 | } |
640 | |
726 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
641 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
727 | { |
642 | { |
728 | /* If already on active list, don't do anything */ |
643 | /* If already on active list, don't do anything */ |
729 | if (op->active_next || op->active_prev || op == active_objects) |
644 | if (op->active_next || op->active_prev || op == active_objects) |
730 | return; |
645 | return; |
731 | |
646 | |
732 | /* process_events() expects us to insert the object at the beginning |
647 | /* process_events() expects us to insert the object at the beginning |
733 | * of the list. */ |
648 | * of the list. */ |
734 | op->active_next = active_objects; |
649 | op->active_next = active_objects; |
|
|
650 | |
735 | if (op->active_next != NULL) |
651 | if (op->active_next != NULL) |
736 | op->active_next->active_prev = op; |
652 | op->active_next->active_prev = op; |
|
|
653 | |
737 | active_objects = op; |
654 | active_objects = op; |
738 | } |
655 | } |
739 | else |
656 | else |
740 | { |
657 | { |
741 | /* If not on the active list, nothing needs to be done */ |
658 | /* If not on the active list, nothing needs to be done */ |
… | |
… | |
743 | return; |
660 | return; |
744 | |
661 | |
745 | if (op->active_prev == NULL) |
662 | if (op->active_prev == NULL) |
746 | { |
663 | { |
747 | active_objects = op->active_next; |
664 | active_objects = op->active_next; |
|
|
665 | |
748 | if (op->active_next != NULL) |
666 | if (op->active_next != NULL) |
749 | op->active_next->active_prev = NULL; |
667 | op->active_next->active_prev = NULL; |
750 | } |
668 | } |
751 | else |
669 | else |
752 | { |
670 | { |
753 | op->active_prev->active_next = op->active_next; |
671 | op->active_prev->active_next = op->active_next; |
|
|
672 | |
754 | if (op->active_next) |
673 | if (op->active_next) |
755 | op->active_next->active_prev = op->active_prev; |
674 | op->active_next->active_prev = op->active_prev; |
756 | } |
675 | } |
|
|
676 | |
757 | op->active_next = NULL; |
677 | op->active_next = NULL; |
758 | op->active_prev = NULL; |
678 | op->active_prev = NULL; |
759 | } |
679 | } |
760 | } |
680 | } |
761 | |
681 | |
… | |
… | |
886 | update_now = 1; |
806 | update_now = 1; |
887 | |
807 | |
888 | if ((move_slow | op->move_slow) != move_slow) |
808 | if ((move_slow | op->move_slow) != move_slow) |
889 | update_now = 1; |
809 | update_now = 1; |
890 | } |
810 | } |
|
|
811 | |
891 | /* if the object is being removed, we can't make intelligent |
812 | /* if the object is being removed, we can't make intelligent |
892 | * decisions, because remove_ob can't really pass the object |
813 | * decisions, because remove_ob can't really pass the object |
893 | * that is being removed. |
814 | * that is being removed. |
894 | */ |
815 | */ |
895 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
816 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
896 | update_now = 1; |
817 | update_now = 1; |
897 | else if (action == UP_OBJ_FACE) |
818 | else if (action == UP_OBJ_FACE) |
898 | /* Nothing to do for that case */; |
819 | /* Nothing to do for that case */ ; |
899 | else |
820 | else |
900 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
821 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
901 | |
822 | |
902 | if (update_now) |
823 | if (update_now) |
903 | { |
824 | { |
… | |
… | |
907 | |
828 | |
908 | if (op->more != NULL) |
829 | if (op->more != NULL) |
909 | update_object (op->more, action); |
830 | update_object (op->more, action); |
910 | } |
831 | } |
911 | |
832 | |
912 | static unordered_vector<object *> mortals; |
833 | object::vector object::mortals; |
913 | static std::vector<object *> freed; |
834 | object::vector object::objects; // not yet used |
|
|
835 | object *object::first; |
914 | |
836 | |
915 | void object::free_mortals () |
837 | void object::free_mortals () |
916 | { |
838 | { |
917 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) |
839 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
918 | if (!(*i)->refcount) |
840 | if ((*i)->refcnt) |
|
|
841 | ++i; // further delay freeing |
|
|
842 | else |
919 | { |
843 | { |
920 | freed.push_back (*i); |
844 | delete *i; |
921 | mortals.erase (i); |
845 | mortals.erase (i); |
922 | } |
846 | } |
923 | else |
|
|
924 | ++i; |
|
|
925 | } |
847 | } |
926 | |
848 | |
927 | object::object () |
849 | object::object () |
928 | { |
850 | { |
929 | SET_FLAG (this, FLAG_REMOVED); |
851 | SET_FLAG (this, FLAG_REMOVED); |
930 | |
852 | |
931 | expmul = 1.0; |
853 | expmul = 1.0; |
932 | face = blank_face; |
854 | face = blank_face; |
933 | attacked_by_count = -1; |
|
|
934 | } |
855 | } |
935 | |
856 | |
936 | object::~object () |
857 | object::~object () |
937 | { |
858 | { |
938 | free_key_values (this); |
859 | free_key_values (this); |
939 | } |
860 | } |
940 | |
861 | |
941 | void object::link () |
862 | void object::link () |
942 | { |
863 | { |
943 | count = ++ob_count; |
864 | count = ++ob_count; |
|
|
865 | uuid = gen_uuid (); |
944 | |
866 | |
945 | prev = 0; |
867 | prev = 0; |
946 | next = objects; |
868 | next = object::first; |
947 | |
869 | |
948 | if (objects) |
870 | if (object::first) |
949 | objects->prev = this; |
871 | object::first->prev = this; |
950 | |
872 | |
951 | objects = this; |
873 | object::first = this; |
952 | } |
874 | } |
953 | |
875 | |
954 | void object::unlink () |
876 | void object::unlink () |
955 | { |
877 | { |
956 | count = 0; |
878 | if (this == object::first) |
|
|
879 | object::first = next; |
957 | |
880 | |
958 | /* Remove this object from the list of used objects */ |
881 | /* Remove this object from the list of used objects */ |
959 | if (prev) |
|
|
960 | { |
|
|
961 | prev->next = next; |
882 | if (prev) prev->next = next; |
|
|
883 | if (next) next->prev = prev; |
|
|
884 | |
962 | prev = 0; |
885 | prev = 0; |
963 | } |
|
|
964 | |
|
|
965 | if (next) |
|
|
966 | { |
|
|
967 | next->prev = prev; |
|
|
968 | next = 0; |
886 | next = 0; |
969 | } |
|
|
970 | |
|
|
971 | if (this == objects) |
|
|
972 | objects = next; |
|
|
973 | } |
887 | } |
974 | |
888 | |
975 | object *object::create () |
889 | object *object::create () |
976 | { |
890 | { |
977 | object *op; |
|
|
978 | |
|
|
979 | if (freed.empty ()) |
|
|
980 | op = new object; |
891 | object *op = new object; |
981 | else |
|
|
982 | { |
|
|
983 | // highly annoying, but the only way to get it stable right now |
|
|
984 | op = freed.back (); freed.pop_back (); |
|
|
985 | op->~object (); |
|
|
986 | new ((void *)op) object; |
|
|
987 | } |
|
|
988 | |
|
|
989 | op->link (); |
892 | op->link (); |
990 | return op; |
893 | return op; |
991 | } |
894 | } |
992 | |
895 | |
993 | /* |
896 | /* |
… | |
… | |
995 | * it from the list of used objects, and puts it on the list of |
898 | * it from the list of used objects, and puts it on the list of |
996 | * free objects. The IS_FREED() flag is set in the object. |
899 | * free objects. The IS_FREED() flag is set in the object. |
997 | * The object must have been removed by remove_ob() first for |
900 | * The object must have been removed by remove_ob() first for |
998 | * this function to succeed. |
901 | * this function to succeed. |
999 | * |
902 | * |
1000 | * If free_inventory is set, free inventory as well. Else drop items in |
903 | * If destroy_inventory is set, free inventory as well. Else drop items in |
1001 | * inventory to the ground. |
904 | * inventory to the ground. |
1002 | */ |
905 | */ |
1003 | void object::free (bool free_inventory) |
906 | void object::destroy (bool destroy_inventory) |
1004 | { |
907 | { |
|
|
908 | if (QUERY_FLAG (this, FLAG_FREED)) |
|
|
909 | return; |
|
|
910 | |
|
|
911 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
|
|
912 | remove_friendly_object (this); |
|
|
913 | |
1005 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
914 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
1006 | { |
915 | remove (); |
1007 | LOG (llevDebug, "Free object called with non removed object\n"); |
|
|
1008 | dump_object (this); |
|
|
1009 | #ifdef MANY_CORES |
|
|
1010 | abort (); |
|
|
1011 | #endif |
|
|
1012 | } |
|
|
1013 | |
916 | |
1014 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
|
|
1015 | { |
|
|
1016 | LOG (llevMonster, "Warning: tried to free friendly object.\n"); |
|
|
1017 | remove_friendly_object (this); |
|
|
1018 | } |
|
|
1019 | |
|
|
1020 | if (QUERY_FLAG (this, FLAG_FREED)) |
917 | SET_FLAG (this, FLAG_FREED); |
1021 | { |
|
|
1022 | dump_object (this); |
|
|
1023 | LOG (llevError, "Trying to free freed object.\n%s\n", errmsg); |
|
|
1024 | return; |
|
|
1025 | } |
|
|
1026 | |
918 | |
1027 | if (more) |
919 | if (more) |
1028 | { |
920 | { |
1029 | more->free (free_inventory); |
921 | more->destroy (destroy_inventory); |
1030 | more = 0; |
922 | more = 0; |
1031 | } |
923 | } |
1032 | |
924 | |
1033 | if (inv) |
925 | if (inv) |
1034 | { |
926 | { |
1035 | /* Only if the space blocks everything do we not process - |
927 | /* Only if the space blocks everything do we not process - |
1036 | * if some form of movement is allowed, let objects |
928 | * if some form of movement is allowed, let objects |
1037 | * drop on that space. |
929 | * drop on that space. |
1038 | */ |
930 | */ |
1039 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) |
931 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1040 | { |
932 | { |
1041 | object * |
933 | object *op = inv; |
1042 | op = inv; |
|
|
1043 | |
934 | |
1044 | while (op) |
935 | while (op) |
1045 | { |
936 | { |
1046 | object * |
|
|
1047 | tmp = op->below; |
937 | object *tmp = op->below; |
1048 | |
|
|
1049 | remove_ob (op); |
|
|
1050 | op->free (free_inventory); |
938 | op->destroy (destroy_inventory); |
1051 | op = tmp; |
939 | op = tmp; |
1052 | } |
940 | } |
1053 | } |
941 | } |
1054 | else |
942 | else |
1055 | { /* Put objects in inventory onto this space */ |
943 | { /* Put objects in inventory onto this space */ |
1056 | object * |
944 | object *op = inv; |
1057 | op = inv; |
|
|
1058 | |
945 | |
1059 | while (op) |
946 | while (op) |
1060 | { |
947 | { |
1061 | object * |
|
|
1062 | tmp = op->below; |
948 | object *tmp = op->below; |
1063 | |
949 | |
1064 | remove_ob (op); |
950 | op->remove (); |
1065 | |
951 | |
1066 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
952 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
1067 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
953 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
1068 | free_object (op); |
954 | op->destroy (); |
1069 | else |
955 | else |
1070 | { |
956 | { |
1071 | op->x = x; |
957 | op->x = x; |
1072 | op->y = y; |
958 | op->y = y; |
1073 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
959 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
1076 | op = tmp; |
962 | op = tmp; |
1077 | } |
963 | } |
1078 | } |
964 | } |
1079 | } |
965 | } |
1080 | |
966 | |
1081 | clear_owner (this); |
967 | // hack to ensure that freed objects still have a valid map |
|
|
968 | { |
|
|
969 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
970 | |
|
|
971 | if (!freed_map) |
|
|
972 | { |
|
|
973 | freed_map = new maptile; |
|
|
974 | |
|
|
975 | freed_map->name = "/internal/freed_objects_map"; |
|
|
976 | freed_map->width = 3; |
|
|
977 | freed_map->height = 3; |
|
|
978 | |
|
|
979 | freed_map->allocate (); |
|
|
980 | } |
|
|
981 | |
|
|
982 | map = freed_map; |
|
|
983 | x = 1; |
|
|
984 | y = 1; |
|
|
985 | } |
|
|
986 | |
|
|
987 | // clear those pointers that likely might have circular references to us |
|
|
988 | owner = 0; |
|
|
989 | enemy = 0; |
|
|
990 | attacked_by = 0; |
|
|
991 | |
|
|
992 | // only relevant for players(?), but make sure of it anyways |
|
|
993 | contr = 0; |
1082 | |
994 | |
1083 | /* Remove object from the active list */ |
995 | /* Remove object from the active list */ |
1084 | speed = 0; |
996 | speed = 0; |
1085 | update_ob_speed (this); |
997 | update_ob_speed (this); |
1086 | |
998 | |
1087 | unlink (); |
999 | unlink (); |
1088 | |
1000 | |
1089 | SET_FLAG (this, FLAG_FREED); |
|
|
1090 | |
|
|
1091 | mortals.push_back (this); |
1001 | mortals.push_back (this); |
1092 | } |
1002 | } |
1093 | |
1003 | |
1094 | /* |
1004 | /* |
1095 | * sub_weight() recursively (outwards) subtracts a number from the |
1005 | * sub_weight() recursively (outwards) subtracts a number from the |
1096 | * weight of an object (and what is carried by it's environment(s)). |
1006 | * weight of an object (and what is carried by it's environment(s)). |
1097 | */ |
1007 | */ |
1098 | |
|
|
1099 | void |
1008 | void |
1100 | sub_weight (object *op, signed long weight) |
1009 | sub_weight (object *op, signed long weight) |
1101 | { |
1010 | { |
1102 | while (op != NULL) |
1011 | while (op != NULL) |
1103 | { |
1012 | { |
1104 | if (op->type == CONTAINER) |
1013 | if (op->type == CONTAINER) |
1105 | { |
|
|
1106 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1014 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1107 | } |
1015 | |
1108 | op->carrying -= weight; |
1016 | op->carrying -= weight; |
1109 | op = op->env; |
1017 | op = op->env; |
1110 | } |
1018 | } |
1111 | } |
1019 | } |
1112 | |
1020 | |
1113 | /* remove_ob(op): |
1021 | /* op->remove (): |
1114 | * This function removes the object op from the linked list of objects |
1022 | * This function removes the object op from the linked list of objects |
1115 | * which it is currently tied to. When this function is done, the |
1023 | * which it is currently tied to. When this function is done, the |
1116 | * object will have no environment. If the object previously had an |
1024 | * object will have no environment. If the object previously had an |
1117 | * environment, the x and y coordinates will be updated to |
1025 | * environment, the x and y coordinates will be updated to |
1118 | * the previous environment. |
1026 | * the previous environment. |
1119 | * Beware: This function is called from the editor as well! |
1027 | * Beware: This function is called from the editor as well! |
1120 | */ |
1028 | */ |
1121 | |
|
|
1122 | void |
1029 | void |
1123 | remove_ob (object *op) |
1030 | object::remove () |
1124 | { |
1031 | { |
1125 | object *tmp, *last = NULL; |
1032 | object *tmp, *last = 0; |
1126 | object *otmp; |
1033 | object *otmp; |
1127 | |
1034 | |
1128 | tag_t tag; |
|
|
1129 | int check_walk_off; |
1035 | int check_walk_off; |
1130 | mapstruct *m; |
|
|
1131 | |
1036 | |
1132 | sint16 x, y; |
|
|
1133 | |
|
|
1134 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1037 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1135 | { |
1038 | return; |
1136 | dump_object (op); |
|
|
1137 | LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg); |
|
|
1138 | |
1039 | |
1139 | /* Changed it to always dump core in this case. As has been learned |
|
|
1140 | * in the past, trying to recover from errors almost always |
|
|
1141 | * make things worse, and this is a real error here - something |
|
|
1142 | * that should not happen. |
|
|
1143 | * Yes, if this was a mission critical app, trying to do something |
|
|
1144 | * to recover may make sense, but that is because failure of the app |
|
|
1145 | * may have other disastrous problems. Cf runs out of a script |
|
|
1146 | * so is easily enough restarted without any real problems. |
|
|
1147 | * MSW 2001-07-01 |
|
|
1148 | */ |
|
|
1149 | abort (); |
|
|
1150 | } |
|
|
1151 | |
|
|
1152 | if (op->more != NULL) |
|
|
1153 | remove_ob (op->more); |
|
|
1154 | |
|
|
1155 | SET_FLAG (op, FLAG_REMOVED); |
1040 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1041 | |
|
|
1042 | if (more) |
|
|
1043 | more->remove (); |
1156 | |
1044 | |
1157 | /* |
1045 | /* |
1158 | * In this case, the object to be removed is in someones |
1046 | * In this case, the object to be removed is in someones |
1159 | * inventory. |
1047 | * inventory. |
1160 | */ |
1048 | */ |
1161 | if (op->env != NULL) |
1049 | if (env) |
1162 | { |
1050 | { |
1163 | if (op->nrof) |
1051 | if (nrof) |
1164 | sub_weight (op->env, op->weight * op->nrof); |
1052 | sub_weight (env, weight * nrof); |
1165 | else |
1053 | else |
1166 | sub_weight (op->env, op->weight + op->carrying); |
1054 | sub_weight (env, weight + carrying); |
1167 | |
1055 | |
1168 | /* NO_FIX_PLAYER is set when a great many changes are being |
1056 | /* NO_FIX_PLAYER is set when a great many changes are being |
1169 | * made to players inventory. If set, avoiding the call |
1057 | * made to players inventory. If set, avoiding the call |
1170 | * to save cpu time. |
1058 | * to save cpu time. |
1171 | */ |
1059 | */ |
1172 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1060 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1173 | fix_player (otmp); |
1061 | fix_player (otmp); |
1174 | |
1062 | |
1175 | if (op->above != NULL) |
1063 | if (above != NULL) |
1176 | op->above->below = op->below; |
1064 | above->below = below; |
1177 | else |
1065 | else |
1178 | op->env->inv = op->below; |
1066 | env->inv = below; |
1179 | |
1067 | |
1180 | if (op->below != NULL) |
1068 | if (below != NULL) |
1181 | op->below->above = op->above; |
1069 | below->above = above; |
1182 | |
1070 | |
1183 | /* we set up values so that it could be inserted into |
1071 | /* we set up values so that it could be inserted into |
1184 | * the map, but we don't actually do that - it is up |
1072 | * the map, but we don't actually do that - it is up |
1185 | * to the caller to decide what we want to do. |
1073 | * to the caller to decide what we want to do. |
1186 | */ |
1074 | */ |
1187 | op->x = op->env->x, op->y = op->env->y; |
1075 | x = env->x, y = env->y; |
1188 | op->map = op->env->map; |
1076 | map = env->map; |
1189 | op->above = NULL, op->below = NULL; |
1077 | above = 0, below = 0; |
1190 | op->env = NULL; |
1078 | env = 0; |
1191 | return; |
|
|
1192 | } |
|
|
1193 | |
|
|
1194 | /* If we get here, we are removing it from a map */ |
|
|
1195 | if (op->map == NULL) |
|
|
1196 | return; |
|
|
1197 | |
|
|
1198 | x = op->x; |
|
|
1199 | y = op->y; |
|
|
1200 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1201 | |
|
|
1202 | if (!m) |
|
|
1203 | { |
1079 | } |
1204 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
1080 | else if (map) |
1205 | op->map->path, op->x, op->y); |
1081 | { |
1206 | /* in old days, we used to set x and y to 0 and continue. |
1082 | /* Re did the following section of code - it looks like it had |
1207 | * it seems if we get into this case, something is probablye |
1083 | * lots of logic for things we no longer care about |
1208 | * screwed up and should be fixed. |
|
|
1209 | */ |
1084 | */ |
1210 | abort (); |
|
|
1211 | } |
|
|
1212 | if (op->map != m) |
|
|
1213 | { |
|
|
1214 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1215 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1216 | } |
|
|
1217 | |
1085 | |
1218 | /* Re did the following section of code - it looks like it had |
|
|
1219 | * lots of logic for things we no longer care about |
|
|
1220 | */ |
|
|
1221 | |
|
|
1222 | /* link the object above us */ |
1086 | /* link the object above us */ |
1223 | if (op->above) |
1087 | if (above) |
1224 | op->above->below = op->below; |
1088 | above->below = below; |
1225 | else |
1089 | else |
1226 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1090 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1227 | |
1091 | |
1228 | /* Relink the object below us, if there is one */ |
1092 | /* Relink the object below us, if there is one */ |
1229 | if (op->below) |
1093 | if (below) |
1230 | op->below->above = op->above; |
1094 | below->above = above; |
1231 | else |
1095 | else |
1232 | { |
1096 | { |
1233 | /* Nothing below, which means we need to relink map object for this space |
1097 | /* Nothing below, which means we need to relink map object for this space |
1234 | * use translated coordinates in case some oddness with map tiling is |
1098 | * use translated coordinates in case some oddness with map tiling is |
1235 | * evident |
1099 | * evident |
1236 | */ |
|
|
1237 | if (GET_MAP_OB (m, x, y) != op) |
|
|
1238 | { |
|
|
1239 | dump_object (op); |
|
|
1240 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", |
|
|
1241 | errmsg); |
|
|
1242 | dump_object (GET_MAP_OB (m, x, y)); |
|
|
1243 | LOG (llevError, "%s\n", errmsg); |
|
|
1244 | } |
|
|
1245 | |
|
|
1246 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
|
|
1247 | } |
|
|
1248 | |
|
|
1249 | op->above = NULL; |
|
|
1250 | op->below = NULL; |
|
|
1251 | |
|
|
1252 | if (op->map->in_memory == MAP_SAVING) |
|
|
1253 | return; |
|
|
1254 | |
|
|
1255 | tag = op->count; |
|
|
1256 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
|
|
1257 | |
|
|
1258 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
|
|
1259 | { |
|
|
1260 | /* No point updating the players look faces if he is the object |
|
|
1261 | * being removed. |
|
|
1262 | */ |
|
|
1263 | |
|
|
1264 | if (tmp->type == PLAYER && tmp != op) |
|
|
1265 | { |
|
|
1266 | /* If a container that the player is currently using somehow gets |
|
|
1267 | * removed (most likely destroyed), update the player view |
|
|
1268 | * appropriately. |
|
|
1269 | */ |
1100 | */ |
1270 | if (tmp->container == op) |
1101 | if (GET_MAP_OB (map, x, y) != this) |
1271 | { |
1102 | { |
1272 | CLEAR_FLAG (op, FLAG_APPLIED); |
1103 | char *dump = dump_object (this); |
1273 | tmp->container = NULL; |
1104 | LOG (llevError, |
|
|
1105 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
|
|
1106 | free (dump); |
|
|
1107 | dump = dump_object (GET_MAP_OB (map, x, y)); |
|
|
1108 | LOG (llevError, "%s\n", dump); |
|
|
1109 | free (dump); |
1274 | } |
1110 | } |
1275 | |
1111 | |
1276 | tmp->contr->socket.update_look = 1; |
1112 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1277 | } |
|
|
1278 | /* See if player moving off should effect something */ |
|
|
1279 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
|
|
1280 | { |
1113 | } |
1281 | move_apply (tmp, op, NULL); |
|
|
1282 | |
1114 | |
1283 | if (was_destroyed (op, tag)) |
1115 | above = 0; |
|
|
1116 | below = 0; |
|
|
1117 | |
|
|
1118 | if (map->in_memory == MAP_SAVING) |
|
|
1119 | return; |
|
|
1120 | |
|
|
1121 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
|
|
1122 | |
|
|
1123 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
|
|
1124 | { |
|
|
1125 | /* No point updating the players look faces if he is the object |
|
|
1126 | * being removed. |
|
|
1127 | */ |
|
|
1128 | |
|
|
1129 | if (tmp->type == PLAYER && tmp != this) |
1284 | { |
1130 | { |
1285 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1131 | /* If a container that the player is currently using somehow gets |
|
|
1132 | * removed (most likely destroyed), update the player view |
|
|
1133 | * appropriately. |
|
|
1134 | */ |
|
|
1135 | if (tmp->container == this) |
|
|
1136 | { |
|
|
1137 | CLEAR_FLAG (this, FLAG_APPLIED); |
|
|
1138 | tmp->container = 0; |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | tmp->contr->socket->floorbox_update (); |
1286 | } |
1142 | } |
|
|
1143 | |
|
|
1144 | /* See if player moving off should effect something */ |
|
|
1145 | if (check_walk_off |
|
|
1146 | && ((move_type & tmp->move_off) |
|
|
1147 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
|
|
1148 | { |
|
|
1149 | move_apply (tmp, this, 0); |
|
|
1150 | |
|
|
1151 | if (destroyed ()) |
|
|
1152 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1287 | } |
1153 | } |
1288 | |
1154 | |
1289 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1155 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1290 | |
1156 | |
1291 | if (tmp->above == tmp) |
1157 | if (tmp->above == tmp) |
1292 | tmp->above = NULL; |
1158 | tmp->above = 0; |
1293 | |
1159 | |
1294 | last = tmp; |
1160 | last = tmp; |
1295 | } |
1161 | } |
1296 | |
1162 | |
1297 | /* last == NULL of there are no objects on this space */ |
1163 | /* last == NULL of there are no objects on this space */ |
1298 | if (last == NULL) |
1164 | if (!last) |
1299 | { |
1165 | { |
1300 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1166 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1301 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1167 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1302 | * those out anyways, and if there are any flags set right now, they won't |
1168 | * those out anyways, and if there are any flags set right now, they won't |
1303 | * be correct anyways. |
1169 | * be correct anyways. |
1304 | */ |
1170 | */ |
1305 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1171 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1306 | update_position (op->map, op->x, op->y); |
1172 | update_position (map, x, y); |
1307 | } |
1173 | } |
1308 | else |
1174 | else |
1309 | update_object (last, UP_OBJ_REMOVE); |
1175 | update_object (last, UP_OBJ_REMOVE); |
1310 | |
1176 | |
1311 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1177 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1312 | update_all_los (op->map, op->x, op->y); |
1178 | update_all_los (map, x, y); |
|
|
1179 | } |
1313 | } |
1180 | } |
1314 | |
1181 | |
1315 | /* |
1182 | /* |
1316 | * merge_ob(op,top): |
1183 | * merge_ob(op,top): |
1317 | * |
1184 | * |
1318 | * This function goes through all objects below and including top, and |
1185 | * This function goes through all objects below and including top, and |
1319 | * merges op to the first matching object. |
1186 | * merges op to the first matching object. |
1320 | * If top is NULL, it is calculated. |
1187 | * If top is NULL, it is calculated. |
1321 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1188 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1322 | */ |
1189 | */ |
1323 | |
|
|
1324 | object * |
1190 | object * |
1325 | merge_ob (object *op, object *top) |
1191 | merge_ob (object *op, object *top) |
1326 | { |
1192 | { |
1327 | if (!op->nrof) |
1193 | if (!op->nrof) |
1328 | return 0; |
1194 | return 0; |
|
|
1195 | |
1329 | if (top == NULL) |
1196 | if (top == NULL) |
1330 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1197 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
|
|
1198 | |
1331 | for (; top != NULL; top = top->below) |
1199 | for (; top != NULL; top = top->below) |
1332 | { |
1200 | { |
1333 | if (top == op) |
1201 | if (top == op) |
1334 | continue; |
1202 | continue; |
1335 | if (CAN_MERGE (op, top)) |
1203 | |
|
|
1204 | if (object::can_merge (op, top)) |
1336 | { |
1205 | { |
1337 | top->nrof += op->nrof; |
1206 | top->nrof += op->nrof; |
1338 | |
1207 | |
1339 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1208 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1340 | op->weight = 0; /* Don't want any adjustements now */ |
1209 | op->weight = 0; /* Don't want any adjustements now */ |
1341 | remove_ob (op); |
1210 | op->destroy (); |
1342 | free_object (op); |
|
|
1343 | return top; |
1211 | return top; |
1344 | } |
1212 | } |
1345 | } |
1213 | } |
|
|
1214 | |
1346 | return NULL; |
1215 | return 0; |
1347 | } |
1216 | } |
1348 | |
1217 | |
1349 | /* |
1218 | /* |
1350 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1219 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1351 | * job preparing multi-part monsters |
1220 | * job preparing multi-part monsters |
1352 | */ |
1221 | */ |
1353 | object * |
1222 | object * |
1354 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1223 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1355 | { |
1224 | { |
1356 | object * |
1225 | object *tmp; |
1357 | tmp; |
|
|
1358 | |
1226 | |
1359 | if (op->head) |
1227 | if (op->head) |
1360 | op = op->head; |
1228 | op = op->head; |
|
|
1229 | |
1361 | for (tmp = op; tmp; tmp = tmp->more) |
1230 | for (tmp = op; tmp; tmp = tmp->more) |
1362 | { |
1231 | { |
1363 | tmp->x = x + tmp->arch->clone.x; |
1232 | tmp->x = x + tmp->arch->clone.x; |
1364 | tmp->y = y + tmp->arch->clone.y; |
1233 | tmp->y = y + tmp->arch->clone.y; |
1365 | } |
1234 | } |
|
|
1235 | |
1366 | return insert_ob_in_map (op, m, originator, flag); |
1236 | return insert_ob_in_map (op, m, originator, flag); |
1367 | } |
1237 | } |
1368 | |
1238 | |
1369 | /* |
1239 | /* |
1370 | * insert_ob_in_map (op, map, originator, flag): |
1240 | * insert_ob_in_map (op, map, originator, flag): |
… | |
… | |
1386 | * NULL if 'op' was destroyed |
1256 | * NULL if 'op' was destroyed |
1387 | * just 'op' otherwise |
1257 | * just 'op' otherwise |
1388 | */ |
1258 | */ |
1389 | |
1259 | |
1390 | object * |
1260 | object * |
1391 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1261 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1392 | { |
1262 | { |
1393 | object *tmp, *top, *floor = NULL; |
1263 | object *tmp, *top, *floor = NULL; |
1394 | sint16 x, y; |
1264 | sint16 x, y; |
1395 | |
1265 | |
1396 | if (QUERY_FLAG (op, FLAG_FREED)) |
1266 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1399 | return NULL; |
1269 | return NULL; |
1400 | } |
1270 | } |
1401 | |
1271 | |
1402 | if (m == NULL) |
1272 | if (m == NULL) |
1403 | { |
1273 | { |
1404 | dump_object (op); |
1274 | char *dump = dump_object (op); |
1405 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1275 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1276 | free (dump); |
1406 | return op; |
1277 | return op; |
1407 | } |
1278 | } |
1408 | |
1279 | |
1409 | if (out_of_map (m, op->x, op->y)) |
1280 | if (out_of_map (m, op->x, op->y)) |
1410 | { |
1281 | { |
1411 | dump_object (op); |
1282 | char *dump = dump_object (op); |
1412 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1283 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1413 | #ifdef MANY_CORES |
1284 | #ifdef MANY_CORES |
1414 | /* Better to catch this here, as otherwise the next use of this object |
1285 | /* Better to catch this here, as otherwise the next use of this object |
1415 | * is likely to cause a crash. Better to find out where it is getting |
1286 | * is likely to cause a crash. Better to find out where it is getting |
1416 | * improperly inserted. |
1287 | * improperly inserted. |
1417 | */ |
1288 | */ |
1418 | abort (); |
1289 | abort (); |
1419 | #endif |
1290 | #endif |
|
|
1291 | free (dump); |
1420 | return op; |
1292 | return op; |
1421 | } |
1293 | } |
1422 | |
1294 | |
1423 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1295 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1424 | { |
1296 | { |
1425 | dump_object (op); |
1297 | char *dump = dump_object (op); |
1426 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1298 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1299 | free (dump); |
1427 | return op; |
1300 | return op; |
1428 | } |
1301 | } |
1429 | |
1302 | |
1430 | if (op->more != NULL) |
1303 | if (op->more != NULL) |
1431 | { |
1304 | { |
… | |
… | |
1469 | |
1342 | |
1470 | /* this has to be done after we translate the coordinates. |
1343 | /* this has to be done after we translate the coordinates. |
1471 | */ |
1344 | */ |
1472 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1345 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1473 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1346 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1474 | if (CAN_MERGE (op, tmp)) |
1347 | if (object::can_merge (op, tmp)) |
1475 | { |
1348 | { |
1476 | op->nrof += tmp->nrof; |
1349 | op->nrof += tmp->nrof; |
1477 | remove_ob (tmp); |
1350 | tmp->destroy (); |
1478 | free_object (tmp); |
|
|
1479 | } |
1351 | } |
1480 | |
1352 | |
1481 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1353 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1482 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1483 | |
1355 | |
… | |
… | |
1611 | * it, so save a few ticks and start from there. |
1483 | * it, so save a few ticks and start from there. |
1612 | */ |
1484 | */ |
1613 | if (!(flag & INS_MAP_LOAD)) |
1485 | if (!(flag & INS_MAP_LOAD)) |
1614 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1486 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1615 | if (tmp->type == PLAYER) |
1487 | if (tmp->type == PLAYER) |
1616 | tmp->contr->socket.update_look = 1; |
1488 | tmp->contr->socket->floorbox_update (); |
1617 | |
1489 | |
1618 | /* If this object glows, it may affect lighting conditions that are |
1490 | /* If this object glows, it may affect lighting conditions that are |
1619 | * visible to others on this map. But update_all_los is really |
1491 | * visible to others on this map. But update_all_los is really |
1620 | * an inefficient way to do this, as it means los for all players |
1492 | * an inefficient way to do this, as it means los for all players |
1621 | * on the map will get recalculated. The players could very well |
1493 | * on the map will get recalculated. The players could very well |
… | |
… | |
1629 | |
1501 | |
1630 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1502 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1631 | update_object (op, UP_OBJ_INSERT); |
1503 | update_object (op, UP_OBJ_INSERT); |
1632 | |
1504 | |
1633 | /* Don't know if moving this to the end will break anything. However, |
1505 | /* Don't know if moving this to the end will break anything. However, |
1634 | * we want to have update_look set above before calling this. |
1506 | * we want to have floorbox_update called before calling this. |
1635 | * |
1507 | * |
1636 | * check_move_on() must be after this because code called from |
1508 | * check_move_on() must be after this because code called from |
1637 | * check_move_on() depends on correct map flags (so functions like |
1509 | * check_move_on() depends on correct map flags (so functions like |
1638 | * blocked() and wall() work properly), and these flags are updated by |
1510 | * blocked() and wall() work properly), and these flags are updated by |
1639 | * update_object(). |
1511 | * update_object(). |
… | |
… | |
1661 | * op is the object to insert it under: supplies x and the map. |
1533 | * op is the object to insert it under: supplies x and the map. |
1662 | */ |
1534 | */ |
1663 | void |
1535 | void |
1664 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1536 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1665 | { |
1537 | { |
1666 | object *tmp; |
1538 | object * |
|
|
1539 | tmp; |
1667 | object *tmp1; |
1540 | object * |
|
|
1541 | tmp1; |
1668 | |
1542 | |
1669 | /* first search for itself and remove any old instances */ |
1543 | /* first search for itself and remove any old instances */ |
1670 | |
1544 | |
1671 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1545 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1672 | { |
|
|
1673 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1546 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1674 | { |
1547 | tmp->destroy (); |
1675 | remove_ob (tmp); |
|
|
1676 | free_object (tmp); |
|
|
1677 | } |
|
|
1678 | } |
|
|
1679 | |
1548 | |
1680 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1549 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1681 | |
1550 | |
1682 | tmp1->x = op->x; |
1551 | tmp1->x = op->x; |
1683 | tmp1->y = op->y; |
1552 | tmp1->y = op->y; |
1684 | insert_ob_in_map (tmp1, op->map, op, 0); |
1553 | insert_ob_in_map (tmp1, op->map, op, 0); |
1685 | } |
1554 | } |
… | |
… | |
1693 | */ |
1562 | */ |
1694 | |
1563 | |
1695 | object * |
1564 | object * |
1696 | get_split_ob (object *orig_ob, uint32 nr) |
1565 | get_split_ob (object *orig_ob, uint32 nr) |
1697 | { |
1566 | { |
1698 | object * |
1567 | object *newob; |
1699 | newob; |
|
|
1700 | int |
|
|
1701 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1568 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1702 | |
1569 | |
1703 | if (orig_ob->nrof < nr) |
1570 | if (orig_ob->nrof < nr) |
1704 | { |
1571 | { |
1705 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1572 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1706 | return NULL; |
1573 | return NULL; |
1707 | } |
1574 | } |
|
|
1575 | |
1708 | newob = object_create_clone (orig_ob); |
1576 | newob = object_create_clone (orig_ob); |
|
|
1577 | |
1709 | if ((orig_ob->nrof -= nr) < 1) |
1578 | if ((orig_ob->nrof -= nr) < 1) |
1710 | { |
1579 | orig_ob->destroy (1); |
1711 | if (!is_removed) |
|
|
1712 | remove_ob (orig_ob); |
|
|
1713 | free_object2 (orig_ob, 1); |
|
|
1714 | } |
|
|
1715 | else if (!is_removed) |
1580 | else if (!is_removed) |
1716 | { |
1581 | { |
1717 | if (orig_ob->env != NULL) |
1582 | if (orig_ob->env != NULL) |
1718 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1583 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1719 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1584 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1721 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
1586 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
1722 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
1587 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
1723 | return NULL; |
1588 | return NULL; |
1724 | } |
1589 | } |
1725 | } |
1590 | } |
|
|
1591 | |
1726 | newob->nrof = nr; |
1592 | newob->nrof = nr; |
1727 | |
1593 | |
1728 | return newob; |
1594 | return newob; |
1729 | } |
1595 | } |
1730 | |
1596 | |
… | |
… | |
1737 | */ |
1603 | */ |
1738 | |
1604 | |
1739 | object * |
1605 | object * |
1740 | decrease_ob_nr (object *op, uint32 i) |
1606 | decrease_ob_nr (object *op, uint32 i) |
1741 | { |
1607 | { |
1742 | object * |
1608 | object *tmp; |
1743 | tmp; |
|
|
1744 | player * |
1609 | player *pl; |
1745 | pl; |
|
|
1746 | |
1610 | |
1747 | if (i == 0) /* objects with op->nrof require this check */ |
1611 | if (i == 0) /* objects with op->nrof require this check */ |
1748 | return op; |
1612 | return op; |
1749 | |
1613 | |
1750 | if (i > op->nrof) |
1614 | if (i > op->nrof) |
1751 | i = op->nrof; |
1615 | i = op->nrof; |
1752 | |
1616 | |
1753 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1617 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1754 | { |
|
|
1755 | op->nrof -= i; |
1618 | op->nrof -= i; |
1756 | } |
|
|
1757 | else if (op->env != NULL) |
1619 | else if (op->env != NULL) |
1758 | { |
1620 | { |
1759 | /* is this object in the players inventory, or sub container |
1621 | /* is this object in the players inventory, or sub container |
1760 | * therein? |
1622 | * therein? |
1761 | */ |
1623 | */ |
… | |
… | |
1786 | esrv_send_item (tmp, op); |
1648 | esrv_send_item (tmp, op); |
1787 | } |
1649 | } |
1788 | } |
1650 | } |
1789 | else |
1651 | else |
1790 | { |
1652 | { |
1791 | remove_ob (op); |
1653 | op->remove (); |
1792 | op->nrof = 0; |
1654 | op->nrof = 0; |
1793 | if (tmp) |
1655 | if (tmp) |
1794 | { |
1656 | { |
1795 | esrv_del_item (tmp->contr, op->count); |
1657 | esrv_del_item (tmp->contr, op->count); |
1796 | } |
1658 | } |
1797 | } |
1659 | } |
1798 | } |
1660 | } |
1799 | else |
1661 | else |
1800 | { |
1662 | { |
1801 | object * |
|
|
1802 | above = op->above; |
1663 | object *above = op->above; |
1803 | |
1664 | |
1804 | if (i < op->nrof) |
1665 | if (i < op->nrof) |
1805 | { |
|
|
1806 | op->nrof -= i; |
1666 | op->nrof -= i; |
1807 | } |
|
|
1808 | else |
1667 | else |
1809 | { |
1668 | { |
1810 | remove_ob (op); |
1669 | op->remove (); |
1811 | op->nrof = 0; |
1670 | op->nrof = 0; |
1812 | } |
1671 | } |
|
|
1672 | |
1813 | /* Since we just removed op, op->above is null */ |
1673 | /* Since we just removed op, op->above is null */ |
1814 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1674 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1815 | if (tmp->type == PLAYER) |
1675 | if (tmp->type == PLAYER) |
1816 | { |
1676 | { |
1817 | if (op->nrof) |
1677 | if (op->nrof) |
… | |
… | |
1820 | esrv_del_item (tmp->contr, op->count); |
1680 | esrv_del_item (tmp->contr, op->count); |
1821 | } |
1681 | } |
1822 | } |
1682 | } |
1823 | |
1683 | |
1824 | if (op->nrof) |
1684 | if (op->nrof) |
1825 | { |
|
|
1826 | return op; |
1685 | return op; |
1827 | } |
|
|
1828 | else |
1686 | else |
1829 | { |
1687 | { |
1830 | free_object (op); |
1688 | op->destroy (); |
1831 | return NULL; |
1689 | return NULL; |
1832 | } |
1690 | } |
1833 | } |
1691 | } |
1834 | |
1692 | |
1835 | /* |
1693 | /* |
… | |
… | |
1841 | add_weight (object *op, signed long weight) |
1699 | add_weight (object *op, signed long weight) |
1842 | { |
1700 | { |
1843 | while (op != NULL) |
1701 | while (op != NULL) |
1844 | { |
1702 | { |
1845 | if (op->type == CONTAINER) |
1703 | if (op->type == CONTAINER) |
1846 | { |
|
|
1847 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1704 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1848 | } |
1705 | |
1849 | op->carrying += weight; |
1706 | op->carrying += weight; |
1850 | op = op->env; |
1707 | op = op->env; |
1851 | } |
1708 | } |
1852 | } |
1709 | } |
1853 | |
1710 | |
|
|
1711 | object * |
|
|
1712 | insert_ob_in_ob (object *op, object *where) |
|
|
1713 | { |
|
|
1714 | if (!where) |
|
|
1715 | { |
|
|
1716 | char *dump = dump_object (op); |
|
|
1717 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1718 | free (dump); |
|
|
1719 | return op; |
|
|
1720 | } |
|
|
1721 | |
|
|
1722 | if (where->head) |
|
|
1723 | { |
|
|
1724 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1725 | where = where->head; |
|
|
1726 | } |
|
|
1727 | |
|
|
1728 | return where->insert (op); |
|
|
1729 | } |
|
|
1730 | |
1854 | /* |
1731 | /* |
1855 | * insert_ob_in_ob(op,environment): |
1732 | * env->insert (op) |
1856 | * This function inserts the object op in the linked list |
1733 | * This function inserts the object op in the linked list |
1857 | * inside the object environment. |
1734 | * inside the object environment. |
1858 | * |
1735 | * |
1859 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1860 | * the inventory at the last position or next to other objects of the same |
|
|
1861 | * type. |
|
|
1862 | * Frank: Now sorted by type, archetype and magic! |
|
|
1863 | * |
|
|
1864 | * The function returns now pointer to inserted item, and return value can |
1736 | * The function returns now pointer to inserted item, and return value can |
1865 | * be != op, if items are merged. -Tero |
1737 | * be != op, if items are merged. -Tero |
1866 | */ |
1738 | */ |
1867 | |
1739 | |
1868 | object * |
1740 | object * |
1869 | insert_ob_in_ob (object *op, object *where) |
1741 | object::insert (object *op) |
1870 | { |
1742 | { |
1871 | object * |
1743 | object *tmp, *otmp; |
1872 | tmp, * |
|
|
1873 | otmp; |
|
|
1874 | |
1744 | |
1875 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1745 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1876 | { |
1746 | op->remove (); |
1877 | dump_object (op); |
1747 | |
1878 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1879 | return op; |
|
|
1880 | } |
|
|
1881 | if (where == NULL) |
|
|
1882 | { |
|
|
1883 | dump_object (op); |
|
|
1884 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1885 | return op; |
|
|
1886 | } |
|
|
1887 | if (where->head) |
|
|
1888 | { |
|
|
1889 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1890 | where = where->head; |
|
|
1891 | } |
|
|
1892 | if (op->more) |
1748 | if (op->more) |
1893 | { |
1749 | { |
1894 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1750 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1895 | return op; |
1751 | return op; |
1896 | } |
1752 | } |
|
|
1753 | |
1897 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1754 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1898 | CLEAR_FLAG (op, FLAG_REMOVED); |
1755 | CLEAR_FLAG (op, FLAG_REMOVED); |
1899 | if (op->nrof) |
1756 | if (op->nrof) |
1900 | { |
1757 | { |
1901 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1758 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1902 | if (CAN_MERGE (tmp, op)) |
1759 | if (object::can_merge (tmp, op)) |
1903 | { |
1760 | { |
1904 | /* return the original object and remove inserted object |
1761 | /* return the original object and remove inserted object |
1905 | (client needs the original object) */ |
1762 | (client needs the original object) */ |
1906 | tmp->nrof += op->nrof; |
1763 | tmp->nrof += op->nrof; |
1907 | /* Weight handling gets pretty funky. Since we are adding to |
1764 | /* Weight handling gets pretty funky. Since we are adding to |
1908 | * tmp->nrof, we need to increase the weight. |
1765 | * tmp->nrof, we need to increase the weight. |
1909 | */ |
1766 | */ |
1910 | add_weight (where, op->weight * op->nrof); |
1767 | add_weight (this, op->weight * op->nrof); |
1911 | SET_FLAG (op, FLAG_REMOVED); |
1768 | SET_FLAG (op, FLAG_REMOVED); |
1912 | free_object (op); /* free the inserted object */ |
1769 | op->destroy (); /* free the inserted object */ |
1913 | op = tmp; |
1770 | op = tmp; |
1914 | remove_ob (op); /* and fix old object's links */ |
1771 | op->remove (); /* and fix old object's links */ |
1915 | CLEAR_FLAG (op, FLAG_REMOVED); |
1772 | CLEAR_FLAG (op, FLAG_REMOVED); |
1916 | break; |
1773 | break; |
1917 | } |
1774 | } |
1918 | |
1775 | |
1919 | /* I assume combined objects have no inventory |
1776 | /* I assume combined objects have no inventory |
1920 | * We add the weight - this object could have just been removed |
1777 | * We add the weight - this object could have just been removed |
1921 | * (if it was possible to merge). calling remove_ob will subtract |
1778 | * (if it was possible to merge). calling remove_ob will subtract |
1922 | * the weight, so we need to add it in again, since we actually do |
1779 | * the weight, so we need to add it in again, since we actually do |
1923 | * the linking below |
1780 | * the linking below |
1924 | */ |
1781 | */ |
1925 | add_weight (where, op->weight * op->nrof); |
1782 | add_weight (this, op->weight * op->nrof); |
1926 | } |
1783 | } |
1927 | else |
1784 | else |
1928 | add_weight (where, (op->weight + op->carrying)); |
1785 | add_weight (this, (op->weight + op->carrying)); |
1929 | |
1786 | |
1930 | otmp = is_player_inv (where); |
1787 | otmp = is_player_inv (this); |
1931 | if (otmp && otmp->contr != NULL) |
1788 | if (otmp && otmp->contr) |
1932 | { |
|
|
1933 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1789 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1934 | fix_player (otmp); |
1790 | fix_player (otmp); |
1935 | } |
|
|
1936 | |
1791 | |
1937 | op->map = NULL; |
1792 | op->map = NULL; |
1938 | op->env = where; |
1793 | op->env = this; |
1939 | op->above = NULL; |
1794 | op->above = NULL; |
1940 | op->below = NULL; |
1795 | op->below = NULL; |
1941 | op->x = 0, op->y = 0; |
1796 | op->x = 0, op->y = 0; |
1942 | |
1797 | |
1943 | /* reset the light list and los of the players on the map */ |
1798 | /* reset the light list and los of the players on the map */ |
1944 | if ((op->glow_radius != 0) && where->map) |
1799 | if ((op->glow_radius != 0) && map) |
1945 | { |
1800 | { |
1946 | #ifdef DEBUG_LIGHTS |
1801 | #ifdef DEBUG_LIGHTS |
1947 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1802 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1948 | #endif /* DEBUG_LIGHTS */ |
1803 | #endif /* DEBUG_LIGHTS */ |
1949 | if (MAP_DARKNESS (where->map)) |
1804 | if (MAP_DARKNESS (map)) |
1950 | update_all_los (where->map, where->x, where->y); |
1805 | update_all_los (map, x, y); |
1951 | } |
1806 | } |
1952 | |
1807 | |
1953 | /* Client has no idea of ordering so lets not bother ordering it here. |
1808 | /* Client has no idea of ordering so lets not bother ordering it here. |
1954 | * It sure simplifies this function... |
1809 | * It sure simplifies this function... |
1955 | */ |
1810 | */ |
1956 | if (where->inv == NULL) |
1811 | if (!inv) |
1957 | where->inv = op; |
1812 | inv = op; |
1958 | else |
1813 | else |
1959 | { |
1814 | { |
1960 | op->below = where->inv; |
1815 | op->below = inv; |
1961 | op->below->above = op; |
1816 | op->below->above = op; |
1962 | where->inv = op; |
1817 | inv = op; |
1963 | } |
1818 | } |
|
|
1819 | |
1964 | return op; |
1820 | return op; |
1965 | } |
1821 | } |
1966 | |
1822 | |
1967 | /* |
1823 | /* |
1968 | * Checks if any objects has a move_type that matches objects |
1824 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1987 | |
1843 | |
1988 | int |
1844 | int |
1989 | check_move_on (object *op, object *originator) |
1845 | check_move_on (object *op, object *originator) |
1990 | { |
1846 | { |
1991 | object *tmp; |
1847 | object *tmp; |
1992 | tag_t tag; |
|
|
1993 | mapstruct *m = op->map; |
1848 | maptile *m = op->map; |
1994 | int x = op->x, y = op->y; |
1849 | int x = op->x, y = op->y; |
1995 | |
1850 | |
1996 | MoveType move_on, move_slow, move_block; |
1851 | MoveType move_on, move_slow, move_block; |
1997 | |
1852 | |
1998 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1853 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1999 | return 0; |
1854 | return 0; |
2000 | |
|
|
2001 | tag = op->count; |
|
|
2002 | |
1855 | |
2003 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1856 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
2004 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1857 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
2005 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1858 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
2006 | |
1859 | |
… | |
… | |
2049 | { |
1902 | { |
2050 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1903 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
2051 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1904 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
2052 | { |
1905 | { |
2053 | |
1906 | |
|
|
1907 | float |
2054 | float diff = tmp->move_slow_penalty * FABS (op->speed); |
1908 | diff = tmp->move_slow_penalty * FABS (op->speed); |
2055 | |
1909 | |
2056 | if (op->type == PLAYER) |
1910 | if (op->type == PLAYER) |
2057 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1911 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
2058 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1912 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
2059 | diff /= 4.0; |
1913 | diff /= 4.0; |
… | |
… | |
2066 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1920 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2067 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1921 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2068 | { |
1922 | { |
2069 | move_apply (tmp, op, originator); |
1923 | move_apply (tmp, op, originator); |
2070 | |
1924 | |
2071 | if (was_destroyed (op, tag)) |
1925 | if (op->destroyed ()) |
2072 | return 1; |
1926 | return 1; |
2073 | |
1927 | |
2074 | /* what the person/creature stepped onto has moved the object |
1928 | /* what the person/creature stepped onto has moved the object |
2075 | * someplace new. Don't process any further - if we did, |
1929 | * someplace new. Don't process any further - if we did, |
2076 | * have a feeling strange problems would result. |
1930 | * have a feeling strange problems would result. |
… | |
… | |
2088 | * a matching archetype at the given map and coordinates. |
1942 | * a matching archetype at the given map and coordinates. |
2089 | * The first matching object is returned, or NULL if none. |
1943 | * The first matching object is returned, or NULL if none. |
2090 | */ |
1944 | */ |
2091 | |
1945 | |
2092 | object * |
1946 | object * |
2093 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1947 | present_arch (const archetype *at, maptile *m, int x, int y) |
2094 | { |
1948 | { |
2095 | object * |
1949 | object * |
2096 | tmp; |
1950 | tmp; |
2097 | |
1951 | |
2098 | if (m == NULL || out_of_map (m, x, y)) |
1952 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2111 | * a matching type variable at the given map and coordinates. |
1965 | * a matching type variable at the given map and coordinates. |
2112 | * The first matching object is returned, or NULL if none. |
1966 | * The first matching object is returned, or NULL if none. |
2113 | */ |
1967 | */ |
2114 | |
1968 | |
2115 | object * |
1969 | object * |
2116 | present (unsigned char type, mapstruct *m, int x, int y) |
1970 | present (unsigned char type, maptile *m, int x, int y) |
2117 | { |
1971 | { |
2118 | object * |
1972 | object * |
2119 | tmp; |
1973 | tmp; |
2120 | |
1974 | |
2121 | if (out_of_map (m, x, y)) |
1975 | if (out_of_map (m, x, y)) |
… | |
… | |
2261 | * the archetype because that isn't correct if the monster has been |
2115 | * the archetype because that isn't correct if the monster has been |
2262 | * customized, changed states, etc. |
2116 | * customized, changed states, etc. |
2263 | */ |
2117 | */ |
2264 | |
2118 | |
2265 | int |
2119 | int |
2266 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2120 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2267 | { |
2121 | { |
2268 | int |
2122 | int |
2269 | i, |
2123 | i, |
2270 | index = 0, flag; |
2124 | index = 0, flag; |
2271 | static int |
2125 | static int |
… | |
… | |
2292 | return -1; |
2146 | return -1; |
2293 | return altern[RANDOM () % index]; |
2147 | return altern[RANDOM () % index]; |
2294 | } |
2148 | } |
2295 | |
2149 | |
2296 | /* |
2150 | /* |
2297 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2151 | * find_first_free_spot(archetype, maptile, x, y) works like |
2298 | * find_free_spot(), but it will search max number of squares. |
2152 | * find_free_spot(), but it will search max number of squares. |
2299 | * But it will return the first available spot, not a random choice. |
2153 | * But it will return the first available spot, not a random choice. |
2300 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2154 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2301 | */ |
2155 | */ |
2302 | |
2156 | |
2303 | int |
2157 | int |
2304 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2158 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2305 | { |
2159 | { |
2306 | int |
2160 | int |
2307 | i; |
2161 | i; |
2308 | |
2162 | |
2309 | for (i = 0; i < SIZEOFFREE; i++) |
2163 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2373 | * because we have to know what movement the thing looking to move |
2227 | * because we have to know what movement the thing looking to move |
2374 | * there is capable of. |
2228 | * there is capable of. |
2375 | */ |
2229 | */ |
2376 | |
2230 | |
2377 | int |
2231 | int |
2378 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2232 | find_dir (maptile *m, int x, int y, object *exclude) |
2379 | { |
2233 | { |
2380 | int |
2234 | int |
2381 | i, |
2235 | i, |
2382 | max = SIZEOFFREE, mflags; |
2236 | max = SIZEOFFREE, mflags; |
2383 | sint16 |
2237 | |
2384 | nx, |
2238 | sint16 nx, ny; |
2385 | ny; |
|
|
2386 | object * |
2239 | object * |
2387 | tmp; |
2240 | tmp; |
2388 | mapstruct * |
2241 | maptile * |
2389 | mp; |
2242 | mp; |
2390 | MoveType |
2243 | |
2391 | blocked, |
2244 | MoveType blocked, move_type; |
2392 | move_type; |
|
|
2393 | |
2245 | |
2394 | if (exclude && exclude->head) |
2246 | if (exclude && exclude->head) |
2395 | { |
2247 | { |
2396 | exclude = exclude->head; |
2248 | exclude = exclude->head; |
2397 | move_type = exclude->move_type; |
2249 | move_type = exclude->move_type; |
… | |
… | |
2602 | * Modified to be map tile aware -.MSW |
2454 | * Modified to be map tile aware -.MSW |
2603 | */ |
2455 | */ |
2604 | |
2456 | |
2605 | |
2457 | |
2606 | int |
2458 | int |
2607 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2459 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2608 | { |
2460 | { |
2609 | sint16 |
2461 | sint16 dx, dy; |
2610 | dx, |
|
|
2611 | dy; |
|
|
2612 | int |
2462 | int |
2613 | mflags; |
2463 | mflags; |
2614 | |
2464 | |
2615 | if (dir < 0) |
2465 | if (dir < 0) |
2616 | return 0; /* exit condition: invalid direction */ |
2466 | return 0; /* exit condition: invalid direction */ |
… | |
… | |
2663 | * create clone from object to another |
2513 | * create clone from object to another |
2664 | */ |
2514 | */ |
2665 | object * |
2515 | object * |
2666 | object_create_clone (object *asrc) |
2516 | object_create_clone (object *asrc) |
2667 | { |
2517 | { |
2668 | object * |
|
|
2669 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2518 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2670 | |
2519 | |
2671 | if (!asrc) |
2520 | if (!asrc) |
2672 | return NULL; |
2521 | return 0; |
|
|
2522 | |
2673 | src = asrc; |
2523 | src = asrc; |
2674 | if (src->head) |
2524 | if (src->head) |
2675 | src = src->head; |
2525 | src = src->head; |
2676 | |
2526 | |
2677 | prev = NULL; |
2527 | prev = 0; |
2678 | for (part = src; part; part = part->more) |
2528 | for (part = src; part; part = part->more) |
2679 | { |
2529 | { |
2680 | tmp = get_object (); |
2530 | tmp = part->clone (); |
2681 | copy_object (part, tmp); |
|
|
2682 | tmp->x -= src->x; |
2531 | tmp->x -= src->x; |
2683 | tmp->y -= src->y; |
2532 | tmp->y -= src->y; |
|
|
2533 | |
2684 | if (!part->head) |
2534 | if (!part->head) |
2685 | { |
2535 | { |
2686 | dst = tmp; |
2536 | dst = tmp; |
2687 | tmp->head = NULL; |
2537 | tmp->head = 0; |
2688 | } |
2538 | } |
2689 | else |
2539 | else |
2690 | { |
2540 | { |
2691 | tmp->head = dst; |
2541 | tmp->head = dst; |
2692 | } |
2542 | } |
|
|
2543 | |
2693 | tmp->more = NULL; |
2544 | tmp->more = 0; |
|
|
2545 | |
2694 | if (prev) |
2546 | if (prev) |
2695 | prev->more = tmp; |
2547 | prev->more = tmp; |
|
|
2548 | |
2696 | prev = tmp; |
2549 | prev = tmp; |
2697 | } |
2550 | } |
2698 | |
2551 | |
2699 | /*** copy inventory ***/ |
|
|
2700 | for (item = src->inv; item; item = item->below) |
2552 | for (item = src->inv; item; item = item->below) |
2701 | { |
|
|
2702 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2553 | insert_ob_in_ob (object_create_clone (item), dst); |
2703 | } |
|
|
2704 | |
2554 | |
2705 | return dst; |
2555 | return dst; |
2706 | } |
2556 | } |
2707 | |
2557 | |
2708 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2709 | int |
|
|
2710 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2711 | { |
|
|
2712 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2713 | * robust */ |
|
|
2714 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | /* GROS - Creates an object using a string representing its content. */ |
2558 | /* GROS - Creates an object using a string representing its content. */ |
2718 | |
|
|
2719 | /* Basically, we save the content of the string to a temp file, then call */ |
2559 | /* Basically, we save the content of the string to a temp file, then call */ |
2720 | |
|
|
2721 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2560 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2722 | |
|
|
2723 | /* but it was simple to make and allows reusing the load_object function. */ |
2561 | /* but it was simple to make and allows reusing the load_object function. */ |
2724 | |
|
|
2725 | /* Remember not to use load_object_str in a time-critical situation. */ |
2562 | /* Remember not to use load_object_str in a time-critical situation. */ |
2726 | |
|
|
2727 | /* Also remember that multiparts objects are not supported for now. */ |
2563 | /* Also remember that multiparts objects are not supported for now. */ |
2728 | |
2564 | |
2729 | object * |
2565 | object * |
2730 | load_object_str (const char *obstr) |
2566 | load_object_str (const char *obstr) |
2731 | { |
2567 | { |
2732 | object * |
2568 | object *op; |
2733 | op; |
|
|
2734 | char |
|
|
2735 | filename[MAX_BUF]; |
2569 | char filename[MAX_BUF]; |
2736 | |
2570 | |
2737 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2571 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2738 | |
2572 | |
2739 | FILE * |
|
|
2740 | tempfile = fopen (filename, "w"); |
2573 | FILE *tempfile = fopen (filename, "w"); |
2741 | |
2574 | |
2742 | if (tempfile == NULL) |
2575 | if (tempfile == NULL) |
2743 | { |
2576 | { |
2744 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2577 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2745 | return NULL; |
2578 | return NULL; |
2746 | }; |
2579 | } |
|
|
2580 | |
2747 | fprintf (tempfile, obstr); |
2581 | fprintf (tempfile, obstr); |
2748 | fclose (tempfile); |
2582 | fclose (tempfile); |
2749 | |
2583 | |
2750 | op = get_object (); |
2584 | op = object::create (); |
2751 | |
2585 | |
2752 | object_thawer |
2586 | object_thawer thawer (filename); |
2753 | thawer (filename); |
|
|
2754 | |
2587 | |
2755 | if (thawer) |
2588 | if (thawer) |
2756 | load_object (thawer, op, 0); |
2589 | load_object (thawer, op, 0); |
2757 | |
2590 | |
2758 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
2591 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
… | |
… | |
2766 | * returns NULL if no match. |
2599 | * returns NULL if no match. |
2767 | */ |
2600 | */ |
2768 | object * |
2601 | object * |
2769 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2602 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2770 | { |
2603 | { |
2771 | object * |
2604 | object *tmp; |
2772 | tmp; |
|
|
2773 | |
2605 | |
2774 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2606 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2775 | if (tmp->type == type && tmp->subtype == subtype) |
2607 | if (tmp->type == type && tmp->subtype == subtype) |
2776 | return tmp; |
2608 | return tmp; |
2777 | |
2609 | |
… | |
… | |
2785 | * do the desired thing. |
2617 | * do the desired thing. |
2786 | */ |
2618 | */ |
2787 | key_value * |
2619 | key_value * |
2788 | get_ob_key_link (const object *ob, const char *key) |
2620 | get_ob_key_link (const object *ob, const char *key) |
2789 | { |
2621 | { |
2790 | key_value * |
2622 | key_value *link; |
2791 | link; |
|
|
2792 | |
2623 | |
2793 | for (link = ob->key_values; link != NULL; link = link->next) |
2624 | for (link = ob->key_values; link != NULL; link = link->next) |
2794 | { |
|
|
2795 | if (link->key == key) |
2625 | if (link->key == key) |
2796 | { |
|
|
2797 | return link; |
2626 | return link; |
2798 | } |
|
|
2799 | } |
|
|
2800 | |
2627 | |
2801 | return NULL; |
2628 | return NULL; |
2802 | } |
2629 | } |
2803 | |
2630 | |
2804 | /* |
2631 | /* |
… | |
… | |
2809 | * The returned string is shared. |
2636 | * The returned string is shared. |
2810 | */ |
2637 | */ |
2811 | const char * |
2638 | const char * |
2812 | get_ob_key_value (const object *op, const char *const key) |
2639 | get_ob_key_value (const object *op, const char *const key) |
2813 | { |
2640 | { |
2814 | key_value * |
2641 | key_value *link; |
2815 | link; |
2642 | shstr_cmp canonical_key (key); |
2816 | const char * |
|
|
2817 | canonical_key; |
|
|
2818 | |
2643 | |
2819 | canonical_key = shstr::find (key); |
|
|
2820 | |
|
|
2821 | if (canonical_key == NULL) |
2644 | if (!canonical_key) |
2822 | { |
2645 | { |
2823 | /* 1. There being a field named key on any object |
2646 | /* 1. There being a field named key on any object |
2824 | * implies there'd be a shared string to find. |
2647 | * implies there'd be a shared string to find. |
2825 | * 2. Since there isn't, no object has this field. |
2648 | * 2. Since there isn't, no object has this field. |
2826 | * 3. Therefore, *this* object doesn't have this field. |
2649 | * 3. Therefore, *this* object doesn't have this field. |
2827 | */ |
2650 | */ |
2828 | return NULL; |
2651 | return 0; |
2829 | } |
2652 | } |
2830 | |
2653 | |
2831 | /* This is copied from get_ob_key_link() above - |
2654 | /* This is copied from get_ob_key_link() above - |
2832 | * only 4 lines, and saves the function call overhead. |
2655 | * only 4 lines, and saves the function call overhead. |
2833 | */ |
2656 | */ |
2834 | for (link = op->key_values; link != NULL; link = link->next) |
2657 | for (link = op->key_values; link; link = link->next) |
2835 | { |
|
|
2836 | if (link->key == canonical_key) |
2658 | if (link->key == canonical_key) |
2837 | { |
|
|
2838 | return link->value; |
2659 | return link->value; |
2839 | } |
2660 | |
2840 | } |
|
|
2841 | return NULL; |
2661 | return 0; |
2842 | } |
2662 | } |
2843 | |
2663 | |
2844 | |
2664 | |
2845 | /* |
2665 | /* |
2846 | * Updates the canonical_key in op to value. |
2666 | * Updates the canonical_key in op to value. |
… | |
… | |
2882 | if (last) |
2702 | if (last) |
2883 | last->next = field->next; |
2703 | last->next = field->next; |
2884 | else |
2704 | else |
2885 | op->key_values = field->next; |
2705 | op->key_values = field->next; |
2886 | |
2706 | |
2887 | delete |
|
|
2888 | field; |
2707 | delete field; |
2889 | } |
2708 | } |
2890 | } |
2709 | } |
2891 | return TRUE; |
2710 | return TRUE; |
2892 | } |
2711 | } |
2893 | /* IF we get here, key doesn't exist */ |
2712 | /* IF we get here, key doesn't exist */ |
… | |
… | |
2928 | * Returns TRUE on success. |
2747 | * Returns TRUE on success. |
2929 | */ |
2748 | */ |
2930 | int |
2749 | int |
2931 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
2750 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
2932 | { |
2751 | { |
2933 | shstr |
|
|
2934 | key_ (key); |
2752 | shstr key_ (key); |
2935 | |
2753 | |
2936 | return set_ob_key_value_s (op, key_, value, add_key); |
2754 | return set_ob_key_value_s (op, key_, value, add_key); |
2937 | } |
2755 | } |
|
|
2756 | |
|
|
2757 | object::depth_iterator::depth_iterator (object *container) |
|
|
2758 | : iterator_base (container) |
|
|
2759 | { |
|
|
2760 | while (item->inv) |
|
|
2761 | item = item->inv; |
|
|
2762 | } |
|
|
2763 | |
|
|
2764 | void |
|
|
2765 | object::depth_iterator::next () |
|
|
2766 | { |
|
|
2767 | if (item->below) |
|
|
2768 | { |
|
|
2769 | item = item->below; |
|
|
2770 | |
|
|
2771 | while (item->inv) |
|
|
2772 | item = item->inv; |
|
|
2773 | } |
|
|
2774 | else |
|
|
2775 | item = item->env; |
|
|
2776 | } |
|
|
2777 | |
|
|
2778 | // return a suitable string describing an objetc in enough detail to find it |
|
|
2779 | const char * |
|
|
2780 | object::debug_desc (char *info) const |
|
|
2781 | { |
|
|
2782 | char info2[256 * 3]; |
|
|
2783 | char *p = info; |
|
|
2784 | |
|
|
2785 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
|
|
2786 | count, |
|
|
2787 | &name, |
|
|
2788 | title ? " " : "", |
|
|
2789 | title ? (const char *)title : ""); |
|
|
2790 | |
|
|
2791 | if (env) |
|
|
2792 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
|
|
2793 | |
|
|
2794 | if (map) |
|
|
2795 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
|
|
2796 | |
|
|
2797 | return info; |
|
|
2798 | } |
|
|
2799 | |
|
|
2800 | const char * |
|
|
2801 | object::debug_desc () const |
|
|
2802 | { |
|
|
2803 | static char info[256 * 3]; |
|
|
2804 | return debug_desc (info); |
|
|
2805 | } |
|
|
2806 | |