1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
4 | |
3 | |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
17 | |
16 | |
18 | 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 |
19 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
20 | |
22 | 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> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
26 | variable. */ |
… | |
… | |
29 | #include <stdio.h> |
28 | #include <stdio.h> |
30 | #include <sys/types.h> |
29 | #include <sys/types.h> |
31 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
32 | #include <object.h> |
31 | #include <object.h> |
33 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
34 | #include <skills.h> |
|
|
35 | #include <loader.h> |
33 | #include <loader.h> |
36 | |
34 | |
|
|
35 | #include <bitset> |
|
|
36 | |
37 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
|
|
38 | static UUID uuid; |
|
|
39 | const uint64 UUID_SKIP = 1<<19; |
38 | |
40 | |
39 | object *objects; /* Pointer to the list of used objects */ |
|
|
40 | 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 */ |
41 | |
42 | |
42 | 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, |
43 | 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 |
44 | }; |
45 | }; |
… | |
… | |
51 | int freedir[SIZEOFFREE] = { |
52 | int freedir[SIZEOFFREE] = { |
52 | 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, |
53 | 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 |
54 | }; |
55 | }; |
55 | |
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 | |
56 | /* 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. */ |
57 | static int |
135 | static int |
58 | compare_ob_value_lists_one (const object *wants, const object *has) |
136 | compare_ob_value_lists_one (const object *wants, const object *has) |
59 | { |
137 | { |
60 | key_value *wants_field; |
138 | key_value *wants_field; |
… | |
… | |
107 | * |
185 | * |
108 | * 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 |
109 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
110 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
111 | * |
189 | * |
112 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
113 | * |
191 | * |
114 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
115 | * check weight |
193 | * check weight |
116 | */ |
194 | */ |
117 | |
195 | |
118 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
119 | { |
197 | { |
120 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
121 | 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) |
122 | return 0; |
204 | return 0; |
123 | |
205 | |
124 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
125 | return 0; |
|
|
126 | |
|
|
127 | /* 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 |
128 | * 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 |
129 | * used to store nrof). |
209 | * used to store nrof). |
130 | */ |
210 | */ |
131 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
141 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
142 | |
222 | |
143 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
144 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
145 | |
225 | |
146 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
147 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
148 | * being locked in inventory should prevent merging. |
|
|
149 | * 0x4 in flags3 is CLIENT_SENT |
|
|
150 | */ |
|
|
151 | if ((ob1->arch != ob2->arch) || |
|
|
152 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
153 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
154 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
155 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
156 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
157 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
158 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
159 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
160 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
161 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
162 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
163 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
164 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
165 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
166 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
167 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
168 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
169 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
170 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
171 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
172 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
173 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
174 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
175 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
176 | (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) |
177 | return 0; |
251 | return 0; |
178 | |
252 | |
179 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
180 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
181 | */ |
255 | */ |
… | |
… | |
184 | /* 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 */ |
185 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
186 | return 0; |
260 | return 0; |
187 | |
261 | |
188 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
189 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
190 | return 0; |
264 | return 0; |
191 | |
265 | |
192 | /* 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 |
193 | * if it is valid. |
267 | * if it is valid. |
194 | */ |
268 | */ |
… | |
… | |
255 | { |
329 | { |
256 | if (inv->inv) |
330 | if (inv->inv) |
257 | sum_weight (inv); |
331 | sum_weight (inv); |
258 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
332 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
259 | } |
333 | } |
|
|
334 | |
260 | if (op->type == CONTAINER && op->stats.Str) |
335 | if (op->type == CONTAINER && op->stats.Str) |
261 | sum = (sum * (100 - op->stats.Str)) / 100; |
336 | sum = (sum * (100 - op->stats.Str)) / 100; |
|
|
337 | |
262 | if (op->carrying != sum) |
338 | if (op->carrying != sum) |
263 | op->carrying = sum; |
339 | op->carrying = sum; |
|
|
340 | |
264 | return sum; |
341 | return sum; |
265 | } |
342 | } |
266 | |
343 | |
267 | /** |
344 | /** |
268 | * Return the outermost environment object for a given object. |
345 | * Return the outermost environment object for a given object. |
… | |
… | |
295 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
372 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
296 | * Some error messages. |
373 | * Some error messages. |
297 | * 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. |
298 | */ |
375 | */ |
299 | |
376 | |
300 | void |
377 | char * |
301 | dump_object2 (object *op) |
|
|
302 | { |
|
|
303 | errmsg[0] = 0; |
|
|
304 | return; |
|
|
305 | //TODO//D#d# |
|
|
306 | #if 0 |
|
|
307 | char *cp; |
|
|
308 | |
|
|
309 | /* object *tmp;*/ |
|
|
310 | |
|
|
311 | if (op->arch != NULL) |
|
|
312 | { |
|
|
313 | strcat (errmsg, "arch "); |
|
|
314 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
315 | strcat (errmsg, "\n"); |
|
|
316 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
317 | strcat (errmsg, cp); |
|
|
318 | # if 0 |
|
|
319 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
320 | * will overflow the buffer. |
|
|
321 | * Changed so that we don't dump inventory either. This may |
|
|
322 | * also overflow the buffer. |
|
|
323 | */ |
|
|
324 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
325 | strcat (errmsg, cp); |
|
|
326 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
327 | dump_object2 (tmp); |
|
|
328 | # endif |
|
|
329 | strcat (errmsg, "end\n"); |
|
|
330 | } |
|
|
331 | else |
|
|
332 | { |
|
|
333 | strcat (errmsg, "Object "); |
|
|
334 | if (op->name == NULL) |
|
|
335 | strcat (errmsg, "(null)"); |
|
|
336 | else |
|
|
337 | strcat (errmsg, op->name); |
|
|
338 | strcat (errmsg, "\n"); |
|
|
339 | # if 0 |
|
|
340 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
341 | strcat (errmsg, cp); |
|
|
342 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
343 | dump_object2 (tmp); |
|
|
344 | # endif |
|
|
345 | strcat (errmsg, "end\n"); |
|
|
346 | } |
|
|
347 | #endif |
|
|
348 | } |
|
|
349 | |
|
|
350 | /* |
|
|
351 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
352 | */ |
|
|
353 | |
|
|
354 | void |
|
|
355 | dump_object (object *op) |
378 | dump_object (object *op) |
356 | { |
379 | { |
357 | if (op == NULL) |
380 | if (!op) |
358 | { |
381 | return strdup ("[NULLOBJ]"); |
359 | strcpy (errmsg, "[NULL pointer]"); |
|
|
360 | return; |
|
|
361 | } |
|
|
362 | errmsg[0] = '\0'; |
|
|
363 | dump_object2 (op); |
|
|
364 | } |
|
|
365 | |
382 | |
366 | void |
383 | object_freezer freezer; |
367 | dump_all_objects (void) |
384 | save_object (freezer, op, 3); |
368 | { |
385 | return freezer.as_string (); |
369 | object *op; |
|
|
370 | |
|
|
371 | for (op = objects; op != NULL; op = op->next) |
|
|
372 | { |
|
|
373 | dump_object (op); |
|
|
374 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
375 | } |
|
|
376 | } |
386 | } |
377 | |
387 | |
378 | /* |
388 | /* |
379 | * 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 |
380 | * multi-object 1 which is closest to the second object. |
390 | * multi-object 1 which is closest to the second object. |
… | |
… | |
400 | */ |
410 | */ |
401 | |
411 | |
402 | object * |
412 | object * |
403 | find_object (tag_t i) |
413 | find_object (tag_t i) |
404 | { |
414 | { |
405 | object *op; |
415 | for (object *op = object::first; op; op = op->next) |
406 | |
|
|
407 | for (op = objects; op != NULL; op = op->next) |
|
|
408 | if (op->count == i) |
416 | if (op->count == i) |
409 | break; |
417 | return op; |
|
|
418 | |
410 | return op; |
419 | return 0; |
411 | } |
420 | } |
412 | |
421 | |
413 | /* |
422 | /* |
414 | * 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. |
415 | * Used only by the patch command, but not all that useful. |
424 | * Used only by the patch command, but not all that useful. |
… | |
… | |
417 | */ |
426 | */ |
418 | |
427 | |
419 | object * |
428 | object * |
420 | find_object_name (const char *str) |
429 | find_object_name (const char *str) |
421 | { |
430 | { |
422 | const char *name = shstr::find (str); |
431 | shstr_cmp str_ (str); |
423 | object *op; |
432 | object *op; |
424 | |
433 | |
425 | for (op = objects; op != NULL; op = op->next) |
434 | for (op = object::first; op != NULL; op = op->next) |
426 | if (&op->name == name) |
435 | if (op->name == str_) |
427 | break; |
436 | break; |
428 | |
437 | |
429 | return op; |
438 | return op; |
430 | } |
439 | } |
431 | |
440 | |
432 | void |
441 | void |
433 | free_all_object_data () |
442 | free_all_object_data () |
434 | { |
443 | { |
435 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
444 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
436 | } |
|
|
437 | |
|
|
438 | /* |
|
|
439 | * Returns the object which this object marks as being the owner. |
|
|
440 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
441 | * freed and are now reused. If this is detected, the owner is |
|
|
442 | * set to NULL, and NULL is returned. |
|
|
443 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
444 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
445 | * anything, so check removed flag. I don't expect that this should break |
|
|
446 | * anything - once an object is removed, it is basically dead anyways. |
|
|
447 | */ |
|
|
448 | object * |
|
|
449 | object::get_owner () |
|
|
450 | { |
|
|
451 | if (!owner |
|
|
452 | || QUERY_FLAG (owner, FLAG_FREED) |
|
|
453 | || QUERY_FLAG (owner, FLAG_REMOVED)) |
|
|
454 | owner = 0; |
|
|
455 | |
|
|
456 | return owner; |
|
|
457 | } |
445 | } |
458 | |
446 | |
459 | /* |
447 | /* |
460 | * 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 |
461 | * skill and experience objects. |
449 | * skill and experience objects. |
… | |
… | |
531 | |
519 | |
532 | /* What is not cleared is next, prev, and count */ |
520 | /* What is not cleared is next, prev, and count */ |
533 | |
521 | |
534 | expmul = 1.0; |
522 | expmul = 1.0; |
535 | face = blank_face; |
523 | face = blank_face; |
536 | attacked_by_count = -1; |
|
|
537 | |
524 | |
538 | if (settings.casting_time) |
525 | if (settings.casting_time) |
539 | casting_time = -1; |
526 | casting_time = -1; |
540 | } |
527 | } |
541 | |
528 | |
542 | void object::clone (object *destination) |
|
|
543 | { |
|
|
544 | *(object_copy *)destination = *this; |
|
|
545 | *(object_pod *)destination = *this; |
|
|
546 | |
|
|
547 | if (self || cb) |
|
|
548 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
549 | } |
|
|
550 | |
|
|
551 | /* |
529 | /* |
552 | * copy object first frees everything allocated by the second object, |
530 | * copy_to first frees everything allocated by the dst object, |
553 | * and then copies the contends of the first object into the second |
531 | * and then copies the contents of itself into the second |
554 | * object, allocating what needs to be allocated. Basically, any |
532 | * object, allocating what needs to be allocated. Basically, any |
555 | * 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, |
556 | * 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 |
557 | * will point at garbage. |
535 | * will point at garbage. |
558 | */ |
536 | */ |
559 | void |
537 | void |
560 | copy_object (object *op2, object *op) |
538 | object::copy_to (object *dst) |
561 | { |
539 | { |
562 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
540 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
563 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
541 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
564 | |
542 | |
565 | 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)); |
566 | |
548 | |
567 | if (is_freed) |
549 | if (is_freed) |
568 | SET_FLAG (op, FLAG_FREED); |
550 | SET_FLAG (dst, FLAG_FREED); |
|
|
551 | |
569 | if (is_removed) |
552 | if (is_removed) |
570 | SET_FLAG (op, FLAG_REMOVED); |
553 | SET_FLAG (dst, FLAG_REMOVED); |
571 | |
554 | |
572 | if (op2->speed < 0) |
555 | if (speed < 0) |
573 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
556 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
574 | |
557 | |
575 | /* Copy over key_values, if any. */ |
558 | /* Copy over key_values, if any. */ |
576 | if (op2->key_values) |
559 | if (key_values) |
577 | { |
560 | { |
578 | key_value *tail = 0; |
561 | key_value *tail = 0; |
579 | key_value *i; |
562 | key_value *i; |
580 | |
563 | |
581 | op->key_values = 0; |
564 | dst->key_values = 0; |
582 | |
565 | |
583 | for (i = op2->key_values; i; i = i->next) |
566 | for (i = key_values; i; i = i->next) |
584 | { |
567 | { |
585 | key_value *new_link = new key_value; |
568 | key_value *new_link = new key_value; |
586 | |
569 | |
587 | new_link->next = 0; |
570 | new_link->next = 0; |
588 | new_link->key = i->key; |
571 | new_link->key = i->key; |
589 | new_link->value = i->value; |
572 | new_link->value = i->value; |
590 | |
573 | |
591 | /* Try and be clever here, too. */ |
574 | /* Try and be clever here, too. */ |
592 | if (!op->key_values) |
575 | if (!dst->key_values) |
593 | { |
576 | { |
594 | op->key_values = new_link; |
577 | dst->key_values = new_link; |
595 | tail = new_link; |
578 | tail = new_link; |
596 | } |
579 | } |
597 | else |
580 | else |
598 | { |
581 | { |
599 | tail->next = new_link; |
582 | tail->next = new_link; |
600 | tail = new_link; |
583 | tail = new_link; |
601 | } |
584 | } |
602 | } |
585 | } |
603 | } |
586 | } |
604 | |
587 | |
605 | 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; |
606 | } |
597 | } |
607 | |
598 | |
608 | /* |
599 | /* |
609 | * 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 |
610 | * 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 |
… | |
… | |
815 | update_now = 1; |
806 | update_now = 1; |
816 | |
807 | |
817 | if ((move_slow | op->move_slow) != move_slow) |
808 | if ((move_slow | op->move_slow) != move_slow) |
818 | update_now = 1; |
809 | update_now = 1; |
819 | } |
810 | } |
|
|
811 | |
820 | /* if the object is being removed, we can't make intelligent |
812 | /* if the object is being removed, we can't make intelligent |
821 | * decisions, because remove_ob can't really pass the object |
813 | * decisions, because remove_ob can't really pass the object |
822 | * that is being removed. |
814 | * that is being removed. |
823 | */ |
815 | */ |
824 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
816 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
836 | |
828 | |
837 | if (op->more != NULL) |
829 | if (op->more != NULL) |
838 | update_object (op->more, action); |
830 | update_object (op->more, action); |
839 | } |
831 | } |
840 | |
832 | |
841 | static unordered_vector<object *> mortals; |
833 | object::vector object::mortals; |
842 | static std::vector<object *> freed; |
834 | object::vector object::objects; // not yet used |
|
|
835 | object *object::first; |
843 | |
836 | |
844 | void object::free_mortals () |
837 | void object::free_mortals () |
845 | { |
838 | { |
846 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
839 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
847 | if ((*i)->refcnt) |
840 | if ((*i)->refcnt) |
848 | ++i; // further delay freeing |
841 | ++i; // further delay freeing |
849 | else |
842 | else |
850 | { |
843 | { |
851 | freed.push_back (*i);//D |
|
|
852 | //delete *i; |
844 | delete *i; |
853 | mortals.erase (i); |
845 | mortals.erase (i); |
854 | } |
846 | } |
855 | |
|
|
856 | if (mortals.size())//D |
|
|
857 | LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D |
|
|
858 | } |
847 | } |
859 | |
848 | |
860 | object::object () |
849 | object::object () |
861 | { |
850 | { |
862 | SET_FLAG (this, FLAG_REMOVED); |
851 | SET_FLAG (this, FLAG_REMOVED); |
863 | |
852 | |
864 | expmul = 1.0; |
853 | expmul = 1.0; |
865 | face = blank_face; |
854 | face = blank_face; |
866 | attacked_by_count = -1; |
|
|
867 | } |
855 | } |
868 | |
856 | |
869 | object::~object () |
857 | object::~object () |
870 | { |
858 | { |
871 | free_key_values (this); |
859 | free_key_values (this); |
872 | } |
860 | } |
873 | |
861 | |
874 | void object::link () |
862 | void object::link () |
875 | { |
863 | { |
876 | count = ++ob_count; |
864 | count = ++ob_count; |
|
|
865 | uuid = gen_uuid (); |
877 | |
866 | |
878 | prev = 0; |
867 | prev = 0; |
879 | next = objects; |
868 | next = object::first; |
880 | |
869 | |
881 | if (objects) |
870 | if (object::first) |
882 | objects->prev = this; |
871 | object::first->prev = this; |
883 | |
872 | |
884 | objects = this; |
873 | object::first = this; |
885 | } |
874 | } |
886 | |
875 | |
887 | void object::unlink () |
876 | void object::unlink () |
888 | { |
877 | { |
889 | count = 0; |
878 | if (this == object::first) |
|
|
879 | object::first = next; |
890 | |
880 | |
891 | /* Remove this object from the list of used objects */ |
881 | /* Remove this object from the list of used objects */ |
892 | if (prev) |
|
|
893 | { |
|
|
894 | prev->next = next; |
882 | if (prev) prev->next = next; |
|
|
883 | if (next) next->prev = prev; |
|
|
884 | |
895 | prev = 0; |
885 | prev = 0; |
896 | } |
|
|
897 | |
|
|
898 | if (next) |
|
|
899 | { |
|
|
900 | next->prev = prev; |
|
|
901 | next = 0; |
886 | next = 0; |
902 | } |
|
|
903 | |
|
|
904 | if (this == objects) |
|
|
905 | objects = next; |
|
|
906 | } |
887 | } |
907 | |
888 | |
908 | object *object::create () |
889 | object *object::create () |
909 | { |
890 | { |
910 | object *op; |
|
|
911 | |
|
|
912 | if (freed.empty ()) |
|
|
913 | op = new object; |
891 | object *op = new object; |
914 | else |
|
|
915 | { |
|
|
916 | // highly annoying, but the only way to get it stable right now |
|
|
917 | op = freed.back (); |
|
|
918 | freed.pop_back (); |
|
|
919 | op->~object (); |
|
|
920 | new ((void *) op) object; |
|
|
921 | } |
|
|
922 | |
|
|
923 | op->link (); |
892 | op->link (); |
924 | return op; |
893 | return op; |
925 | } |
894 | } |
926 | |
895 | |
927 | /* |
896 | /* |
… | |
… | |
929 | * 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 |
930 | * free objects. The IS_FREED() flag is set in the object. |
899 | * free objects. The IS_FREED() flag is set in the object. |
931 | * The object must have been removed by remove_ob() first for |
900 | * The object must have been removed by remove_ob() first for |
932 | * this function to succeed. |
901 | * this function to succeed. |
933 | * |
902 | * |
934 | * 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 |
935 | * inventory to the ground. |
904 | * inventory to the ground. |
936 | */ |
905 | */ |
937 | void object::free (bool free_inventory) |
906 | void object::destroy (bool destroy_inventory) |
938 | { |
907 | { |
939 | if (QUERY_FLAG (this, FLAG_FREED)) |
908 | if (QUERY_FLAG (this, FLAG_FREED)) |
940 | return; |
909 | return; |
941 | |
910 | |
942 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
911 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
943 | remove_friendly_object (this); |
912 | remove_friendly_object (this); |
944 | |
913 | |
945 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
914 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
946 | remove_ob (this); |
915 | remove (); |
947 | |
916 | |
948 | SET_FLAG (this, FLAG_FREED); |
917 | SET_FLAG (this, FLAG_FREED); |
949 | |
918 | |
950 | if (more) |
919 | if (more) |
951 | { |
920 | { |
952 | more->free (free_inventory); |
921 | more->destroy (destroy_inventory); |
953 | more = 0; |
922 | more = 0; |
954 | } |
923 | } |
955 | |
924 | |
956 | if (inv) |
925 | if (inv) |
957 | { |
926 | { |
958 | /* Only if the space blocks everything do we not process - |
927 | /* Only if the space blocks everything do we not process - |
959 | * if some form of movement is allowed, let objects |
928 | * if some form of movement is allowed, let objects |
960 | * drop on that space. |
929 | * drop on that space. |
961 | */ |
930 | */ |
962 | 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) |
963 | { |
932 | { |
964 | object *op = inv; |
933 | object *op = inv; |
965 | |
934 | |
966 | while (op) |
935 | while (op) |
967 | { |
936 | { |
968 | object *tmp = op->below; |
937 | object *tmp = op->below; |
969 | op->free (free_inventory); |
938 | op->destroy (destroy_inventory); |
970 | op = tmp; |
939 | op = tmp; |
971 | } |
940 | } |
972 | } |
941 | } |
973 | else |
942 | else |
974 | { /* Put objects in inventory onto this space */ |
943 | { /* Put objects in inventory onto this space */ |
… | |
… | |
976 | |
945 | |
977 | while (op) |
946 | while (op) |
978 | { |
947 | { |
979 | object *tmp = op->below; |
948 | object *tmp = op->below; |
980 | |
949 | |
981 | remove_ob (op); |
950 | op->remove (); |
982 | |
951 | |
983 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
952 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
984 | || 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)) |
985 | free_object (op); |
954 | op->destroy (); |
986 | else |
955 | else |
987 | { |
956 | { |
988 | op->x = x; |
957 | op->x = x; |
989 | op->y = y; |
958 | op->y = y; |
990 | 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 */ |
… | |
… | |
993 | op = tmp; |
962 | op = tmp; |
994 | } |
963 | } |
995 | } |
964 | } |
996 | } |
965 | } |
997 | |
966 | |
|
|
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 |
998 | owner = 0; |
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; |
999 | |
994 | |
1000 | /* Remove object from the active list */ |
995 | /* Remove object from the active list */ |
1001 | speed = 0; |
996 | speed = 0; |
1002 | update_ob_speed (this); |
997 | update_ob_speed (this); |
1003 | |
998 | |
… | |
… | |
1008 | |
1003 | |
1009 | /* |
1004 | /* |
1010 | * sub_weight() recursively (outwards) subtracts a number from the |
1005 | * sub_weight() recursively (outwards) subtracts a number from the |
1011 | * 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)). |
1012 | */ |
1007 | */ |
1013 | |
|
|
1014 | void |
1008 | void |
1015 | sub_weight (object *op, signed long weight) |
1009 | sub_weight (object *op, signed long weight) |
1016 | { |
1010 | { |
1017 | while (op != NULL) |
1011 | while (op != NULL) |
1018 | { |
1012 | { |
1019 | if (op->type == CONTAINER) |
1013 | if (op->type == CONTAINER) |
1020 | { |
|
|
1021 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1014 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1022 | } |
1015 | |
1023 | op->carrying -= weight; |
1016 | op->carrying -= weight; |
1024 | op = op->env; |
1017 | op = op->env; |
1025 | } |
1018 | } |
1026 | } |
1019 | } |
1027 | |
1020 | |
1028 | /* remove_ob(op): |
1021 | /* op->remove (): |
1029 | * 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 |
1030 | * 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 |
1031 | * object will have no environment. If the object previously had an |
1024 | * object will have no environment. If the object previously had an |
1032 | * environment, the x and y coordinates will be updated to |
1025 | * environment, the x and y coordinates will be updated to |
1033 | * the previous environment. |
1026 | * the previous environment. |
1034 | * Beware: This function is called from the editor as well! |
1027 | * Beware: This function is called from the editor as well! |
1035 | */ |
1028 | */ |
1036 | |
|
|
1037 | void |
1029 | void |
1038 | remove_ob (object *op) |
1030 | object::remove () |
1039 | { |
1031 | { |
|
|
1032 | object *tmp, *last = 0; |
1040 | object * |
1033 | object *otmp; |
1041 | tmp, * |
|
|
1042 | last = NULL; |
|
|
1043 | object * |
|
|
1044 | otmp; |
|
|
1045 | |
1034 | |
1046 | tag_t |
|
|
1047 | tag; |
|
|
1048 | int |
|
|
1049 | check_walk_off; |
1035 | int check_walk_off; |
1050 | mapstruct * |
|
|
1051 | m; |
|
|
1052 | |
1036 | |
1053 | sint16 |
|
|
1054 | x, |
|
|
1055 | y; |
|
|
1056 | |
|
|
1057 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1037 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1058 | return; |
1038 | return; |
1059 | |
1039 | |
1060 | SET_FLAG (op, FLAG_REMOVED); |
1040 | SET_FLAG (this, FLAG_REMOVED); |
1061 | |
1041 | |
1062 | if (op->more != NULL) |
1042 | if (more) |
1063 | remove_ob (op->more); |
1043 | more->remove (); |
1064 | |
1044 | |
1065 | /* |
1045 | /* |
1066 | * In this case, the object to be removed is in someones |
1046 | * In this case, the object to be removed is in someones |
1067 | * inventory. |
1047 | * inventory. |
1068 | */ |
1048 | */ |
1069 | if (op->env != NULL) |
1049 | if (env) |
1070 | { |
1050 | { |
1071 | if (op->nrof) |
1051 | if (nrof) |
1072 | sub_weight (op->env, op->weight * op->nrof); |
1052 | sub_weight (env, weight * nrof); |
1073 | else |
1053 | else |
1074 | sub_weight (op->env, op->weight + op->carrying); |
1054 | sub_weight (env, weight + carrying); |
1075 | |
1055 | |
1076 | /* 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 |
1077 | * made to players inventory. If set, avoiding the call |
1057 | * made to players inventory. If set, avoiding the call |
1078 | * to save cpu time. |
1058 | * to save cpu time. |
1079 | */ |
1059 | */ |
1080 | 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)) |
1081 | fix_player (otmp); |
1061 | fix_player (otmp); |
1082 | |
1062 | |
1083 | if (op->above != NULL) |
1063 | if (above != NULL) |
1084 | op->above->below = op->below; |
1064 | above->below = below; |
1085 | else |
1065 | else |
1086 | op->env->inv = op->below; |
1066 | env->inv = below; |
1087 | |
1067 | |
1088 | if (op->below != NULL) |
1068 | if (below != NULL) |
1089 | op->below->above = op->above; |
1069 | below->above = above; |
1090 | |
1070 | |
1091 | /* we set up values so that it could be inserted into |
1071 | /* we set up values so that it could be inserted into |
1092 | * 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 |
1093 | * to the caller to decide what we want to do. |
1073 | * to the caller to decide what we want to do. |
1094 | */ |
1074 | */ |
1095 | op->x = op->env->x, op->y = op->env->y; |
1075 | x = env->x, y = env->y; |
1096 | op->map = op->env->map; |
1076 | map = env->map; |
1097 | op->above = NULL, op->below = NULL; |
1077 | above = 0, below = 0; |
1098 | op->env = NULL; |
1078 | env = 0; |
1099 | } |
1079 | } |
1100 | else if (op->map) |
1080 | else if (map) |
1101 | { |
1081 | { |
1102 | x = op->x; |
|
|
1103 | y = op->y; |
|
|
1104 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1105 | |
|
|
1106 | if (!m) |
|
|
1107 | { |
|
|
1108 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1109 | op->map->path, op->x, op->y); |
|
|
1110 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1111 | * it seems if we get into this case, something is probablye |
|
|
1112 | * screwed up and should be fixed. |
|
|
1113 | */ |
|
|
1114 | abort (); |
|
|
1115 | } |
|
|
1116 | |
|
|
1117 | if (op->map != m) |
|
|
1118 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1119 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1120 | |
|
|
1121 | /* Re did the following section of code - it looks like it had |
1082 | /* Re did the following section of code - it looks like it had |
1122 | * lots of logic for things we no longer care about |
1083 | * lots of logic for things we no longer care about |
1123 | */ |
1084 | */ |
1124 | |
1085 | |
1125 | /* link the object above us */ |
1086 | /* link the object above us */ |
1126 | if (op->above) |
1087 | if (above) |
1127 | op->above->below = op->below; |
1088 | above->below = below; |
1128 | else |
1089 | else |
1129 | 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 */ |
1130 | |
1091 | |
1131 | /* Relink the object below us, if there is one */ |
1092 | /* Relink the object below us, if there is one */ |
1132 | if (op->below) |
1093 | if (below) |
1133 | op->below->above = op->above; |
1094 | below->above = above; |
1134 | else |
1095 | else |
1135 | { |
1096 | { |
1136 | /* 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 |
1137 | * use translated coordinates in case some oddness with map tiling is |
1098 | * use translated coordinates in case some oddness with map tiling is |
1138 | * evident |
1099 | * evident |
1139 | */ |
1100 | */ |
1140 | if (GET_MAP_OB (m, x, y) != op) |
1101 | if (GET_MAP_OB (map, x, y) != this) |
1141 | { |
1102 | { |
1142 | dump_object (op); |
1103 | char *dump = dump_object (this); |
1143 | LOG (llevError, |
1104 | LOG (llevError, |
1144 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
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); |
1145 | dump_object (GET_MAP_OB (m, x, y)); |
1107 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1146 | LOG (llevError, "%s\n", errmsg); |
1108 | LOG (llevError, "%s\n", dump); |
|
|
1109 | free (dump); |
1147 | } |
1110 | } |
1148 | |
1111 | |
1149 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1112 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1150 | } |
1113 | } |
1151 | |
1114 | |
1152 | op->above = 0; |
1115 | above = 0; |
1153 | op->below = 0; |
1116 | below = 0; |
1154 | |
1117 | |
1155 | if (op->map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1156 | return; |
1119 | return; |
1157 | |
1120 | |
1158 | tag = op->count; |
|
|
1159 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1121 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1160 | |
1122 | |
1161 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1123 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1162 | { |
1124 | { |
1163 | /* No point updating the players look faces if he is the object |
1125 | /* No point updating the players look faces if he is the object |
1164 | * being removed. |
1126 | * being removed. |
1165 | */ |
1127 | */ |
1166 | |
1128 | |
1167 | if (tmp->type == PLAYER && tmp != op) |
1129 | if (tmp->type == PLAYER && tmp != this) |
1168 | { |
1130 | { |
1169 | /* If a container that the player is currently using somehow gets |
1131 | /* If a container that the player is currently using somehow gets |
1170 | * removed (most likely destroyed), update the player view |
1132 | * removed (most likely destroyed), update the player view |
1171 | * appropriately. |
1133 | * appropriately. |
1172 | */ |
1134 | */ |
1173 | if (tmp->container == op) |
1135 | if (tmp->container == this) |
1174 | { |
1136 | { |
1175 | CLEAR_FLAG (op, FLAG_APPLIED); |
1137 | CLEAR_FLAG (this, FLAG_APPLIED); |
1176 | tmp->container = NULL; |
1138 | tmp->container = 0; |
1177 | } |
1139 | } |
1178 | |
1140 | |
1179 | tmp->contr->socket.update_look = 1; |
1141 | tmp->contr->socket->floorbox_update (); |
1180 | } |
1142 | } |
1181 | |
1143 | |
1182 | /* See if player moving off should effect something */ |
1144 | /* See if player moving off should effect something */ |
1183 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1145 | if (check_walk_off |
|
|
1146 | && ((move_type & tmp->move_off) |
|
|
1147 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1184 | { |
1148 | { |
1185 | move_apply (tmp, op, NULL); |
1149 | move_apply (tmp, this, 0); |
1186 | |
1150 | |
1187 | if (was_destroyed (op, tag)) |
1151 | if (destroyed ()) |
1188 | { |
|
|
1189 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1152 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1190 | } |
|
|
1191 | } |
1153 | } |
1192 | |
1154 | |
1193 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1155 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1194 | |
1156 | |
1195 | if (tmp->above == tmp) |
1157 | if (tmp->above == tmp) |
1196 | tmp->above = NULL; |
1158 | tmp->above = 0; |
1197 | |
1159 | |
1198 | last = tmp; |
1160 | last = tmp; |
1199 | } |
1161 | } |
1200 | |
1162 | |
1201 | /* last == NULL of there are no objects on this space */ |
1163 | /* last == NULL of there are no objects on this space */ |
1202 | if (last == NULL) |
1164 | if (!last) |
1203 | { |
1165 | { |
1204 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1166 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1205 | * 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 |
1206 | * 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 |
1207 | * be correct anyways. |
1169 | * be correct anyways. |
1208 | */ |
1170 | */ |
1209 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1171 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1210 | update_position (op->map, op->x, op->y); |
1172 | update_position (map, x, y); |
1211 | } |
1173 | } |
1212 | else |
1174 | else |
1213 | update_object (last, UP_OBJ_REMOVE); |
1175 | update_object (last, UP_OBJ_REMOVE); |
1214 | |
1176 | |
1215 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1177 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1216 | update_all_los (op->map, op->x, op->y); |
1178 | update_all_los (map, x, y); |
1217 | } |
1179 | } |
1218 | } |
1180 | } |
1219 | |
1181 | |
1220 | /* |
1182 | /* |
1221 | * merge_ob(op,top): |
1183 | * merge_ob(op,top): |
… | |
… | |
1223 | * This function goes through all objects below and including top, and |
1185 | * This function goes through all objects below and including top, and |
1224 | * merges op to the first matching object. |
1186 | * merges op to the first matching object. |
1225 | * If top is NULL, it is calculated. |
1187 | * If top is NULL, it is calculated. |
1226 | * 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 |
1227 | */ |
1189 | */ |
1228 | |
|
|
1229 | object * |
1190 | object * |
1230 | merge_ob (object *op, object *top) |
1191 | merge_ob (object *op, object *top) |
1231 | { |
1192 | { |
1232 | if (!op->nrof) |
1193 | if (!op->nrof) |
1233 | return 0; |
1194 | return 0; |
… | |
… | |
1237 | |
1198 | |
1238 | for (; top != NULL; top = top->below) |
1199 | for (; top != NULL; top = top->below) |
1239 | { |
1200 | { |
1240 | if (top == op) |
1201 | if (top == op) |
1241 | continue; |
1202 | continue; |
1242 | if (CAN_MERGE (op, top)) |
1203 | |
|
|
1204 | if (object::can_merge (op, top)) |
1243 | { |
1205 | { |
1244 | top->nrof += op->nrof; |
1206 | top->nrof += op->nrof; |
1245 | |
1207 | |
1246 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1208 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1247 | op->weight = 0; /* Don't want any adjustements now */ |
1209 | op->weight = 0; /* Don't want any adjustements now */ |
1248 | remove_ob (op); |
1210 | op->destroy (); |
1249 | free_object (op); |
|
|
1250 | return top; |
1211 | return top; |
1251 | } |
1212 | } |
1252 | } |
1213 | } |
1253 | |
1214 | |
1254 | return NULL; |
1215 | return 0; |
1255 | } |
1216 | } |
1256 | |
1217 | |
1257 | /* |
1218 | /* |
1258 | * 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 |
1259 | * job preparing multi-part monsters |
1220 | * job preparing multi-part monsters |
1260 | */ |
1221 | */ |
1261 | object * |
1222 | object * |
1262 | 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) |
1263 | { |
1224 | { |
1264 | object *tmp; |
1225 | object *tmp; |
1265 | |
1226 | |
1266 | if (op->head) |
1227 | if (op->head) |
1267 | op = op->head; |
1228 | op = op->head; |
… | |
… | |
1295 | * NULL if 'op' was destroyed |
1256 | * NULL if 'op' was destroyed |
1296 | * just 'op' otherwise |
1257 | * just 'op' otherwise |
1297 | */ |
1258 | */ |
1298 | |
1259 | |
1299 | object * |
1260 | object * |
1300 | 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) |
1301 | { |
1262 | { |
1302 | object *tmp, *top, *floor = NULL; |
1263 | object *tmp, *top, *floor = NULL; |
1303 | sint16 x, y; |
1264 | sint16 x, y; |
1304 | |
1265 | |
1305 | if (QUERY_FLAG (op, FLAG_FREED)) |
1266 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1308 | return NULL; |
1269 | return NULL; |
1309 | } |
1270 | } |
1310 | |
1271 | |
1311 | if (m == NULL) |
1272 | if (m == NULL) |
1312 | { |
1273 | { |
1313 | dump_object (op); |
1274 | char *dump = dump_object (op); |
1314 | 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); |
1315 | return op; |
1277 | return op; |
1316 | } |
1278 | } |
1317 | |
1279 | |
1318 | if (out_of_map (m, op->x, op->y)) |
1280 | if (out_of_map (m, op->x, op->y)) |
1319 | { |
1281 | { |
1320 | dump_object (op); |
1282 | char *dump = dump_object (op); |
1321 | 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); |
1322 | #ifdef MANY_CORES |
1284 | #ifdef MANY_CORES |
1323 | /* 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 |
1324 | * 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 |
1325 | * improperly inserted. |
1287 | * improperly inserted. |
1326 | */ |
1288 | */ |
1327 | abort (); |
1289 | abort (); |
1328 | #endif |
1290 | #endif |
|
|
1291 | free (dump); |
1329 | return op; |
1292 | return op; |
1330 | } |
1293 | } |
1331 | |
1294 | |
1332 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1295 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1333 | { |
1296 | { |
1334 | dump_object (op); |
1297 | char *dump = dump_object (op); |
1335 | 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); |
1336 | return op; |
1300 | return op; |
1337 | } |
1301 | } |
1338 | |
1302 | |
1339 | if (op->more != NULL) |
1303 | if (op->more != NULL) |
1340 | { |
1304 | { |
… | |
… | |
1378 | |
1342 | |
1379 | /* this has to be done after we translate the coordinates. |
1343 | /* this has to be done after we translate the coordinates. |
1380 | */ |
1344 | */ |
1381 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1345 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1382 | 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) |
1383 | if (CAN_MERGE (op, tmp)) |
1347 | if (object::can_merge (op, tmp)) |
1384 | { |
1348 | { |
1385 | op->nrof += tmp->nrof; |
1349 | op->nrof += tmp->nrof; |
1386 | remove_ob (tmp); |
1350 | tmp->destroy (); |
1387 | free_object (tmp); |
|
|
1388 | } |
1351 | } |
1389 | |
1352 | |
1390 | 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 */ |
1391 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1392 | |
1355 | |
… | |
… | |
1520 | * it, so save a few ticks and start from there. |
1483 | * it, so save a few ticks and start from there. |
1521 | */ |
1484 | */ |
1522 | if (!(flag & INS_MAP_LOAD)) |
1485 | if (!(flag & INS_MAP_LOAD)) |
1523 | 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) |
1524 | if (tmp->type == PLAYER) |
1487 | if (tmp->type == PLAYER) |
1525 | tmp->contr->socket.update_look = 1; |
1488 | tmp->contr->socket->floorbox_update (); |
1526 | |
1489 | |
1527 | /* If this object glows, it may affect lighting conditions that are |
1490 | /* If this object glows, it may affect lighting conditions that are |
1528 | * 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 |
1529 | * 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 |
1530 | * on the map will get recalculated. The players could very well |
1493 | * on the map will get recalculated. The players could very well |
… | |
… | |
1538 | |
1501 | |
1539 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1502 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1540 | update_object (op, UP_OBJ_INSERT); |
1503 | update_object (op, UP_OBJ_INSERT); |
1541 | |
1504 | |
1542 | /* 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, |
1543 | * we want to have update_look set above before calling this. |
1506 | * we want to have floorbox_update called before calling this. |
1544 | * |
1507 | * |
1545 | * check_move_on() must be after this because code called from |
1508 | * check_move_on() must be after this because code called from |
1546 | * check_move_on() depends on correct map flags (so functions like |
1509 | * check_move_on() depends on correct map flags (so functions like |
1547 | * blocked() and wall() work properly), and these flags are updated by |
1510 | * blocked() and wall() work properly), and these flags are updated by |
1548 | * update_object(). |
1511 | * update_object(). |
… | |
… | |
1578 | tmp1; |
1541 | tmp1; |
1579 | |
1542 | |
1580 | /* first search for itself and remove any old instances */ |
1543 | /* first search for itself and remove any old instances */ |
1581 | |
1544 | |
1582 | 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) |
1583 | { |
|
|
1584 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1546 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1585 | { |
1547 | tmp->destroy (); |
1586 | remove_ob (tmp); |
|
|
1587 | free_object (tmp); |
|
|
1588 | } |
|
|
1589 | } |
|
|
1590 | |
1548 | |
1591 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1549 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1592 | |
1550 | |
1593 | tmp1->x = op->x; |
1551 | tmp1->x = op->x; |
1594 | tmp1->y = op->y; |
1552 | tmp1->y = op->y; |
1595 | insert_ob_in_map (tmp1, op->map, op, 0); |
1553 | insert_ob_in_map (tmp1, op->map, op, 0); |
1596 | } |
1554 | } |
… | |
… | |
1604 | */ |
1562 | */ |
1605 | |
1563 | |
1606 | object * |
1564 | object * |
1607 | get_split_ob (object *orig_ob, uint32 nr) |
1565 | get_split_ob (object *orig_ob, uint32 nr) |
1608 | { |
1566 | { |
1609 | object * |
1567 | object *newob; |
1610 | newob; |
|
|
1611 | int |
|
|
1612 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1568 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1613 | |
1569 | |
1614 | if (orig_ob->nrof < nr) |
1570 | if (orig_ob->nrof < nr) |
1615 | { |
1571 | { |
1616 | 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); |
1617 | return NULL; |
1573 | return NULL; |
1618 | } |
1574 | } |
1619 | |
1575 | |
1620 | newob = object_create_clone (orig_ob); |
1576 | newob = object_create_clone (orig_ob); |
1621 | |
1577 | |
1622 | if ((orig_ob->nrof -= nr) < 1) |
1578 | if ((orig_ob->nrof -= nr) < 1) |
1623 | { |
1579 | orig_ob->destroy (1); |
1624 | if (!is_removed) |
|
|
1625 | remove_ob (orig_ob); |
|
|
1626 | free_object2 (orig_ob, 1); |
|
|
1627 | } |
|
|
1628 | else if (!is_removed) |
1580 | else if (!is_removed) |
1629 | { |
1581 | { |
1630 | if (orig_ob->env != NULL) |
1582 | if (orig_ob->env != NULL) |
1631 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1583 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1632 | 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) |
… | |
… | |
1662 | if (i > op->nrof) |
1614 | if (i > op->nrof) |
1663 | i = op->nrof; |
1615 | i = op->nrof; |
1664 | |
1616 | |
1665 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1617 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1666 | op->nrof -= i; |
1618 | op->nrof -= i; |
1667 | else if (op->env != NULL) |
1619 | else if (op->env) |
1668 | { |
1620 | { |
1669 | /* is this object in the players inventory, or sub container |
1621 | /* is this object in the players inventory, or sub container |
1670 | * therein? |
1622 | * therein? |
1671 | */ |
1623 | */ |
1672 | tmp = is_player_inv (op->env); |
1624 | tmp = is_player_inv (op->env); |
… | |
… | |
1678 | */ |
1630 | */ |
1679 | if (!tmp) |
1631 | if (!tmp) |
1680 | { |
1632 | { |
1681 | for (pl = first_player; pl; pl = pl->next) |
1633 | for (pl = first_player; pl; pl = pl->next) |
1682 | if (pl->ob->container == op->env) |
1634 | if (pl->ob->container == op->env) |
|
|
1635 | { |
|
|
1636 | tmp = pl->ob; |
1683 | break; |
1637 | break; |
1684 | if (pl) |
1638 | } |
1685 | tmp = pl->ob; |
|
|
1686 | else |
|
|
1687 | tmp = NULL; |
|
|
1688 | } |
1639 | } |
1689 | |
1640 | |
1690 | if (i < op->nrof) |
1641 | if (i < op->nrof) |
1691 | { |
1642 | { |
1692 | sub_weight (op->env, op->weight * i); |
1643 | sub_weight (op->env, op->weight * i); |
1693 | op->nrof -= i; |
1644 | op->nrof -= i; |
1694 | if (tmp) |
1645 | if (tmp) |
1695 | { |
|
|
1696 | esrv_send_item (tmp, op); |
1646 | esrv_send_item (tmp, op); |
1697 | } |
|
|
1698 | } |
1647 | } |
1699 | else |
1648 | else |
1700 | { |
1649 | { |
1701 | remove_ob (op); |
1650 | op->remove (); |
1702 | op->nrof = 0; |
1651 | op->nrof = 0; |
1703 | if (tmp) |
1652 | if (tmp) |
1704 | { |
|
|
1705 | esrv_del_item (tmp->contr, op->count); |
1653 | esrv_del_item (tmp->contr, op->count); |
1706 | } |
|
|
1707 | } |
1654 | } |
1708 | } |
1655 | } |
1709 | else |
1656 | else |
1710 | { |
1657 | { |
1711 | object *above = op->above; |
1658 | object *above = op->above; |
1712 | |
1659 | |
1713 | if (i < op->nrof) |
1660 | if (i < op->nrof) |
1714 | op->nrof -= i; |
1661 | op->nrof -= i; |
1715 | else |
1662 | else |
1716 | { |
1663 | { |
1717 | remove_ob (op); |
1664 | op->remove (); |
1718 | op->nrof = 0; |
1665 | op->nrof = 0; |
1719 | } |
1666 | } |
1720 | |
1667 | |
1721 | /* Since we just removed op, op->above is null */ |
1668 | /* Since we just removed op, op->above is null */ |
1722 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1669 | for (tmp = above; tmp; tmp = tmp->above) |
1723 | if (tmp->type == PLAYER) |
1670 | if (tmp->type == PLAYER) |
1724 | { |
1671 | { |
1725 | if (op->nrof) |
1672 | if (op->nrof) |
1726 | esrv_send_item (tmp, op); |
1673 | esrv_send_item (tmp, op); |
1727 | else |
1674 | else |
… | |
… | |
1731 | |
1678 | |
1732 | if (op->nrof) |
1679 | if (op->nrof) |
1733 | return op; |
1680 | return op; |
1734 | else |
1681 | else |
1735 | { |
1682 | { |
1736 | free_object (op); |
1683 | op->destroy (); |
1737 | return NULL; |
1684 | return 0; |
1738 | } |
1685 | } |
1739 | } |
1686 | } |
1740 | |
1687 | |
1741 | /* |
1688 | /* |
1742 | * add_weight(object, weight) adds the specified weight to an object, |
1689 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1754 | op->carrying += weight; |
1701 | op->carrying += weight; |
1755 | op = op->env; |
1702 | op = op->env; |
1756 | } |
1703 | } |
1757 | } |
1704 | } |
1758 | |
1705 | |
|
|
1706 | object * |
|
|
1707 | insert_ob_in_ob (object *op, object *where) |
|
|
1708 | { |
|
|
1709 | if (!where) |
|
|
1710 | { |
|
|
1711 | char *dump = dump_object (op); |
|
|
1712 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1713 | free (dump); |
|
|
1714 | return op; |
|
|
1715 | } |
|
|
1716 | |
|
|
1717 | if (where->head) |
|
|
1718 | { |
|
|
1719 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1720 | where = where->head; |
|
|
1721 | } |
|
|
1722 | |
|
|
1723 | return where->insert (op); |
|
|
1724 | } |
|
|
1725 | |
1759 | /* |
1726 | /* |
1760 | * insert_ob_in_ob(op,environment): |
1727 | * env->insert (op) |
1761 | * This function inserts the object op in the linked list |
1728 | * This function inserts the object op in the linked list |
1762 | * inside the object environment. |
1729 | * inside the object environment. |
1763 | * |
1730 | * |
1764 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1765 | * the inventory at the last position or next to other objects of the same |
|
|
1766 | * type. |
|
|
1767 | * Frank: Now sorted by type, archetype and magic! |
|
|
1768 | * |
|
|
1769 | * The function returns now pointer to inserted item, and return value can |
1731 | * The function returns now pointer to inserted item, and return value can |
1770 | * be != op, if items are merged. -Tero |
1732 | * be != op, if items are merged. -Tero |
1771 | */ |
1733 | */ |
1772 | |
1734 | |
1773 | object * |
1735 | object * |
1774 | insert_ob_in_ob (object *op, object *where) |
1736 | object::insert (object *op) |
1775 | { |
1737 | { |
1776 | object * |
1738 | object *tmp, *otmp; |
1777 | tmp, * |
|
|
1778 | otmp; |
|
|
1779 | |
1739 | |
1780 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1740 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1781 | { |
1741 | op->remove (); |
1782 | dump_object (op); |
|
|
1783 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1784 | return op; |
|
|
1785 | } |
|
|
1786 | |
|
|
1787 | if (where == NULL) |
|
|
1788 | { |
|
|
1789 | dump_object (op); |
|
|
1790 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1791 | return op; |
|
|
1792 | } |
|
|
1793 | |
|
|
1794 | if (where->head) |
|
|
1795 | { |
|
|
1796 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1797 | where = where->head; |
|
|
1798 | } |
|
|
1799 | |
1742 | |
1800 | if (op->more) |
1743 | if (op->more) |
1801 | { |
1744 | { |
1802 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1745 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1803 | return op; |
1746 | return op; |
… | |
… | |
1805 | |
1748 | |
1806 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1749 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1807 | CLEAR_FLAG (op, FLAG_REMOVED); |
1750 | CLEAR_FLAG (op, FLAG_REMOVED); |
1808 | if (op->nrof) |
1751 | if (op->nrof) |
1809 | { |
1752 | { |
1810 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1753 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1811 | if (CAN_MERGE (tmp, op)) |
1754 | if (object::can_merge (tmp, op)) |
1812 | { |
1755 | { |
1813 | /* return the original object and remove inserted object |
1756 | /* return the original object and remove inserted object |
1814 | (client needs the original object) */ |
1757 | (client needs the original object) */ |
1815 | tmp->nrof += op->nrof; |
1758 | tmp->nrof += op->nrof; |
1816 | /* Weight handling gets pretty funky. Since we are adding to |
1759 | /* Weight handling gets pretty funky. Since we are adding to |
1817 | * tmp->nrof, we need to increase the weight. |
1760 | * tmp->nrof, we need to increase the weight. |
1818 | */ |
1761 | */ |
1819 | add_weight (where, op->weight * op->nrof); |
1762 | add_weight (this, op->weight * op->nrof); |
1820 | SET_FLAG (op, FLAG_REMOVED); |
1763 | SET_FLAG (op, FLAG_REMOVED); |
1821 | free_object (op); /* free the inserted object */ |
1764 | op->destroy (); /* free the inserted object */ |
1822 | op = tmp; |
1765 | op = tmp; |
1823 | remove_ob (op); /* and fix old object's links */ |
1766 | op->remove (); /* and fix old object's links */ |
1824 | CLEAR_FLAG (op, FLAG_REMOVED); |
1767 | CLEAR_FLAG (op, FLAG_REMOVED); |
1825 | break; |
1768 | break; |
1826 | } |
1769 | } |
1827 | |
1770 | |
1828 | /* I assume combined objects have no inventory |
1771 | /* I assume combined objects have no inventory |
1829 | * We add the weight - this object could have just been removed |
1772 | * We add the weight - this object could have just been removed |
1830 | * (if it was possible to merge). calling remove_ob will subtract |
1773 | * (if it was possible to merge). calling remove_ob will subtract |
1831 | * the weight, so we need to add it in again, since we actually do |
1774 | * the weight, so we need to add it in again, since we actually do |
1832 | * the linking below |
1775 | * the linking below |
1833 | */ |
1776 | */ |
1834 | add_weight (where, op->weight * op->nrof); |
1777 | add_weight (this, op->weight * op->nrof); |
1835 | } |
1778 | } |
1836 | else |
1779 | else |
1837 | add_weight (where, (op->weight + op->carrying)); |
1780 | add_weight (this, (op->weight + op->carrying)); |
1838 | |
1781 | |
1839 | otmp = is_player_inv (where); |
1782 | otmp = is_player_inv (this); |
1840 | if (otmp && otmp->contr != NULL) |
1783 | if (otmp && otmp->contr) |
1841 | { |
|
|
1842 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1784 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1843 | fix_player (otmp); |
1785 | fix_player (otmp); |
1844 | } |
|
|
1845 | |
1786 | |
1846 | op->map = NULL; |
1787 | op->map = NULL; |
1847 | op->env = where; |
1788 | op->env = this; |
1848 | op->above = NULL; |
1789 | op->above = NULL; |
1849 | op->below = NULL; |
1790 | op->below = NULL; |
1850 | op->x = 0, op->y = 0; |
1791 | op->x = 0, op->y = 0; |
1851 | |
1792 | |
1852 | /* reset the light list and los of the players on the map */ |
1793 | /* reset the light list and los of the players on the map */ |
1853 | if ((op->glow_radius != 0) && where->map) |
1794 | if ((op->glow_radius != 0) && map) |
1854 | { |
1795 | { |
1855 | #ifdef DEBUG_LIGHTS |
1796 | #ifdef DEBUG_LIGHTS |
1856 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1797 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1857 | #endif /* DEBUG_LIGHTS */ |
1798 | #endif /* DEBUG_LIGHTS */ |
1858 | if (MAP_DARKNESS (where->map)) |
1799 | if (MAP_DARKNESS (map)) |
1859 | update_all_los (where->map, where->x, where->y); |
1800 | update_all_los (map, x, y); |
1860 | } |
1801 | } |
1861 | |
1802 | |
1862 | /* Client has no idea of ordering so lets not bother ordering it here. |
1803 | /* Client has no idea of ordering so lets not bother ordering it here. |
1863 | * It sure simplifies this function... |
1804 | * It sure simplifies this function... |
1864 | */ |
1805 | */ |
1865 | if (where->inv == NULL) |
1806 | if (!inv) |
1866 | where->inv = op; |
1807 | inv = op; |
1867 | else |
1808 | else |
1868 | { |
1809 | { |
1869 | op->below = where->inv; |
1810 | op->below = inv; |
1870 | op->below->above = op; |
1811 | op->below->above = op; |
1871 | where->inv = op; |
1812 | inv = op; |
1872 | } |
1813 | } |
|
|
1814 | |
1873 | return op; |
1815 | return op; |
1874 | } |
1816 | } |
1875 | |
1817 | |
1876 | /* |
1818 | /* |
1877 | * Checks if any objects has a move_type that matches objects |
1819 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1895 | */ |
1837 | */ |
1896 | |
1838 | |
1897 | int |
1839 | int |
1898 | check_move_on (object *op, object *originator) |
1840 | check_move_on (object *op, object *originator) |
1899 | { |
1841 | { |
1900 | object * |
1842 | object *tmp; |
1901 | tmp; |
1843 | maptile *m = op->map; |
1902 | tag_t |
|
|
1903 | tag; |
|
|
1904 | mapstruct * |
|
|
1905 | m = op->map; |
|
|
1906 | int |
|
|
1907 | x = op->x, y = op->y; |
1844 | int x = op->x, y = op->y; |
1908 | |
1845 | |
1909 | MoveType |
1846 | MoveType move_on, move_slow, move_block; |
1910 | move_on, |
|
|
1911 | move_slow, |
|
|
1912 | move_block; |
|
|
1913 | |
1847 | |
1914 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1848 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1915 | return 0; |
1849 | return 0; |
1916 | |
|
|
1917 | tag = op->count; |
|
|
1918 | |
1850 | |
1919 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1851 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1920 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1852 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1921 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1853 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1922 | |
1854 | |
… | |
… | |
1983 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1915 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1984 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1916 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1985 | { |
1917 | { |
1986 | move_apply (tmp, op, originator); |
1918 | move_apply (tmp, op, originator); |
1987 | |
1919 | |
1988 | if (was_destroyed (op, tag)) |
1920 | if (op->destroyed ()) |
1989 | return 1; |
1921 | return 1; |
1990 | |
1922 | |
1991 | /* what the person/creature stepped onto has moved the object |
1923 | /* what the person/creature stepped onto has moved the object |
1992 | * someplace new. Don't process any further - if we did, |
1924 | * someplace new. Don't process any further - if we did, |
1993 | * have a feeling strange problems would result. |
1925 | * have a feeling strange problems would result. |
… | |
… | |
2005 | * a matching archetype at the given map and coordinates. |
1937 | * a matching archetype at the given map and coordinates. |
2006 | * The first matching object is returned, or NULL if none. |
1938 | * The first matching object is returned, or NULL if none. |
2007 | */ |
1939 | */ |
2008 | |
1940 | |
2009 | object * |
1941 | object * |
2010 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1942 | present_arch (const archetype *at, maptile *m, int x, int y) |
2011 | { |
1943 | { |
2012 | object * |
1944 | object * |
2013 | tmp; |
1945 | tmp; |
2014 | |
1946 | |
2015 | if (m == NULL || out_of_map (m, x, y)) |
1947 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2028 | * a matching type variable at the given map and coordinates. |
1960 | * a matching type variable at the given map and coordinates. |
2029 | * The first matching object is returned, or NULL if none. |
1961 | * The first matching object is returned, or NULL if none. |
2030 | */ |
1962 | */ |
2031 | |
1963 | |
2032 | object * |
1964 | object * |
2033 | present (unsigned char type, mapstruct *m, int x, int y) |
1965 | present (unsigned char type, maptile *m, int x, int y) |
2034 | { |
1966 | { |
2035 | object * |
1967 | object * |
2036 | tmp; |
1968 | tmp; |
2037 | |
1969 | |
2038 | if (out_of_map (m, x, y)) |
1970 | if (out_of_map (m, x, y)) |
… | |
… | |
2178 | * the archetype because that isn't correct if the monster has been |
2110 | * the archetype because that isn't correct if the monster has been |
2179 | * customized, changed states, etc. |
2111 | * customized, changed states, etc. |
2180 | */ |
2112 | */ |
2181 | |
2113 | |
2182 | int |
2114 | int |
2183 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2115 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2184 | { |
2116 | { |
2185 | int |
2117 | int |
2186 | i, |
2118 | i, |
2187 | index = 0, flag; |
2119 | index = 0, flag; |
2188 | static int |
2120 | static int |
… | |
… | |
2209 | return -1; |
2141 | return -1; |
2210 | return altern[RANDOM () % index]; |
2142 | return altern[RANDOM () % index]; |
2211 | } |
2143 | } |
2212 | |
2144 | |
2213 | /* |
2145 | /* |
2214 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2146 | * find_first_free_spot(archetype, maptile, x, y) works like |
2215 | * find_free_spot(), but it will search max number of squares. |
2147 | * find_free_spot(), but it will search max number of squares. |
2216 | * But it will return the first available spot, not a random choice. |
2148 | * But it will return the first available spot, not a random choice. |
2217 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2149 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2218 | */ |
2150 | */ |
2219 | |
2151 | |
2220 | int |
2152 | int |
2221 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2153 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2222 | { |
2154 | { |
2223 | int |
2155 | int |
2224 | i; |
2156 | i; |
2225 | |
2157 | |
2226 | for (i = 0; i < SIZEOFFREE; i++) |
2158 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2290 | * because we have to know what movement the thing looking to move |
2222 | * because we have to know what movement the thing looking to move |
2291 | * there is capable of. |
2223 | * there is capable of. |
2292 | */ |
2224 | */ |
2293 | |
2225 | |
2294 | int |
2226 | int |
2295 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2227 | find_dir (maptile *m, int x, int y, object *exclude) |
2296 | { |
2228 | { |
2297 | int |
2229 | int |
2298 | i, |
2230 | i, |
2299 | max = SIZEOFFREE, mflags; |
2231 | max = SIZEOFFREE, mflags; |
2300 | |
2232 | |
2301 | sint16 nx, ny; |
2233 | sint16 nx, ny; |
2302 | object * |
2234 | object * |
2303 | tmp; |
2235 | tmp; |
2304 | mapstruct * |
2236 | maptile * |
2305 | mp; |
2237 | mp; |
2306 | |
2238 | |
2307 | MoveType blocked, move_type; |
2239 | MoveType blocked, move_type; |
2308 | |
2240 | |
2309 | if (exclude && exclude->head) |
2241 | if (exclude && exclude->head) |
… | |
… | |
2517 | * Modified to be map tile aware -.MSW |
2449 | * Modified to be map tile aware -.MSW |
2518 | */ |
2450 | */ |
2519 | |
2451 | |
2520 | |
2452 | |
2521 | int |
2453 | int |
2522 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2454 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2523 | { |
2455 | { |
2524 | sint16 dx, dy; |
2456 | sint16 dx, dy; |
2525 | int |
2457 | int |
2526 | mflags; |
2458 | mflags; |
2527 | |
2459 | |
… | |
… | |
2576 | * create clone from object to another |
2508 | * create clone from object to another |
2577 | */ |
2509 | */ |
2578 | object * |
2510 | object * |
2579 | object_create_clone (object *asrc) |
2511 | object_create_clone (object *asrc) |
2580 | { |
2512 | { |
2581 | object * |
|
|
2582 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2513 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2583 | |
2514 | |
2584 | if (!asrc) |
2515 | if (!asrc) |
2585 | return NULL; |
2516 | return 0; |
|
|
2517 | |
2586 | src = asrc; |
2518 | src = asrc; |
2587 | if (src->head) |
2519 | if (src->head) |
2588 | src = src->head; |
2520 | src = src->head; |
2589 | |
2521 | |
2590 | prev = NULL; |
2522 | prev = 0; |
2591 | for (part = src; part; part = part->more) |
2523 | for (part = src; part; part = part->more) |
2592 | { |
2524 | { |
2593 | tmp = get_object (); |
2525 | tmp = part->clone (); |
2594 | copy_object (part, tmp); |
|
|
2595 | tmp->x -= src->x; |
2526 | tmp->x -= src->x; |
2596 | tmp->y -= src->y; |
2527 | tmp->y -= src->y; |
|
|
2528 | |
2597 | if (!part->head) |
2529 | if (!part->head) |
2598 | { |
2530 | { |
2599 | dst = tmp; |
2531 | dst = tmp; |
2600 | tmp->head = NULL; |
2532 | tmp->head = 0; |
2601 | } |
2533 | } |
2602 | else |
2534 | else |
2603 | { |
2535 | { |
2604 | tmp->head = dst; |
2536 | tmp->head = dst; |
2605 | } |
2537 | } |
|
|
2538 | |
2606 | tmp->more = NULL; |
2539 | tmp->more = 0; |
|
|
2540 | |
2607 | if (prev) |
2541 | if (prev) |
2608 | prev->more = tmp; |
2542 | prev->more = tmp; |
|
|
2543 | |
2609 | prev = tmp; |
2544 | prev = tmp; |
2610 | } |
2545 | } |
2611 | |
2546 | |
2612 | /*** copy inventory ***/ |
|
|
2613 | for (item = src->inv; item; item = item->below) |
2547 | for (item = src->inv; item; item = item->below) |
2614 | { |
|
|
2615 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2548 | insert_ob_in_ob (object_create_clone (item), dst); |
2616 | } |
|
|
2617 | |
2549 | |
2618 | return dst; |
2550 | return dst; |
2619 | } |
2551 | } |
2620 | |
2552 | |
2621 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2622 | int |
|
|
2623 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2624 | { |
|
|
2625 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2626 | * robust */ |
|
|
2627 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2628 | } |
|
|
2629 | |
|
|
2630 | /* GROS - Creates an object using a string representing its content. */ |
2553 | /* GROS - Creates an object using a string representing its content. */ |
2631 | |
|
|
2632 | /* Basically, we save the content of the string to a temp file, then call */ |
2554 | /* Basically, we save the content of the string to a temp file, then call */ |
2633 | |
|
|
2634 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2555 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2635 | |
|
|
2636 | /* but it was simple to make and allows reusing the load_object function. */ |
2556 | /* but it was simple to make and allows reusing the load_object function. */ |
2637 | |
|
|
2638 | /* Remember not to use load_object_str in a time-critical situation. */ |
2557 | /* Remember not to use load_object_str in a time-critical situation. */ |
2639 | |
|
|
2640 | /* Also remember that multiparts objects are not supported for now. */ |
2558 | /* Also remember that multiparts objects are not supported for now. */ |
2641 | |
2559 | |
2642 | object * |
2560 | object * |
2643 | load_object_str (const char *obstr) |
2561 | load_object_str (const char *obstr) |
2644 | { |
2562 | { |
2645 | object * |
2563 | object *op; |
2646 | op; |
|
|
2647 | char |
|
|
2648 | filename[MAX_BUF]; |
2564 | char filename[MAX_BUF]; |
2649 | |
2565 | |
2650 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2566 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2651 | |
2567 | |
2652 | FILE * |
|
|
2653 | tempfile = fopen (filename, "w"); |
2568 | FILE *tempfile = fopen (filename, "w"); |
2654 | |
2569 | |
2655 | if (tempfile == NULL) |
2570 | if (tempfile == NULL) |
2656 | { |
2571 | { |
2657 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2572 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2658 | return NULL; |
2573 | return NULL; |
2659 | }; |
2574 | } |
|
|
2575 | |
2660 | fprintf (tempfile, obstr); |
2576 | fprintf (tempfile, obstr); |
2661 | fclose (tempfile); |
2577 | fclose (tempfile); |
2662 | |
2578 | |
2663 | op = get_object (); |
2579 | op = object::create (); |
2664 | |
2580 | |
2665 | object_thawer thawer (filename); |
2581 | object_thawer thawer (filename); |
2666 | |
2582 | |
2667 | if (thawer) |
2583 | if (thawer) |
2668 | load_object (thawer, op, 0); |
2584 | load_object (thawer, op, 0); |
… | |
… | |
2678 | * returns NULL if no match. |
2594 | * returns NULL if no match. |
2679 | */ |
2595 | */ |
2680 | object * |
2596 | object * |
2681 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2597 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2682 | { |
2598 | { |
2683 | object * |
2599 | object *tmp; |
2684 | tmp; |
|
|
2685 | |
2600 | |
2686 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2601 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2687 | if (tmp->type == type && tmp->subtype == subtype) |
2602 | if (tmp->type == type && tmp->subtype == subtype) |
2688 | return tmp; |
2603 | return tmp; |
2689 | |
2604 | |
… | |
… | |
2697 | * do the desired thing. |
2612 | * do the desired thing. |
2698 | */ |
2613 | */ |
2699 | key_value * |
2614 | key_value * |
2700 | get_ob_key_link (const object *ob, const char *key) |
2615 | get_ob_key_link (const object *ob, const char *key) |
2701 | { |
2616 | { |
2702 | key_value * |
2617 | key_value *link; |
2703 | link; |
|
|
2704 | |
2618 | |
2705 | for (link = ob->key_values; link != NULL; link = link->next) |
2619 | for (link = ob->key_values; link != NULL; link = link->next) |
2706 | { |
|
|
2707 | if (link->key == key) |
2620 | if (link->key == key) |
2708 | { |
|
|
2709 | return link; |
2621 | return link; |
2710 | } |
|
|
2711 | } |
|
|
2712 | |
2622 | |
2713 | return NULL; |
2623 | return NULL; |
2714 | } |
2624 | } |
2715 | |
2625 | |
2716 | /* |
2626 | /* |
… | |
… | |
2721 | * The returned string is shared. |
2631 | * The returned string is shared. |
2722 | */ |
2632 | */ |
2723 | const char * |
2633 | const char * |
2724 | get_ob_key_value (const object *op, const char *const key) |
2634 | get_ob_key_value (const object *op, const char *const key) |
2725 | { |
2635 | { |
2726 | key_value * |
2636 | key_value *link; |
2727 | link; |
2637 | shstr_cmp canonical_key (key); |
2728 | const char * |
|
|
2729 | canonical_key; |
|
|
2730 | |
2638 | |
2731 | canonical_key = shstr::find (key); |
|
|
2732 | |
|
|
2733 | if (canonical_key == NULL) |
2639 | if (!canonical_key) |
2734 | { |
2640 | { |
2735 | /* 1. There being a field named key on any object |
2641 | /* 1. There being a field named key on any object |
2736 | * implies there'd be a shared string to find. |
2642 | * implies there'd be a shared string to find. |
2737 | * 2. Since there isn't, no object has this field. |
2643 | * 2. Since there isn't, no object has this field. |
2738 | * 3. Therefore, *this* object doesn't have this field. |
2644 | * 3. Therefore, *this* object doesn't have this field. |
2739 | */ |
2645 | */ |
2740 | return NULL; |
2646 | return 0; |
2741 | } |
2647 | } |
2742 | |
2648 | |
2743 | /* This is copied from get_ob_key_link() above - |
2649 | /* This is copied from get_ob_key_link() above - |
2744 | * only 4 lines, and saves the function call overhead. |
2650 | * only 4 lines, and saves the function call overhead. |
2745 | */ |
2651 | */ |
2746 | for (link = op->key_values; link != NULL; link = link->next) |
2652 | for (link = op->key_values; link; link = link->next) |
2747 | { |
|
|
2748 | if (link->key == canonical_key) |
2653 | if (link->key == canonical_key) |
2749 | { |
|
|
2750 | return link->value; |
2654 | return link->value; |
2751 | } |
2655 | |
2752 | } |
|
|
2753 | return NULL; |
2656 | return 0; |
2754 | } |
2657 | } |
2755 | |
2658 | |
2756 | |
2659 | |
2757 | /* |
2660 | /* |
2758 | * Updates the canonical_key in op to value. |
2661 | * Updates the canonical_key in op to value. |
… | |
… | |
2844 | shstr key_ (key); |
2747 | shstr key_ (key); |
2845 | |
2748 | |
2846 | return set_ob_key_value_s (op, key_, value, add_key); |
2749 | return set_ob_key_value_s (op, key_, value, add_key); |
2847 | } |
2750 | } |
2848 | |
2751 | |
|
|
2752 | object::depth_iterator::depth_iterator (object *container) |
|
|
2753 | : iterator_base (container) |
|
|
2754 | { |
|
|
2755 | while (item->inv) |
|
|
2756 | item = item->inv; |
|
|
2757 | } |
|
|
2758 | |
2849 | void |
2759 | void |
2850 | object::deep_iterator::next () |
2760 | object::depth_iterator::next () |
2851 | { |
2761 | { |
2852 | if (item->inv) |
|
|
2853 | item = item->inv; |
|
|
2854 | else if (item->below) |
2762 | if (item->below) |
|
|
2763 | { |
2855 | item = item->below; |
2764 | item = item->below; |
|
|
2765 | |
|
|
2766 | while (item->inv) |
|
|
2767 | item = item->inv; |
|
|
2768 | } |
2856 | else |
2769 | else |
2857 | item = item->env->below; |
2770 | item = item->env; |
2858 | } |
2771 | } |
|
|
2772 | |
|
|
2773 | // return a suitable string describing an objetc in enough detail to find it |
|
|
2774 | const char * |
|
|
2775 | object::debug_desc (char *info) const |
|
|
2776 | { |
|
|
2777 | char info2[256 * 3]; |
|
|
2778 | char *p = info; |
|
|
2779 | |
|
|
2780 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
|
|
2781 | count, |
|
|
2782 | &name, |
|
|
2783 | title ? " " : "", |
|
|
2784 | title ? (const char *)title : ""); |
|
|
2785 | |
|
|
2786 | if (env) |
|
|
2787 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
|
|
2788 | |
|
|
2789 | if (map) |
|
|
2790 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
|
|
2791 | |
|
|
2792 | return info; |
|
|
2793 | } |
|
|
2794 | |
|
|
2795 | const char * |
|
|
2796 | object::debug_desc () const |
|
|
2797 | { |
|
|
2798 | static char info[256 * 3]; |
|
|
2799 | return debug_desc (info); |
|
|
2800 | } |
|
|
2801 | |