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. */ |
… | |
… | |
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 <loader.h> |
33 | #include <loader.h> |
35 | |
34 | |
|
|
35 | #include <bitset> |
|
|
36 | |
36 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
|
|
38 | static UUID uuid; |
|
|
39 | const uint64 UUID_SKIP = 1<<19; |
37 | |
40 | |
38 | object *objects; /* Pointer to the list of used objects */ |
|
|
39 | 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 */ |
40 | |
42 | |
41 | 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, |
42 | 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 |
43 | }; |
45 | }; |
… | |
… | |
50 | int freedir[SIZEOFFREE] = { |
52 | int freedir[SIZEOFFREE] = { |
51 | 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, |
52 | 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 |
53 | }; |
55 | }; |
54 | |
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 | |
55 | /* 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. */ |
56 | static int |
135 | static int |
57 | compare_ob_value_lists_one (const object *wants, const object *has) |
136 | compare_ob_value_lists_one (const object *wants, const object *has) |
58 | { |
137 | { |
59 | key_value *wants_field; |
138 | key_value *wants_field; |
… | |
… | |
106 | * |
185 | * |
107 | * 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 |
108 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
109 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
110 | * |
189 | * |
111 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
112 | * |
191 | * |
113 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
114 | * check weight |
193 | * check weight |
115 | */ |
194 | */ |
116 | |
195 | |
117 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
118 | { |
197 | { |
119 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
120 | 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) |
121 | return 0; |
204 | return 0; |
122 | |
205 | |
123 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
124 | return 0; |
|
|
125 | |
|
|
126 | /* 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 |
127 | * 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 |
128 | * used to store nrof). |
209 | * used to store nrof). |
129 | */ |
210 | */ |
130 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
140 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
141 | |
222 | |
142 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
143 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
144 | |
225 | |
145 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
146 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
147 | * being locked in inventory should prevent merging. |
|
|
148 | * 0x4 in flags3 is CLIENT_SENT |
|
|
149 | */ |
|
|
150 | if ((ob1->arch != ob2->arch) || |
|
|
151 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
152 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
153 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
154 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
155 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
156 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
157 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
158 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
159 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
160 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
161 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
162 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
163 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
164 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
165 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
166 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
167 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
168 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
169 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
170 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
171 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
172 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
173 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
174 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
175 | (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) |
176 | return 0; |
251 | return 0; |
177 | |
252 | |
178 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
179 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
180 | */ |
255 | */ |
… | |
… | |
183 | /* 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 */ |
184 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
185 | return 0; |
260 | return 0; |
186 | |
261 | |
187 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
188 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
189 | return 0; |
264 | return 0; |
190 | |
265 | |
191 | /* 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 |
192 | * if it is valid. |
267 | * if it is valid. |
193 | */ |
268 | */ |
… | |
… | |
254 | { |
329 | { |
255 | if (inv->inv) |
330 | if (inv->inv) |
256 | sum_weight (inv); |
331 | sum_weight (inv); |
257 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
332 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
258 | } |
333 | } |
|
|
334 | |
259 | if (op->type == CONTAINER && op->stats.Str) |
335 | if (op->type == CONTAINER && op->stats.Str) |
260 | sum = (sum * (100 - op->stats.Str)) / 100; |
336 | sum = (sum * (100 - op->stats.Str)) / 100; |
|
|
337 | |
261 | if (op->carrying != sum) |
338 | if (op->carrying != sum) |
262 | op->carrying = sum; |
339 | op->carrying = sum; |
|
|
340 | |
263 | return sum; |
341 | return sum; |
264 | } |
342 | } |
265 | |
343 | |
266 | /** |
344 | /** |
267 | * Return the outermost environment object for a given object. |
345 | * Return the outermost environment object for a given object. |
… | |
… | |
274 | op = op->env; |
352 | op = op->env; |
275 | return op; |
353 | return op; |
276 | } |
354 | } |
277 | |
355 | |
278 | /* |
356 | /* |
279 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
|
|
280 | * a better check. We basically keeping traversing up until we can't |
|
|
281 | * or find a player. |
|
|
282 | */ |
|
|
283 | |
|
|
284 | object * |
|
|
285 | is_player_inv (object *op) |
|
|
286 | { |
|
|
287 | for (; op != NULL && op->type != PLAYER; op = op->env) |
|
|
288 | if (op->env == op) |
|
|
289 | op->env = NULL; |
|
|
290 | return op; |
|
|
291 | } |
|
|
292 | |
|
|
293 | /* |
|
|
294 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
295 | * Some error messages. |
358 | * Some error messages. |
296 | * The result of the dump is stored in the static global errmsg array. |
359 | * The result of the dump is stored in the static global errmsg array. |
297 | */ |
360 | */ |
298 | |
361 | |
299 | void |
362 | char * |
300 | dump_object2 (object *op) |
|
|
301 | { |
|
|
302 | errmsg[0] = 0; |
|
|
303 | return; |
|
|
304 | //TODO//D#d# |
|
|
305 | #if 0 |
|
|
306 | char *cp; |
|
|
307 | |
|
|
308 | /* object *tmp;*/ |
|
|
309 | |
|
|
310 | if (op->arch != NULL) |
|
|
311 | { |
|
|
312 | strcat (errmsg, "arch "); |
|
|
313 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
314 | strcat (errmsg, "\n"); |
|
|
315 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
316 | strcat (errmsg, cp); |
|
|
317 | # if 0 |
|
|
318 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
319 | * will overflow the buffer. |
|
|
320 | * Changed so that we don't dump inventory either. This may |
|
|
321 | * also overflow the buffer. |
|
|
322 | */ |
|
|
323 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
324 | strcat (errmsg, cp); |
|
|
325 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
326 | dump_object2 (tmp); |
|
|
327 | # endif |
|
|
328 | strcat (errmsg, "end\n"); |
|
|
329 | } |
|
|
330 | else |
|
|
331 | { |
|
|
332 | strcat (errmsg, "Object "); |
|
|
333 | if (op->name == NULL) |
|
|
334 | strcat (errmsg, "(null)"); |
|
|
335 | else |
|
|
336 | strcat (errmsg, op->name); |
|
|
337 | strcat (errmsg, "\n"); |
|
|
338 | # if 0 |
|
|
339 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
340 | strcat (errmsg, cp); |
|
|
341 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
342 | dump_object2 (tmp); |
|
|
343 | # endif |
|
|
344 | strcat (errmsg, "end\n"); |
|
|
345 | } |
|
|
346 | #endif |
|
|
347 | } |
|
|
348 | |
|
|
349 | /* |
|
|
350 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
351 | */ |
|
|
352 | |
|
|
353 | void |
|
|
354 | dump_object (object *op) |
363 | dump_object (object *op) |
355 | { |
364 | { |
356 | if (op == NULL) |
365 | if (!op) |
357 | { |
366 | return strdup ("[NULLOBJ]"); |
358 | strcpy (errmsg, "[NULL pointer]"); |
|
|
359 | return; |
|
|
360 | } |
|
|
361 | errmsg[0] = '\0'; |
|
|
362 | dump_object2 (op); |
|
|
363 | } |
|
|
364 | |
367 | |
365 | void |
368 | object_freezer freezer; |
366 | dump_all_objects (void) |
369 | save_object (freezer, op, 3); |
367 | { |
370 | return freezer.as_string (); |
368 | object *op; |
|
|
369 | |
|
|
370 | for (op = objects; op != NULL; op = op->next) |
|
|
371 | { |
|
|
372 | dump_object (op); |
|
|
373 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
374 | } |
|
|
375 | } |
371 | } |
376 | |
372 | |
377 | /* |
373 | /* |
378 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
379 | * multi-object 1 which is closest to the second object. |
375 | * multi-object 1 which is closest to the second object. |
… | |
… | |
399 | */ |
395 | */ |
400 | |
396 | |
401 | object * |
397 | object * |
402 | find_object (tag_t i) |
398 | find_object (tag_t i) |
403 | { |
399 | { |
404 | object *op; |
400 | for (object *op = object::first; op; op = op->next) |
405 | |
|
|
406 | for (op = objects; op != NULL; op = op->next) |
|
|
407 | if (op->count == i) |
401 | if (op->count == i) |
408 | break; |
402 | return op; |
|
|
403 | |
409 | return op; |
404 | return 0; |
410 | } |
405 | } |
411 | |
406 | |
412 | /* |
407 | /* |
413 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
414 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
… | |
… | |
416 | */ |
411 | */ |
417 | |
412 | |
418 | object * |
413 | object * |
419 | find_object_name (const char *str) |
414 | find_object_name (const char *str) |
420 | { |
415 | { |
421 | const char *name = shstr::find (str); |
416 | shstr_cmp str_ (str); |
422 | object *op; |
417 | object *op; |
423 | |
418 | |
424 | for (op = objects; op != NULL; op = op->next) |
419 | for (op = object::first; op != NULL; op = op->next) |
425 | if (&op->name == name) |
420 | if (op->name == str_) |
426 | break; |
421 | break; |
427 | |
422 | |
428 | return op; |
423 | return op; |
429 | } |
424 | } |
430 | |
425 | |
431 | void |
426 | void |
432 | free_all_object_data () |
427 | free_all_object_data () |
433 | { |
428 | { |
434 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
429 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
435 | } |
|
|
436 | |
|
|
437 | /* |
|
|
438 | * Returns the object which this object marks as being the owner. |
|
|
439 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
440 | * freed and are now reused. If this is detected, the owner is |
|
|
441 | * set to NULL, and NULL is returned. |
|
|
442 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
443 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
444 | * anything, so check removed flag. I don't expect that this should break |
|
|
445 | * anything - once an object is removed, it is basically dead anyways. |
|
|
446 | */ |
|
|
447 | object * |
|
|
448 | object::get_owner () |
|
|
449 | { |
|
|
450 | if (!owner |
|
|
451 | || QUERY_FLAG (owner, FLAG_FREED) |
|
|
452 | || QUERY_FLAG (owner, FLAG_REMOVED)) |
|
|
453 | owner = 0; |
|
|
454 | |
|
|
455 | return owner; |
|
|
456 | } |
430 | } |
457 | |
431 | |
458 | /* |
432 | /* |
459 | * Sets the owner and sets the skill and exp pointers to owner's current |
433 | * Sets the owner and sets the skill and exp pointers to owner's current |
460 | * skill and experience objects. |
434 | * skill and experience objects. |
… | |
… | |
530 | |
504 | |
531 | /* What is not cleared is next, prev, and count */ |
505 | /* What is not cleared is next, prev, and count */ |
532 | |
506 | |
533 | expmul = 1.0; |
507 | expmul = 1.0; |
534 | face = blank_face; |
508 | face = blank_face; |
535 | attacked_by_count = -1; |
|
|
536 | |
509 | |
537 | if (settings.casting_time) |
510 | if (settings.casting_time) |
538 | casting_time = -1; |
511 | casting_time = -1; |
539 | } |
512 | } |
540 | |
513 | |
541 | void object::clone (object *destination) |
|
|
542 | { |
|
|
543 | *(object_copy *)destination = *this; |
|
|
544 | *(object_pod *)destination = *this; |
|
|
545 | |
|
|
546 | if (self || cb) |
|
|
547 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
548 | } |
|
|
549 | |
|
|
550 | /* |
514 | /* |
551 | * copy object first frees everything allocated by the second object, |
515 | * copy_to first frees everything allocated by the dst object, |
552 | * and then copies the contends of the first object into the second |
516 | * and then copies the contents of itself into the second |
553 | * object, allocating what needs to be allocated. Basically, any |
517 | * object, allocating what needs to be allocated. Basically, any |
554 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
518 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
555 | * if the first object is freed, the pointers in the new object |
519 | * if the first object is freed, the pointers in the new object |
556 | * will point at garbage. |
520 | * will point at garbage. |
557 | */ |
521 | */ |
558 | void |
522 | void |
559 | copy_object (object *op2, object *op) |
523 | object::copy_to (object *dst) |
560 | { |
524 | { |
561 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
525 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
562 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
526 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
563 | |
527 | |
564 | op2->clone (op); |
528 | *(object_copy *)dst = *this; |
|
|
529 | *(object_pod *)dst = *this; |
|
|
530 | |
|
|
531 | if (self || cb) |
|
|
532 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
565 | |
533 | |
566 | if (is_freed) |
534 | if (is_freed) |
567 | SET_FLAG (op, FLAG_FREED); |
535 | SET_FLAG (dst, FLAG_FREED); |
|
|
536 | |
568 | if (is_removed) |
537 | if (is_removed) |
569 | SET_FLAG (op, FLAG_REMOVED); |
538 | SET_FLAG (dst, FLAG_REMOVED); |
570 | |
539 | |
571 | if (op2->speed < 0) |
540 | if (speed < 0) |
572 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
541 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
573 | |
542 | |
574 | /* Copy over key_values, if any. */ |
543 | /* Copy over key_values, if any. */ |
575 | if (op2->key_values) |
544 | if (key_values) |
576 | { |
545 | { |
577 | key_value *tail = 0; |
546 | key_value *tail = 0; |
578 | key_value *i; |
547 | key_value *i; |
579 | |
548 | |
580 | op->key_values = 0; |
549 | dst->key_values = 0; |
581 | |
550 | |
582 | for (i = op2->key_values; i; i = i->next) |
551 | for (i = key_values; i; i = i->next) |
583 | { |
552 | { |
584 | key_value *new_link = new key_value; |
553 | key_value *new_link = new key_value; |
585 | |
554 | |
586 | new_link->next = 0; |
555 | new_link->next = 0; |
587 | new_link->key = i->key; |
556 | new_link->key = i->key; |
588 | new_link->value = i->value; |
557 | new_link->value = i->value; |
589 | |
558 | |
590 | /* Try and be clever here, too. */ |
559 | /* Try and be clever here, too. */ |
591 | if (!op->key_values) |
560 | if (!dst->key_values) |
592 | { |
561 | { |
593 | op->key_values = new_link; |
562 | dst->key_values = new_link; |
594 | tail = new_link; |
563 | tail = new_link; |
595 | } |
564 | } |
596 | else |
565 | else |
597 | { |
566 | { |
598 | tail->next = new_link; |
567 | tail->next = new_link; |
599 | tail = new_link; |
568 | tail = new_link; |
600 | } |
569 | } |
601 | } |
570 | } |
602 | } |
571 | } |
603 | |
572 | |
604 | update_ob_speed (op); |
573 | update_ob_speed (dst); |
|
|
574 | } |
|
|
575 | |
|
|
576 | object * |
|
|
577 | object::clone () |
|
|
578 | { |
|
|
579 | object *neu = create (); |
|
|
580 | copy_to (neu); |
|
|
581 | return neu; |
605 | } |
582 | } |
606 | |
583 | |
607 | /* |
584 | /* |
608 | * If an object with the IS_TURNABLE() flag needs to be turned due |
585 | * If an object with the IS_TURNABLE() flag needs to be turned due |
609 | * to the closest player being on the other side, this function can |
586 | * to the closest player being on the other side, this function can |
… | |
… | |
717 | op->active_next = NULL; |
694 | op->active_next = NULL; |
718 | op->active_prev = NULL; |
695 | op->active_prev = NULL; |
719 | } |
696 | } |
720 | |
697 | |
721 | /* |
698 | /* |
722 | * update_object() updates the array which represents the map. |
699 | * update_object() updates the the map. |
723 | * It takes into account invisible objects (and represent squares covered |
700 | * It takes into account invisible objects (and represent squares covered |
724 | * by invisible objects by whatever is below them (unless it's another |
701 | * by invisible objects by whatever is below them (unless it's another |
725 | * invisible object, etc...) |
702 | * invisible object, etc...) |
726 | * If the object being updated is beneath a player, the look-window |
703 | * If the object being updated is beneath a player, the look-window |
727 | * of that player is updated (this might be a suboptimal way of |
704 | * of that player is updated (this might be a suboptimal way of |
728 | * updating that window, though, since update_object() is called _often_) |
705 | * updating that window, though, since update_object() is called _often_) |
729 | * |
706 | * |
730 | * action is a hint of what the caller believes need to be done. |
707 | * action is a hint of what the caller believes need to be done. |
731 | * For example, if the only thing that has changed is the face (due to |
|
|
732 | * an animation), we don't need to call update_position until that actually |
|
|
733 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
734 | * of walls or living creatures may need us to update the flags now. |
|
|
735 | * current action are: |
708 | * current action are: |
736 | * UP_OBJ_INSERT: op was inserted |
709 | * UP_OBJ_INSERT: op was inserted |
737 | * UP_OBJ_REMOVE: op was removed |
710 | * UP_OBJ_REMOVE: op was removed |
738 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
711 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
739 | * as that is easier than trying to look at what may have changed. |
712 | * as that is easier than trying to look at what may have changed. |
740 | * UP_OBJ_FACE: only the objects face has changed. |
713 | * UP_OBJ_FACE: only the objects face has changed. |
741 | */ |
714 | */ |
742 | |
|
|
743 | void |
715 | void |
744 | update_object (object *op, int action) |
716 | update_object (object *op, int action) |
745 | { |
717 | { |
746 | int update_now = 0, flags; |
|
|
747 | MoveType move_on, move_off, move_block, move_slow; |
718 | MoveType move_on, move_off, move_block, move_slow; |
748 | |
719 | |
749 | if (op == NULL) |
720 | if (op == NULL) |
750 | { |
721 | { |
751 | /* this should never happen */ |
722 | /* this should never happen */ |
752 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
723 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
753 | return; |
724 | return; |
754 | } |
725 | } |
755 | |
726 | |
756 | if (op->env != NULL) |
727 | if (op->env) |
757 | { |
728 | { |
758 | /* Animation is currently handled by client, so nothing |
729 | /* Animation is currently handled by client, so nothing |
759 | * to do in this case. |
730 | * to do in this case. |
760 | */ |
731 | */ |
761 | return; |
732 | return; |
… | |
… | |
775 | abort (); |
746 | abort (); |
776 | #endif |
747 | #endif |
777 | return; |
748 | return; |
778 | } |
749 | } |
779 | |
750 | |
780 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
751 | mapspace &m = op->map->at (op->x, op->y); |
781 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
782 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
783 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
784 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
785 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
786 | |
752 | |
|
|
753 | if (m.flags_ & P_NEED_UPDATE) |
|
|
754 | /* nop */; |
787 | if (action == UP_OBJ_INSERT) |
755 | else if (action == UP_OBJ_INSERT) |
788 | { |
756 | { |
|
|
757 | // this is likely overkill, TODO: revisit (schmorp) |
789 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
758 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
790 | update_now = 1; |
|
|
791 | |
|
|
792 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
759 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
793 | update_now = 1; |
760 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
794 | |
761 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
762 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
795 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
763 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
796 | update_now = 1; |
|
|
797 | |
|
|
798 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
799 | update_now = 1; |
|
|
800 | |
|
|
801 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
802 | update_now = 1; |
|
|
803 | |
|
|
804 | if ((move_on | op->move_on) != move_on) |
764 | || (m.move_on | op->move_on ) != m.move_on |
805 | update_now = 1; |
|
|
806 | |
|
|
807 | if ((move_off | op->move_off) != move_off) |
765 | || (m.move_off | op->move_off ) != m.move_off |
808 | update_now = 1; |
766 | || (m.move_slow | op->move_slow) != m.move_slow |
809 | |
|
|
810 | /* This isn't perfect, but I don't expect a lot of objects to |
767 | /* This isn't perfect, but I don't expect a lot of objects to |
811 | * to have move_allow right now. |
768 | * to have move_allow right now. |
812 | */ |
769 | */ |
813 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
770 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
814 | update_now = 1; |
771 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
815 | |
772 | m.flags_ = P_NEED_UPDATE; |
816 | if ((move_slow | op->move_slow) != move_slow) |
|
|
817 | update_now = 1; |
|
|
818 | } |
773 | } |
819 | /* if the object is being removed, we can't make intelligent |
774 | /* if the object is being removed, we can't make intelligent |
820 | * decisions, because remove_ob can't really pass the object |
775 | * decisions, because remove_ob can't really pass the object |
821 | * that is being removed. |
776 | * that is being removed. |
822 | */ |
777 | */ |
823 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
778 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
824 | update_now = 1; |
779 | m.flags_ = P_NEED_UPDATE; |
825 | else if (action == UP_OBJ_FACE) |
780 | else if (action == UP_OBJ_FACE) |
826 | /* Nothing to do for that case */ ; |
781 | /* Nothing to do for that case */ ; |
827 | else |
782 | else |
828 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
783 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
829 | |
784 | |
830 | if (update_now) |
|
|
831 | { |
|
|
832 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
833 | update_position (op->map, op->x, op->y); |
|
|
834 | } |
|
|
835 | |
|
|
836 | if (op->more != NULL) |
785 | if (op->more) |
837 | update_object (op->more, action); |
786 | update_object (op->more, action); |
838 | } |
787 | } |
839 | |
788 | |
840 | static unordered_vector<object *> mortals; |
789 | object::vector object::mortals; |
841 | static std::vector<object *> freed; |
790 | object::vector object::objects; // not yet used |
|
|
791 | object *object::first; |
842 | |
792 | |
843 | void object::free_mortals () |
793 | void object::free_mortals () |
844 | { |
794 | { |
845 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
795 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
846 | if ((*i)->refcnt) |
796 | if ((*i)->refcnt) |
847 | ++i; // further delay freeing |
797 | ++i; // further delay freeing |
848 | else |
798 | else |
849 | { |
799 | { |
850 | freed.push_back (*i);//D |
|
|
851 | //delete *i; |
800 | delete *i; |
852 | mortals.erase (i); |
801 | mortals.erase (i); |
853 | } |
802 | } |
854 | |
|
|
855 | if (mortals.size())//D |
|
|
856 | LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D |
|
|
857 | } |
803 | } |
858 | |
804 | |
859 | object::object () |
805 | object::object () |
860 | { |
806 | { |
861 | SET_FLAG (this, FLAG_REMOVED); |
807 | SET_FLAG (this, FLAG_REMOVED); |
862 | |
808 | |
863 | expmul = 1.0; |
809 | expmul = 1.0; |
864 | face = blank_face; |
810 | face = blank_face; |
865 | attacked_by_count = -1; |
|
|
866 | } |
811 | } |
867 | |
812 | |
868 | object::~object () |
813 | object::~object () |
869 | { |
814 | { |
870 | free_key_values (this); |
815 | free_key_values (this); |
871 | } |
816 | } |
872 | |
817 | |
873 | void object::link () |
818 | void object::link () |
874 | { |
819 | { |
875 | count = ++ob_count; |
820 | count = ++ob_count; |
|
|
821 | uuid = gen_uuid (); |
876 | |
822 | |
877 | prev = 0; |
823 | prev = 0; |
878 | next = objects; |
824 | next = object::first; |
879 | |
825 | |
880 | if (objects) |
826 | if (object::first) |
881 | objects->prev = this; |
827 | object::first->prev = this; |
882 | |
828 | |
883 | objects = this; |
829 | object::first = this; |
884 | } |
830 | } |
885 | |
831 | |
886 | void object::unlink () |
832 | void object::unlink () |
887 | { |
833 | { |
888 | count = 0; |
834 | if (this == object::first) |
|
|
835 | object::first = next; |
889 | |
836 | |
890 | /* Remove this object from the list of used objects */ |
837 | /* Remove this object from the list of used objects */ |
891 | if (prev) |
|
|
892 | { |
|
|
893 | prev->next = next; |
838 | if (prev) prev->next = next; |
|
|
839 | if (next) next->prev = prev; |
|
|
840 | |
894 | prev = 0; |
841 | prev = 0; |
895 | } |
|
|
896 | |
|
|
897 | if (next) |
|
|
898 | { |
|
|
899 | next->prev = prev; |
|
|
900 | next = 0; |
842 | next = 0; |
901 | } |
|
|
902 | |
|
|
903 | if (this == objects) |
|
|
904 | objects = next; |
|
|
905 | } |
843 | } |
906 | |
844 | |
907 | object *object::create () |
845 | object *object::create () |
908 | { |
846 | { |
909 | object *op; |
|
|
910 | |
|
|
911 | if (freed.empty ()) |
|
|
912 | op = new object; |
847 | object *op = new object; |
913 | else |
|
|
914 | { |
|
|
915 | // highly annoying, but the only way to get it stable right now |
|
|
916 | op = freed.back (); |
|
|
917 | freed.pop_back (); |
|
|
918 | op->~object (); |
|
|
919 | new ((void *) op) object; |
|
|
920 | } |
|
|
921 | |
|
|
922 | op->link (); |
848 | op->link (); |
923 | return op; |
849 | return op; |
924 | } |
850 | } |
925 | |
851 | |
926 | /* |
852 | /* |
… | |
… | |
928 | * it from the list of used objects, and puts it on the list of |
854 | * it from the list of used objects, and puts it on the list of |
929 | * free objects. The IS_FREED() flag is set in the object. |
855 | * free objects. The IS_FREED() flag is set in the object. |
930 | * The object must have been removed by remove_ob() first for |
856 | * The object must have been removed by remove_ob() first for |
931 | * this function to succeed. |
857 | * this function to succeed. |
932 | * |
858 | * |
933 | * If free_inventory is set, free inventory as well. Else drop items in |
859 | * If destroy_inventory is set, free inventory as well. Else drop items in |
934 | * inventory to the ground. |
860 | * inventory to the ground. |
935 | */ |
861 | */ |
936 | void object::free (bool free_inventory) |
862 | void object::destroy (bool destroy_inventory) |
937 | { |
863 | { |
938 | if (QUERY_FLAG (this, FLAG_FREED)) |
864 | if (QUERY_FLAG (this, FLAG_FREED)) |
939 | return; |
865 | return; |
940 | |
866 | |
941 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
867 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
942 | remove_friendly_object (this); |
868 | remove_friendly_object (this); |
943 | |
869 | |
944 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
870 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
945 | remove_ob (this); |
871 | remove (); |
946 | |
872 | |
947 | SET_FLAG (this, FLAG_FREED); |
873 | SET_FLAG (this, FLAG_FREED); |
948 | |
874 | |
949 | if (more) |
875 | if (more) |
950 | { |
876 | { |
951 | more->free (free_inventory); |
877 | more->destroy (destroy_inventory); |
952 | more = 0; |
878 | more = 0; |
953 | } |
879 | } |
954 | |
880 | |
955 | if (inv) |
881 | if (inv) |
956 | { |
882 | { |
957 | /* Only if the space blocks everything do we not process - |
883 | /* Only if the space blocks everything do we not process - |
958 | * if some form of movement is allowed, let objects |
884 | * if some form of movement is allowed, let objects |
959 | * drop on that space. |
885 | * drop on that space. |
960 | */ |
886 | */ |
961 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
887 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
962 | { |
888 | { |
963 | object *op = inv; |
889 | object *op = inv; |
964 | |
890 | |
965 | while (op) |
891 | while (op) |
966 | { |
892 | { |
967 | object *tmp = op->below; |
893 | object *tmp = op->below; |
968 | op->free (free_inventory); |
894 | op->destroy (destroy_inventory); |
969 | op = tmp; |
895 | op = tmp; |
970 | } |
896 | } |
971 | } |
897 | } |
972 | else |
898 | else |
973 | { /* Put objects in inventory onto this space */ |
899 | { /* Put objects in inventory onto this space */ |
… | |
… | |
975 | |
901 | |
976 | while (op) |
902 | while (op) |
977 | { |
903 | { |
978 | object *tmp = op->below; |
904 | object *tmp = op->below; |
979 | |
905 | |
980 | remove_ob (op); |
906 | op->remove (); |
981 | |
907 | |
982 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
908 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
983 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
909 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
984 | free_object (op); |
910 | op->destroy (); |
985 | else |
911 | else |
986 | { |
912 | { |
987 | op->x = x; |
913 | op->x = x; |
988 | op->y = y; |
914 | op->y = y; |
989 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
915 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
992 | op = tmp; |
918 | op = tmp; |
993 | } |
919 | } |
994 | } |
920 | } |
995 | } |
921 | } |
996 | |
922 | |
|
|
923 | // hack to ensure that freed objects still have a valid map |
|
|
924 | { |
|
|
925 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
926 | |
|
|
927 | if (!freed_map) |
|
|
928 | { |
|
|
929 | freed_map = new maptile; |
|
|
930 | |
|
|
931 | freed_map->name = "/internal/freed_objects_map"; |
|
|
932 | freed_map->width = 3; |
|
|
933 | freed_map->height = 3; |
|
|
934 | |
|
|
935 | freed_map->allocate (); |
|
|
936 | } |
|
|
937 | |
|
|
938 | map = freed_map; |
|
|
939 | x = 1; |
|
|
940 | y = 1; |
|
|
941 | } |
|
|
942 | |
|
|
943 | // clear those pointers that likely might have circular references to us |
997 | owner = 0; |
944 | owner = 0; |
|
|
945 | enemy = 0; |
|
|
946 | attacked_by = 0; |
|
|
947 | |
|
|
948 | // only relevant for players(?), but make sure of it anyways |
|
|
949 | contr = 0; |
998 | |
950 | |
999 | /* Remove object from the active list */ |
951 | /* Remove object from the active list */ |
1000 | speed = 0; |
952 | speed = 0; |
1001 | update_ob_speed (this); |
953 | update_ob_speed (this); |
1002 | |
954 | |
… | |
… | |
1007 | |
959 | |
1008 | /* |
960 | /* |
1009 | * sub_weight() recursively (outwards) subtracts a number from the |
961 | * sub_weight() recursively (outwards) subtracts a number from the |
1010 | * weight of an object (and what is carried by it's environment(s)). |
962 | * weight of an object (and what is carried by it's environment(s)). |
1011 | */ |
963 | */ |
1012 | |
|
|
1013 | void |
964 | void |
1014 | sub_weight (object *op, signed long weight) |
965 | sub_weight (object *op, signed long weight) |
1015 | { |
966 | { |
1016 | while (op != NULL) |
967 | while (op != NULL) |
1017 | { |
968 | { |
1018 | if (op->type == CONTAINER) |
969 | if (op->type == CONTAINER) |
1019 | { |
|
|
1020 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
970 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1021 | } |
971 | |
1022 | op->carrying -= weight; |
972 | op->carrying -= weight; |
1023 | op = op->env; |
973 | op = op->env; |
1024 | } |
974 | } |
1025 | } |
975 | } |
1026 | |
976 | |
1027 | /* remove_ob(op): |
977 | /* op->remove (): |
1028 | * This function removes the object op from the linked list of objects |
978 | * This function removes the object op from the linked list of objects |
1029 | * which it is currently tied to. When this function is done, the |
979 | * which it is currently tied to. When this function is done, the |
1030 | * object will have no environment. If the object previously had an |
980 | * object will have no environment. If the object previously had an |
1031 | * environment, the x and y coordinates will be updated to |
981 | * environment, the x and y coordinates will be updated to |
1032 | * the previous environment. |
982 | * the previous environment. |
1033 | * Beware: This function is called from the editor as well! |
983 | * Beware: This function is called from the editor as well! |
1034 | */ |
984 | */ |
1035 | |
|
|
1036 | void |
985 | void |
1037 | remove_ob (object *op) |
986 | object::remove () |
1038 | { |
987 | { |
|
|
988 | object *tmp, *last = 0; |
1039 | object * |
989 | object *otmp; |
1040 | tmp, * |
|
|
1041 | last = NULL; |
|
|
1042 | object * |
|
|
1043 | otmp; |
|
|
1044 | |
990 | |
1045 | tag_t |
|
|
1046 | tag; |
|
|
1047 | int |
|
|
1048 | check_walk_off; |
991 | int check_walk_off; |
1049 | mapstruct * |
|
|
1050 | m; |
|
|
1051 | |
992 | |
1052 | sint16 |
|
|
1053 | x, |
|
|
1054 | y; |
|
|
1055 | |
|
|
1056 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
993 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1057 | return; |
994 | return; |
1058 | |
995 | |
1059 | SET_FLAG (op, FLAG_REMOVED); |
996 | SET_FLAG (this, FLAG_REMOVED); |
1060 | |
997 | |
1061 | if (op->more != NULL) |
998 | if (more) |
1062 | remove_ob (op->more); |
999 | more->remove (); |
1063 | |
1000 | |
1064 | /* |
1001 | /* |
1065 | * In this case, the object to be removed is in someones |
1002 | * In this case, the object to be removed is in someones |
1066 | * inventory. |
1003 | * inventory. |
1067 | */ |
1004 | */ |
1068 | if (op->env != NULL) |
1005 | if (env) |
1069 | { |
1006 | { |
1070 | if (op->nrof) |
1007 | if (nrof) |
1071 | sub_weight (op->env, op->weight * op->nrof); |
1008 | sub_weight (env, weight * nrof); |
1072 | else |
1009 | else |
1073 | sub_weight (op->env, op->weight + op->carrying); |
1010 | sub_weight (env, weight + carrying); |
1074 | |
1011 | |
1075 | /* NO_FIX_PLAYER is set when a great many changes are being |
1012 | /* NO_FIX_PLAYER is set when a great many changes are being |
1076 | * made to players inventory. If set, avoiding the call |
1013 | * made to players inventory. If set, avoiding the call |
1077 | * to save cpu time. |
1014 | * to save cpu time. |
1078 | */ |
1015 | */ |
1079 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1016 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1080 | fix_player (otmp); |
1017 | fix_player (otmp); |
1081 | |
1018 | |
1082 | if (op->above != NULL) |
1019 | if (above != NULL) |
1083 | op->above->below = op->below; |
1020 | above->below = below; |
1084 | else |
1021 | else |
1085 | op->env->inv = op->below; |
1022 | env->inv = below; |
1086 | |
1023 | |
1087 | if (op->below != NULL) |
1024 | if (below != NULL) |
1088 | op->below->above = op->above; |
1025 | below->above = above; |
1089 | |
1026 | |
1090 | /* we set up values so that it could be inserted into |
1027 | /* we set up values so that it could be inserted into |
1091 | * the map, but we don't actually do that - it is up |
1028 | * the map, but we don't actually do that - it is up |
1092 | * to the caller to decide what we want to do. |
1029 | * to the caller to decide what we want to do. |
1093 | */ |
1030 | */ |
1094 | op->x = op->env->x, op->y = op->env->y; |
1031 | x = env->x, y = env->y; |
1095 | op->map = op->env->map; |
1032 | map = env->map; |
1096 | op->above = NULL, op->below = NULL; |
1033 | above = 0, below = 0; |
1097 | op->env = NULL; |
1034 | env = 0; |
1098 | } |
1035 | } |
1099 | else if (op->map) |
1036 | else if (map) |
1100 | { |
1037 | { |
1101 | x = op->x; |
|
|
1102 | y = op->y; |
|
|
1103 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1104 | |
|
|
1105 | if (!m) |
|
|
1106 | { |
|
|
1107 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1108 | op->map->path, op->x, op->y); |
|
|
1109 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1110 | * it seems if we get into this case, something is probablye |
|
|
1111 | * screwed up and should be fixed. |
|
|
1112 | */ |
|
|
1113 | abort (); |
|
|
1114 | } |
|
|
1115 | |
|
|
1116 | if (op->map != m) |
|
|
1117 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1118 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1119 | |
|
|
1120 | /* Re did the following section of code - it looks like it had |
1038 | /* Re did the following section of code - it looks like it had |
1121 | * lots of logic for things we no longer care about |
1039 | * lots of logic for things we no longer care about |
1122 | */ |
1040 | */ |
1123 | |
1041 | |
1124 | /* link the object above us */ |
1042 | /* link the object above us */ |
1125 | if (op->above) |
1043 | if (above) |
1126 | op->above->below = op->below; |
1044 | above->below = below; |
1127 | else |
1045 | else |
1128 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1046 | map->at (x, y).top = below; /* we were top, set new top */ |
1129 | |
1047 | |
1130 | /* Relink the object below us, if there is one */ |
1048 | /* Relink the object below us, if there is one */ |
1131 | if (op->below) |
1049 | if (below) |
1132 | op->below->above = op->above; |
1050 | below->above = above; |
1133 | else |
1051 | else |
1134 | { |
1052 | { |
1135 | /* Nothing below, which means we need to relink map object for this space |
1053 | /* Nothing below, which means we need to relink map object for this space |
1136 | * use translated coordinates in case some oddness with map tiling is |
1054 | * use translated coordinates in case some oddness with map tiling is |
1137 | * evident |
1055 | * evident |
1138 | */ |
1056 | */ |
1139 | if (GET_MAP_OB (m, x, y) != op) |
1057 | if (GET_MAP_OB (map, x, y) != this) |
1140 | { |
1058 | { |
1141 | dump_object (op); |
1059 | char *dump = dump_object (this); |
1142 | LOG (llevError, |
1060 | LOG (llevError, |
1143 | "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); |
1061 | "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); |
|
|
1062 | free (dump); |
1144 | dump_object (GET_MAP_OB (m, x, y)); |
1063 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1145 | LOG (llevError, "%s\n", errmsg); |
1064 | LOG (llevError, "%s\n", dump); |
|
|
1065 | free (dump); |
1146 | } |
1066 | } |
1147 | |
1067 | |
1148 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1068 | map->at (x, y).bottom = above; /* goes on above it. */ |
1149 | } |
1069 | } |
1150 | |
1070 | |
1151 | op->above = 0; |
1071 | above = 0; |
1152 | op->below = 0; |
1072 | below = 0; |
1153 | |
1073 | |
1154 | if (op->map->in_memory == MAP_SAVING) |
1074 | if (map->in_memory == MAP_SAVING) |
1155 | return; |
1075 | return; |
1156 | |
1076 | |
1157 | tag = op->count; |
|
|
1158 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1077 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1159 | |
1078 | |
1160 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1079 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1161 | { |
1080 | { |
1162 | /* No point updating the players look faces if he is the object |
1081 | /* No point updating the players look faces if he is the object |
1163 | * being removed. |
1082 | * being removed. |
1164 | */ |
1083 | */ |
1165 | |
1084 | |
1166 | if (tmp->type == PLAYER && tmp != op) |
1085 | if (tmp->type == PLAYER && tmp != this) |
1167 | { |
1086 | { |
1168 | /* If a container that the player is currently using somehow gets |
1087 | /* If a container that the player is currently using somehow gets |
1169 | * removed (most likely destroyed), update the player view |
1088 | * removed (most likely destroyed), update the player view |
1170 | * appropriately. |
1089 | * appropriately. |
1171 | */ |
1090 | */ |
1172 | if (tmp->container == op) |
1091 | if (tmp->container == this) |
1173 | { |
1092 | { |
1174 | CLEAR_FLAG (op, FLAG_APPLIED); |
1093 | CLEAR_FLAG (this, FLAG_APPLIED); |
1175 | tmp->container = NULL; |
1094 | tmp->container = 0; |
1176 | } |
1095 | } |
1177 | |
1096 | |
1178 | tmp->contr->socket.update_look = 1; |
1097 | tmp->contr->socket->floorbox_update (); |
1179 | } |
1098 | } |
1180 | |
1099 | |
1181 | /* See if player moving off should effect something */ |
1100 | /* See if player moving off should effect something */ |
1182 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1101 | if (check_walk_off |
|
|
1102 | && ((move_type & tmp->move_off) |
|
|
1103 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1183 | { |
1104 | { |
1184 | move_apply (tmp, op, NULL); |
1105 | move_apply (tmp, this, 0); |
1185 | |
1106 | |
1186 | if (was_destroyed (op, tag)) |
1107 | if (destroyed ()) |
1187 | { |
|
|
1188 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1108 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1189 | } |
|
|
1190 | } |
1109 | } |
1191 | |
1110 | |
1192 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1111 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1193 | |
1112 | |
1194 | if (tmp->above == tmp) |
1113 | if (tmp->above == tmp) |
1195 | tmp->above = NULL; |
1114 | tmp->above = 0; |
1196 | |
1115 | |
1197 | last = tmp; |
1116 | last = tmp; |
1198 | } |
1117 | } |
1199 | |
1118 | |
1200 | /* last == NULL of there are no objects on this space */ |
1119 | /* last == NULL of there are no objects on this space */ |
1201 | if (last == NULL) |
1120 | if (!last) |
1202 | { |
1121 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1203 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1204 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1205 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1206 | * be correct anyways. |
|
|
1207 | */ |
|
|
1208 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1209 | update_position (op->map, op->x, op->y); |
|
|
1210 | } |
|
|
1211 | else |
1122 | else |
1212 | update_object (last, UP_OBJ_REMOVE); |
1123 | update_object (last, UP_OBJ_REMOVE); |
1213 | |
1124 | |
1214 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1125 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1215 | update_all_los (op->map, op->x, op->y); |
1126 | update_all_los (map, x, y); |
1216 | } |
1127 | } |
1217 | } |
1128 | } |
1218 | |
1129 | |
1219 | /* |
1130 | /* |
1220 | * merge_ob(op,top): |
1131 | * merge_ob(op,top): |
… | |
… | |
1222 | * This function goes through all objects below and including top, and |
1133 | * This function goes through all objects below and including top, and |
1223 | * merges op to the first matching object. |
1134 | * merges op to the first matching object. |
1224 | * If top is NULL, it is calculated. |
1135 | * If top is NULL, it is calculated. |
1225 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1136 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1226 | */ |
1137 | */ |
1227 | |
|
|
1228 | object * |
1138 | object * |
1229 | merge_ob (object *op, object *top) |
1139 | merge_ob (object *op, object *top) |
1230 | { |
1140 | { |
1231 | if (!op->nrof) |
1141 | if (!op->nrof) |
1232 | return 0; |
1142 | return 0; |
… | |
… | |
1236 | |
1146 | |
1237 | for (; top != NULL; top = top->below) |
1147 | for (; top != NULL; top = top->below) |
1238 | { |
1148 | { |
1239 | if (top == op) |
1149 | if (top == op) |
1240 | continue; |
1150 | continue; |
1241 | if (CAN_MERGE (op, top)) |
1151 | |
|
|
1152 | if (object::can_merge (op, top)) |
1242 | { |
1153 | { |
1243 | top->nrof += op->nrof; |
1154 | top->nrof += op->nrof; |
1244 | |
1155 | |
1245 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1156 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1246 | op->weight = 0; /* Don't want any adjustements now */ |
1157 | op->weight = 0; /* Don't want any adjustements now */ |
1247 | remove_ob (op); |
1158 | op->destroy (); |
1248 | free_object (op); |
|
|
1249 | return top; |
1159 | return top; |
1250 | } |
1160 | } |
1251 | } |
1161 | } |
1252 | |
1162 | |
1253 | return NULL; |
1163 | return 0; |
1254 | } |
1164 | } |
1255 | |
1165 | |
1256 | /* |
1166 | /* |
1257 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1167 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1258 | * job preparing multi-part monsters |
1168 | * job preparing multi-part monsters |
1259 | */ |
1169 | */ |
1260 | object * |
1170 | object * |
1261 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1171 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1262 | { |
1172 | { |
1263 | object *tmp; |
1173 | object *tmp; |
1264 | |
1174 | |
1265 | if (op->head) |
1175 | if (op->head) |
1266 | op = op->head; |
1176 | op = op->head; |
… | |
… | |
1294 | * NULL if 'op' was destroyed |
1204 | * NULL if 'op' was destroyed |
1295 | * just 'op' otherwise |
1205 | * just 'op' otherwise |
1296 | */ |
1206 | */ |
1297 | |
1207 | |
1298 | object * |
1208 | object * |
1299 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1209 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1300 | { |
1210 | { |
1301 | object *tmp, *top, *floor = NULL; |
1211 | object *tmp, *top, *floor = NULL; |
1302 | sint16 x, y; |
1212 | sint16 x, y; |
1303 | |
1213 | |
1304 | if (QUERY_FLAG (op, FLAG_FREED)) |
1214 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1307 | return NULL; |
1217 | return NULL; |
1308 | } |
1218 | } |
1309 | |
1219 | |
1310 | if (m == NULL) |
1220 | if (m == NULL) |
1311 | { |
1221 | { |
1312 | dump_object (op); |
1222 | char *dump = dump_object (op); |
1313 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1223 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1224 | free (dump); |
1314 | return op; |
1225 | return op; |
1315 | } |
1226 | } |
1316 | |
1227 | |
1317 | if (out_of_map (m, op->x, op->y)) |
1228 | if (out_of_map (m, op->x, op->y)) |
1318 | { |
1229 | { |
1319 | dump_object (op); |
1230 | char *dump = dump_object (op); |
1320 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1231 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1321 | #ifdef MANY_CORES |
1232 | #ifdef MANY_CORES |
1322 | /* Better to catch this here, as otherwise the next use of this object |
1233 | /* Better to catch this here, as otherwise the next use of this object |
1323 | * is likely to cause a crash. Better to find out where it is getting |
1234 | * is likely to cause a crash. Better to find out where it is getting |
1324 | * improperly inserted. |
1235 | * improperly inserted. |
1325 | */ |
1236 | */ |
1326 | abort (); |
1237 | abort (); |
1327 | #endif |
1238 | #endif |
|
|
1239 | free (dump); |
1328 | return op; |
1240 | return op; |
1329 | } |
1241 | } |
1330 | |
1242 | |
1331 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1243 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1332 | { |
1244 | { |
1333 | dump_object (op); |
1245 | char *dump = dump_object (op); |
1334 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1246 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1247 | free (dump); |
1335 | return op; |
1248 | return op; |
1336 | } |
1249 | } |
1337 | |
1250 | |
1338 | if (op->more != NULL) |
1251 | if (op->more != NULL) |
1339 | { |
1252 | { |
… | |
… | |
1377 | |
1290 | |
1378 | /* this has to be done after we translate the coordinates. |
1291 | /* this has to be done after we translate the coordinates. |
1379 | */ |
1292 | */ |
1380 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1293 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1381 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1294 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1382 | if (CAN_MERGE (op, tmp)) |
1295 | if (object::can_merge (op, tmp)) |
1383 | { |
1296 | { |
1384 | op->nrof += tmp->nrof; |
1297 | op->nrof += tmp->nrof; |
1385 | remove_ob (tmp); |
1298 | tmp->destroy (); |
1386 | free_object (tmp); |
|
|
1387 | } |
1299 | } |
1388 | |
1300 | |
1389 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1301 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1390 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1302 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1391 | |
1303 | |
… | |
… | |
1404 | op->below = originator->below; |
1316 | op->below = originator->below; |
1405 | |
1317 | |
1406 | if (op->below) |
1318 | if (op->below) |
1407 | op->below->above = op; |
1319 | op->below->above = op; |
1408 | else |
1320 | else |
1409 | SET_MAP_OB (op->map, op->x, op->y, op); |
1321 | op->map->at (op->x, op->y).bottom = op; |
1410 | |
1322 | |
1411 | /* since *below* originator, no need to update top */ |
1323 | /* since *below* originator, no need to update top */ |
1412 | originator->below = op; |
1324 | originator->below = op; |
1413 | } |
1325 | } |
1414 | else |
1326 | else |
… | |
… | |
1460 | * If INS_ON_TOP is used, don't do this processing |
1372 | * If INS_ON_TOP is used, don't do this processing |
1461 | * Need to find the object that in fact blocks view, otherwise |
1373 | * Need to find the object that in fact blocks view, otherwise |
1462 | * stacking is a bit odd. |
1374 | * stacking is a bit odd. |
1463 | */ |
1375 | */ |
1464 | if (!(flag & INS_ON_TOP) && |
1376 | if (!(flag & INS_ON_TOP) && |
1465 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1377 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1466 | { |
1378 | { |
1467 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1468 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1469 | break; |
1381 | break; |
1470 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1493 | |
1405 | |
1494 | if (op->above) |
1406 | if (op->above) |
1495 | op->above->below = op; |
1407 | op->above->below = op; |
1496 | |
1408 | |
1497 | op->below = NULL; |
1409 | op->below = NULL; |
1498 | SET_MAP_OB (op->map, op->x, op->y, op); |
1410 | op->map->at (op->x, op->y).bottom = op; |
1499 | } |
1411 | } |
1500 | else |
1412 | else |
1501 | { /* get inserted into the stack above top */ |
1413 | { /* get inserted into the stack above top */ |
1502 | op->above = top->above; |
1414 | op->above = top->above; |
1503 | |
1415 | |
… | |
… | |
1507 | op->below = top; |
1419 | op->below = top; |
1508 | top->above = op; |
1420 | top->above = op; |
1509 | } |
1421 | } |
1510 | |
1422 | |
1511 | if (op->above == NULL) |
1423 | if (op->above == NULL) |
1512 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1424 | op->map->at (op->x, op->y).top = op; |
1513 | } /* else not INS_BELOW_ORIGINATOR */ |
1425 | } /* else not INS_BELOW_ORIGINATOR */ |
1514 | |
1426 | |
1515 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1516 | op->contr->do_los = 1; |
1428 | op->contr->do_los = 1; |
1517 | |
1429 | |
1518 | /* If we have a floor, we know the player, if any, will be above |
1430 | /* If we have a floor, we know the player, if any, will be above |
1519 | * it, so save a few ticks and start from there. |
1431 | * it, so save a few ticks and start from there. |
1520 | */ |
1432 | */ |
1521 | if (!(flag & INS_MAP_LOAD)) |
1433 | if (!(flag & INS_MAP_LOAD)) |
1522 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1434 | if (object *pl = op->map->at (op->x, op->y).player ()) |
1523 | if (tmp->type == PLAYER) |
1435 | pl->contr->socket->floorbox_update (); |
1524 | tmp->contr->socket.update_look = 1; |
|
|
1525 | |
1436 | |
1526 | /* If this object glows, it may affect lighting conditions that are |
1437 | /* If this object glows, it may affect lighting conditions that are |
1527 | * visible to others on this map. But update_all_los is really |
1438 | * visible to others on this map. But update_all_los is really |
1528 | * an inefficient way to do this, as it means los for all players |
1439 | * an inefficient way to do this, as it means los for all players |
1529 | * on the map will get recalculated. The players could very well |
1440 | * on the map will get recalculated. The players could very well |
… | |
… | |
1537 | |
1448 | |
1538 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1539 | update_object (op, UP_OBJ_INSERT); |
1450 | update_object (op, UP_OBJ_INSERT); |
1540 | |
1451 | |
1541 | /* Don't know if moving this to the end will break anything. However, |
1452 | /* Don't know if moving this to the end will break anything. However, |
1542 | * we want to have update_look set above before calling this. |
1453 | * we want to have floorbox_update called before calling this. |
1543 | * |
1454 | * |
1544 | * check_move_on() must be after this because code called from |
1455 | * check_move_on() must be after this because code called from |
1545 | * check_move_on() depends on correct map flags (so functions like |
1456 | * check_move_on() depends on correct map flags (so functions like |
1546 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1547 | * update_object(). |
1458 | * update_object(). |
… | |
… | |
1563 | |
1474 | |
1564 | return op; |
1475 | return op; |
1565 | } |
1476 | } |
1566 | |
1477 | |
1567 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1568 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1569 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1570 | */ |
1481 | */ |
1571 | void |
1482 | void |
1572 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1573 | { |
1484 | { |
1574 | object * |
1485 | object *tmp, *tmp1; |
1575 | tmp; |
|
|
1576 | object * |
|
|
1577 | tmp1; |
|
|
1578 | |
1486 | |
1579 | /* first search for itself and remove any old instances */ |
1487 | /* first search for itself and remove any old instances */ |
1580 | |
1488 | |
1581 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1489 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1582 | { |
|
|
1583 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1490 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1584 | { |
1491 | tmp->destroy (); |
1585 | remove_ob (tmp); |
|
|
1586 | free_object (tmp); |
|
|
1587 | } |
|
|
1588 | } |
|
|
1589 | |
1492 | |
1590 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1493 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1591 | |
1494 | |
1592 | tmp1->x = op->x; |
1495 | tmp1->x = op->x; |
1593 | tmp1->y = op->y; |
1496 | tmp1->y = op->y; |
1594 | insert_ob_in_map (tmp1, op->map, op, 0); |
1497 | insert_ob_in_map (tmp1, op->map, op, 0); |
1595 | } |
1498 | } |
… | |
… | |
1603 | */ |
1506 | */ |
1604 | |
1507 | |
1605 | object * |
1508 | object * |
1606 | get_split_ob (object *orig_ob, uint32 nr) |
1509 | get_split_ob (object *orig_ob, uint32 nr) |
1607 | { |
1510 | { |
1608 | object * |
1511 | object *newob; |
1609 | newob; |
|
|
1610 | int |
|
|
1611 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1512 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1612 | |
1513 | |
1613 | if (orig_ob->nrof < nr) |
1514 | if (orig_ob->nrof < nr) |
1614 | { |
1515 | { |
1615 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1516 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1616 | return NULL; |
1517 | return NULL; |
1617 | } |
1518 | } |
1618 | |
1519 | |
1619 | newob = object_create_clone (orig_ob); |
1520 | newob = object_create_clone (orig_ob); |
1620 | |
1521 | |
1621 | if ((orig_ob->nrof -= nr) < 1) |
1522 | if ((orig_ob->nrof -= nr) < 1) |
1622 | { |
1523 | orig_ob->destroy (1); |
1623 | if (!is_removed) |
|
|
1624 | remove_ob (orig_ob); |
|
|
1625 | free_object2 (orig_ob, 1); |
|
|
1626 | } |
|
|
1627 | else if (!is_removed) |
1524 | else if (!is_removed) |
1628 | { |
1525 | { |
1629 | if (orig_ob->env != NULL) |
1526 | if (orig_ob->env != NULL) |
1630 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1527 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1631 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1528 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1661 | if (i > op->nrof) |
1558 | if (i > op->nrof) |
1662 | i = op->nrof; |
1559 | i = op->nrof; |
1663 | |
1560 | |
1664 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1561 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1665 | op->nrof -= i; |
1562 | op->nrof -= i; |
1666 | else if (op->env != NULL) |
1563 | else if (op->env) |
1667 | { |
1564 | { |
1668 | /* is this object in the players inventory, or sub container |
1565 | /* is this object in the players inventory, or sub container |
1669 | * therein? |
1566 | * therein? |
1670 | */ |
1567 | */ |
1671 | tmp = is_player_inv (op->env); |
1568 | tmp = op->in_player (); |
1672 | /* nope. Is this a container the player has opened? |
1569 | /* nope. Is this a container the player has opened? |
1673 | * If so, set tmp to that player. |
1570 | * If so, set tmp to that player. |
1674 | * IMO, searching through all the players will mostly |
1571 | * IMO, searching through all the players will mostly |
1675 | * likely be quicker than following op->env to the map, |
1572 | * likely be quicker than following op->env to the map, |
1676 | * and then searching the map for a player. |
1573 | * and then searching the map for a player. |
1677 | */ |
1574 | */ |
1678 | if (!tmp) |
1575 | if (!tmp) |
1679 | { |
1576 | { |
1680 | for (pl = first_player; pl; pl = pl->next) |
1577 | for (pl = first_player; pl; pl = pl->next) |
1681 | if (pl->ob->container == op->env) |
1578 | if (pl->ob->container == op->env) |
|
|
1579 | { |
|
|
1580 | tmp = pl->ob; |
1682 | break; |
1581 | break; |
1683 | if (pl) |
1582 | } |
1684 | tmp = pl->ob; |
|
|
1685 | else |
|
|
1686 | tmp = NULL; |
|
|
1687 | } |
1583 | } |
1688 | |
1584 | |
1689 | if (i < op->nrof) |
1585 | if (i < op->nrof) |
1690 | { |
1586 | { |
1691 | sub_weight (op->env, op->weight * i); |
1587 | sub_weight (op->env, op->weight * i); |
1692 | op->nrof -= i; |
1588 | op->nrof -= i; |
1693 | if (tmp) |
1589 | if (tmp) |
1694 | { |
|
|
1695 | esrv_send_item (tmp, op); |
1590 | esrv_send_item (tmp, op); |
1696 | } |
|
|
1697 | } |
1591 | } |
1698 | else |
1592 | else |
1699 | { |
1593 | { |
1700 | remove_ob (op); |
1594 | op->remove (); |
1701 | op->nrof = 0; |
1595 | op->nrof = 0; |
1702 | if (tmp) |
1596 | if (tmp) |
1703 | { |
|
|
1704 | esrv_del_item (tmp->contr, op->count); |
1597 | esrv_del_item (tmp->contr, op->count); |
1705 | } |
|
|
1706 | } |
1598 | } |
1707 | } |
1599 | } |
1708 | else |
1600 | else |
1709 | { |
1601 | { |
1710 | object *above = op->above; |
1602 | object *above = op->above; |
1711 | |
1603 | |
1712 | if (i < op->nrof) |
1604 | if (i < op->nrof) |
1713 | op->nrof -= i; |
1605 | op->nrof -= i; |
1714 | else |
1606 | else |
1715 | { |
1607 | { |
1716 | remove_ob (op); |
1608 | op->remove (); |
1717 | op->nrof = 0; |
1609 | op->nrof = 0; |
1718 | } |
1610 | } |
1719 | |
1611 | |
1720 | /* Since we just removed op, op->above is null */ |
1612 | /* Since we just removed op, op->above is null */ |
1721 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1613 | for (tmp = above; tmp; tmp = tmp->above) |
1722 | if (tmp->type == PLAYER) |
1614 | if (tmp->type == PLAYER) |
1723 | { |
1615 | { |
1724 | if (op->nrof) |
1616 | if (op->nrof) |
1725 | esrv_send_item (tmp, op); |
1617 | esrv_send_item (tmp, op); |
1726 | else |
1618 | else |
… | |
… | |
1730 | |
1622 | |
1731 | if (op->nrof) |
1623 | if (op->nrof) |
1732 | return op; |
1624 | return op; |
1733 | else |
1625 | else |
1734 | { |
1626 | { |
1735 | free_object (op); |
1627 | op->destroy (); |
1736 | return NULL; |
1628 | return 0; |
1737 | } |
1629 | } |
1738 | } |
1630 | } |
1739 | |
1631 | |
1740 | /* |
1632 | /* |
1741 | * add_weight(object, weight) adds the specified weight to an object, |
1633 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1753 | op->carrying += weight; |
1645 | op->carrying += weight; |
1754 | op = op->env; |
1646 | op = op->env; |
1755 | } |
1647 | } |
1756 | } |
1648 | } |
1757 | |
1649 | |
|
|
1650 | object * |
|
|
1651 | insert_ob_in_ob (object *op, object *where) |
|
|
1652 | { |
|
|
1653 | if (!where) |
|
|
1654 | { |
|
|
1655 | char *dump = dump_object (op); |
|
|
1656 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1657 | free (dump); |
|
|
1658 | return op; |
|
|
1659 | } |
|
|
1660 | |
|
|
1661 | if (where->head) |
|
|
1662 | { |
|
|
1663 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1664 | where = where->head; |
|
|
1665 | } |
|
|
1666 | |
|
|
1667 | return where->insert (op); |
|
|
1668 | } |
|
|
1669 | |
1758 | /* |
1670 | /* |
1759 | * insert_ob_in_ob(op,environment): |
1671 | * env->insert (op) |
1760 | * This function inserts the object op in the linked list |
1672 | * This function inserts the object op in the linked list |
1761 | * inside the object environment. |
1673 | * inside the object environment. |
1762 | * |
1674 | * |
1763 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1764 | * the inventory at the last position or next to other objects of the same |
|
|
1765 | * type. |
|
|
1766 | * Frank: Now sorted by type, archetype and magic! |
|
|
1767 | * |
|
|
1768 | * The function returns now pointer to inserted item, and return value can |
1675 | * The function returns now pointer to inserted item, and return value can |
1769 | * be != op, if items are merged. -Tero |
1676 | * be != op, if items are merged. -Tero |
1770 | */ |
1677 | */ |
1771 | |
1678 | |
1772 | object * |
1679 | object * |
1773 | insert_ob_in_ob (object *op, object *where) |
1680 | object::insert (object *op) |
1774 | { |
1681 | { |
1775 | object * |
1682 | object *tmp, *otmp; |
1776 | tmp, * |
|
|
1777 | otmp; |
|
|
1778 | |
1683 | |
1779 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1684 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1780 | { |
1685 | op->remove (); |
1781 | dump_object (op); |
|
|
1782 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1783 | return op; |
|
|
1784 | } |
|
|
1785 | |
|
|
1786 | if (where == NULL) |
|
|
1787 | { |
|
|
1788 | dump_object (op); |
|
|
1789 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1790 | return op; |
|
|
1791 | } |
|
|
1792 | |
|
|
1793 | if (where->head) |
|
|
1794 | { |
|
|
1795 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1796 | where = where->head; |
|
|
1797 | } |
|
|
1798 | |
1686 | |
1799 | if (op->more) |
1687 | if (op->more) |
1800 | { |
1688 | { |
1801 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1689 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1802 | return op; |
1690 | return op; |
… | |
… | |
1804 | |
1692 | |
1805 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1693 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1806 | CLEAR_FLAG (op, FLAG_REMOVED); |
1694 | CLEAR_FLAG (op, FLAG_REMOVED); |
1807 | if (op->nrof) |
1695 | if (op->nrof) |
1808 | { |
1696 | { |
1809 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1697 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1810 | if (CAN_MERGE (tmp, op)) |
1698 | if (object::can_merge (tmp, op)) |
1811 | { |
1699 | { |
1812 | /* return the original object and remove inserted object |
1700 | /* return the original object and remove inserted object |
1813 | (client needs the original object) */ |
1701 | (client needs the original object) */ |
1814 | tmp->nrof += op->nrof; |
1702 | tmp->nrof += op->nrof; |
1815 | /* Weight handling gets pretty funky. Since we are adding to |
1703 | /* Weight handling gets pretty funky. Since we are adding to |
1816 | * tmp->nrof, we need to increase the weight. |
1704 | * tmp->nrof, we need to increase the weight. |
1817 | */ |
1705 | */ |
1818 | add_weight (where, op->weight * op->nrof); |
1706 | add_weight (this, op->weight * op->nrof); |
1819 | SET_FLAG (op, FLAG_REMOVED); |
1707 | SET_FLAG (op, FLAG_REMOVED); |
1820 | free_object (op); /* free the inserted object */ |
1708 | op->destroy (); /* free the inserted object */ |
1821 | op = tmp; |
1709 | op = tmp; |
1822 | remove_ob (op); /* and fix old object's links */ |
1710 | op->remove (); /* and fix old object's links */ |
1823 | CLEAR_FLAG (op, FLAG_REMOVED); |
1711 | CLEAR_FLAG (op, FLAG_REMOVED); |
1824 | break; |
1712 | break; |
1825 | } |
1713 | } |
1826 | |
1714 | |
1827 | /* I assume combined objects have no inventory |
1715 | /* I assume combined objects have no inventory |
1828 | * We add the weight - this object could have just been removed |
1716 | * We add the weight - this object could have just been removed |
1829 | * (if it was possible to merge). calling remove_ob will subtract |
1717 | * (if it was possible to merge). calling remove_ob will subtract |
1830 | * the weight, so we need to add it in again, since we actually do |
1718 | * the weight, so we need to add it in again, since we actually do |
1831 | * the linking below |
1719 | * the linking below |
1832 | */ |
1720 | */ |
1833 | add_weight (where, op->weight * op->nrof); |
1721 | add_weight (this, op->weight * op->nrof); |
1834 | } |
1722 | } |
1835 | else |
1723 | else |
1836 | add_weight (where, (op->weight + op->carrying)); |
1724 | add_weight (this, (op->weight + op->carrying)); |
1837 | |
1725 | |
1838 | otmp = is_player_inv (where); |
1726 | otmp = this->in_player (); |
1839 | if (otmp && otmp->contr != NULL) |
1727 | if (otmp && otmp->contr) |
1840 | { |
|
|
1841 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1728 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1842 | fix_player (otmp); |
1729 | fix_player (otmp); |
1843 | } |
|
|
1844 | |
1730 | |
1845 | op->map = NULL; |
1731 | op->map = 0; |
1846 | op->env = where; |
1732 | op->env = this; |
1847 | op->above = NULL; |
1733 | op->above = 0; |
1848 | op->below = NULL; |
1734 | op->below = 0; |
1849 | op->x = 0, op->y = 0; |
1735 | op->x = 0, op->y = 0; |
1850 | |
1736 | |
1851 | /* reset the light list and los of the players on the map */ |
1737 | /* reset the light list and los of the players on the map */ |
1852 | if ((op->glow_radius != 0) && where->map) |
1738 | if ((op->glow_radius != 0) && map) |
1853 | { |
1739 | { |
1854 | #ifdef DEBUG_LIGHTS |
1740 | #ifdef DEBUG_LIGHTS |
1855 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1741 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1856 | #endif /* DEBUG_LIGHTS */ |
1742 | #endif /* DEBUG_LIGHTS */ |
1857 | if (MAP_DARKNESS (where->map)) |
1743 | if (MAP_DARKNESS (map)) |
1858 | update_all_los (where->map, where->x, where->y); |
1744 | update_all_los (map, x, y); |
1859 | } |
1745 | } |
1860 | |
1746 | |
1861 | /* Client has no idea of ordering so lets not bother ordering it here. |
1747 | /* Client has no idea of ordering so lets not bother ordering it here. |
1862 | * It sure simplifies this function... |
1748 | * It sure simplifies this function... |
1863 | */ |
1749 | */ |
1864 | if (where->inv == NULL) |
1750 | if (!inv) |
1865 | where->inv = op; |
1751 | inv = op; |
1866 | else |
1752 | else |
1867 | { |
1753 | { |
1868 | op->below = where->inv; |
1754 | op->below = inv; |
1869 | op->below->above = op; |
1755 | op->below->above = op; |
1870 | where->inv = op; |
1756 | inv = op; |
1871 | } |
1757 | } |
|
|
1758 | |
1872 | return op; |
1759 | return op; |
1873 | } |
1760 | } |
1874 | |
1761 | |
1875 | /* |
1762 | /* |
1876 | * Checks if any objects has a move_type that matches objects |
1763 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1894 | */ |
1781 | */ |
1895 | |
1782 | |
1896 | int |
1783 | int |
1897 | check_move_on (object *op, object *originator) |
1784 | check_move_on (object *op, object *originator) |
1898 | { |
1785 | { |
1899 | object * |
1786 | object *tmp; |
1900 | tmp; |
1787 | maptile *m = op->map; |
1901 | tag_t |
|
|
1902 | tag; |
|
|
1903 | mapstruct * |
|
|
1904 | m = op->map; |
|
|
1905 | int |
|
|
1906 | x = op->x, y = op->y; |
1788 | int x = op->x, y = op->y; |
1907 | |
1789 | |
1908 | MoveType |
1790 | MoveType move_on, move_slow, move_block; |
1909 | move_on, |
|
|
1910 | move_slow, |
|
|
1911 | move_block; |
|
|
1912 | |
1791 | |
1913 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1792 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1914 | return 0; |
1793 | return 0; |
1915 | |
|
|
1916 | tag = op->count; |
|
|
1917 | |
1794 | |
1918 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1795 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1919 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1796 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1920 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1797 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1921 | |
1798 | |
… | |
… | |
1982 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1859 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1983 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1860 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1984 | { |
1861 | { |
1985 | move_apply (tmp, op, originator); |
1862 | move_apply (tmp, op, originator); |
1986 | |
1863 | |
1987 | if (was_destroyed (op, tag)) |
1864 | if (op->destroyed ()) |
1988 | return 1; |
1865 | return 1; |
1989 | |
1866 | |
1990 | /* what the person/creature stepped onto has moved the object |
1867 | /* what the person/creature stepped onto has moved the object |
1991 | * someplace new. Don't process any further - if we did, |
1868 | * someplace new. Don't process any further - if we did, |
1992 | * have a feeling strange problems would result. |
1869 | * have a feeling strange problems would result. |
… | |
… | |
2004 | * a matching archetype at the given map and coordinates. |
1881 | * a matching archetype at the given map and coordinates. |
2005 | * The first matching object is returned, or NULL if none. |
1882 | * The first matching object is returned, or NULL if none. |
2006 | */ |
1883 | */ |
2007 | |
1884 | |
2008 | object * |
1885 | object * |
2009 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1886 | present_arch (const archetype *at, maptile *m, int x, int y) |
2010 | { |
1887 | { |
2011 | object * |
1888 | object * |
2012 | tmp; |
1889 | tmp; |
2013 | |
1890 | |
2014 | if (m == NULL || out_of_map (m, x, y)) |
1891 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2027 | * a matching type variable at the given map and coordinates. |
1904 | * a matching type variable at the given map and coordinates. |
2028 | * The first matching object is returned, or NULL if none. |
1905 | * The first matching object is returned, or NULL if none. |
2029 | */ |
1906 | */ |
2030 | |
1907 | |
2031 | object * |
1908 | object * |
2032 | present (unsigned char type, mapstruct *m, int x, int y) |
1909 | present (unsigned char type, maptile *m, int x, int y) |
2033 | { |
1910 | { |
2034 | object * |
1911 | object * |
2035 | tmp; |
1912 | tmp; |
2036 | |
1913 | |
2037 | if (out_of_map (m, x, y)) |
1914 | if (out_of_map (m, x, y)) |
… | |
… | |
2177 | * the archetype because that isn't correct if the monster has been |
2054 | * the archetype because that isn't correct if the monster has been |
2178 | * customized, changed states, etc. |
2055 | * customized, changed states, etc. |
2179 | */ |
2056 | */ |
2180 | |
2057 | |
2181 | int |
2058 | int |
2182 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2059 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2183 | { |
2060 | { |
2184 | int |
2061 | int |
2185 | i, |
2062 | i, |
2186 | index = 0, flag; |
2063 | index = 0, flag; |
2187 | static int |
2064 | static int |
… | |
… | |
2199 | * if the space being examined only has a wall to the north and empty |
2076 | * if the space being examined only has a wall to the north and empty |
2200 | * spaces in all the other directions, this will reduce the search space |
2077 | * spaces in all the other directions, this will reduce the search space |
2201 | * to only the spaces immediately surrounding the target area, and |
2078 | * to only the spaces immediately surrounding the target area, and |
2202 | * won't look 2 spaces south of the target space. |
2079 | * won't look 2 spaces south of the target space. |
2203 | */ |
2080 | */ |
2204 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2081 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2205 | stop = maxfree[i]; |
2082 | stop = maxfree[i]; |
2206 | } |
2083 | } |
|
|
2084 | |
2207 | if (!index) |
2085 | if (!index) |
2208 | return -1; |
2086 | return -1; |
|
|
2087 | |
2209 | return altern[RANDOM () % index]; |
2088 | return altern[RANDOM () % index]; |
2210 | } |
2089 | } |
2211 | |
2090 | |
2212 | /* |
2091 | /* |
2213 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2092 | * find_first_free_spot(archetype, maptile, x, y) works like |
2214 | * find_free_spot(), but it will search max number of squares. |
2093 | * find_free_spot(), but it will search max number of squares. |
2215 | * But it will return the first available spot, not a random choice. |
2094 | * But it will return the first available spot, not a random choice. |
2216 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2095 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2217 | */ |
2096 | */ |
2218 | |
2097 | |
2219 | int |
2098 | int |
2220 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2099 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2221 | { |
2100 | { |
2222 | int |
2101 | int |
2223 | i; |
2102 | i; |
2224 | |
2103 | |
2225 | for (i = 0; i < SIZEOFFREE; i++) |
2104 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2289 | * because we have to know what movement the thing looking to move |
2168 | * because we have to know what movement the thing looking to move |
2290 | * there is capable of. |
2169 | * there is capable of. |
2291 | */ |
2170 | */ |
2292 | |
2171 | |
2293 | int |
2172 | int |
2294 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2173 | find_dir (maptile *m, int x, int y, object *exclude) |
2295 | { |
2174 | { |
2296 | int |
2175 | int |
2297 | i, |
2176 | i, |
2298 | max = SIZEOFFREE, mflags; |
2177 | max = SIZEOFFREE, mflags; |
2299 | |
2178 | |
2300 | sint16 nx, ny; |
2179 | sint16 nx, ny; |
2301 | object * |
2180 | object * |
2302 | tmp; |
2181 | tmp; |
2303 | mapstruct * |
2182 | maptile * |
2304 | mp; |
2183 | mp; |
2305 | |
2184 | |
2306 | MoveType blocked, move_type; |
2185 | MoveType blocked, move_type; |
2307 | |
2186 | |
2308 | if (exclude && exclude->head) |
2187 | if (exclude && exclude->head) |
… | |
… | |
2321 | mp = m; |
2200 | mp = m; |
2322 | nx = x + freearr_x[i]; |
2201 | nx = x + freearr_x[i]; |
2323 | ny = y + freearr_y[i]; |
2202 | ny = y + freearr_y[i]; |
2324 | |
2203 | |
2325 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2204 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2205 | |
2326 | if (mflags & P_OUT_OF_MAP) |
2206 | if (mflags & P_OUT_OF_MAP) |
2327 | { |
|
|
2328 | max = maxfree[i]; |
2207 | max = maxfree[i]; |
2329 | } |
|
|
2330 | else |
2208 | else |
2331 | { |
2209 | { |
2332 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2210 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2333 | |
2211 | |
2334 | if ((move_type & blocked) == move_type) |
2212 | if ((move_type & blocked) == move_type) |
2335 | { |
|
|
2336 | max = maxfree[i]; |
2213 | max = maxfree[i]; |
2337 | } |
|
|
2338 | else if (mflags & P_IS_ALIVE) |
2214 | else if (mflags & P_IS_ALIVE) |
2339 | { |
2215 | { |
2340 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2216 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2341 | { |
|
|
2342 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2217 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2343 | { |
|
|
2344 | break; |
2218 | break; |
2345 | } |
2219 | |
2346 | } |
|
|
2347 | if (tmp) |
2220 | if (tmp) |
2348 | { |
|
|
2349 | return freedir[i]; |
2221 | return freedir[i]; |
2350 | } |
|
|
2351 | } |
2222 | } |
2352 | } |
2223 | } |
2353 | } |
2224 | } |
|
|
2225 | |
2354 | return 0; |
2226 | return 0; |
2355 | } |
2227 | } |
2356 | |
2228 | |
2357 | /* |
2229 | /* |
2358 | * distance(object 1, object 2) will return the square of the |
2230 | * distance(object 1, object 2) will return the square of the |
… | |
… | |
2360 | */ |
2232 | */ |
2361 | |
2233 | |
2362 | int |
2234 | int |
2363 | distance (const object *ob1, const object *ob2) |
2235 | distance (const object *ob1, const object *ob2) |
2364 | { |
2236 | { |
2365 | int |
2237 | int i; |
2366 | i; |
|
|
2367 | |
2238 | |
2368 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2239 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2369 | return i; |
2240 | return i; |
2370 | } |
2241 | } |
2371 | |
2242 | |
… | |
… | |
2376 | */ |
2247 | */ |
2377 | |
2248 | |
2378 | int |
2249 | int |
2379 | find_dir_2 (int x, int y) |
2250 | find_dir_2 (int x, int y) |
2380 | { |
2251 | { |
2381 | int |
2252 | int q; |
2382 | q; |
|
|
2383 | |
2253 | |
2384 | if (y) |
2254 | if (y) |
2385 | q = x * 100 / y; |
2255 | q = x * 100 / y; |
2386 | else if (x) |
2256 | else if (x) |
2387 | q = -300 * x; |
2257 | q = -300 * x; |
… | |
… | |
2513 | * find a path to that monster that we found. If not, |
2383 | * find a path to that monster that we found. If not, |
2514 | * we don't bother going toward it. Returns 1 if we |
2384 | * we don't bother going toward it. Returns 1 if we |
2515 | * can see a direct way to get it |
2385 | * can see a direct way to get it |
2516 | * Modified to be map tile aware -.MSW |
2386 | * Modified to be map tile aware -.MSW |
2517 | */ |
2387 | */ |
2518 | |
|
|
2519 | |
|
|
2520 | int |
2388 | int |
2521 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2389 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2522 | { |
2390 | { |
2523 | sint16 dx, dy; |
2391 | sint16 dx, dy; |
2524 | int |
|
|
2525 | mflags; |
2392 | int mflags; |
2526 | |
2393 | |
2527 | if (dir < 0) |
2394 | if (dir < 0) |
2528 | return 0; /* exit condition: invalid direction */ |
2395 | return 0; /* exit condition: invalid direction */ |
2529 | |
2396 | |
2530 | dx = x + freearr_x[dir]; |
2397 | dx = x + freearr_x[dir]; |
… | |
… | |
2543 | return 0; |
2410 | return 0; |
2544 | |
2411 | |
2545 | /* yes, can see. */ |
2412 | /* yes, can see. */ |
2546 | if (dir < 9) |
2413 | if (dir < 9) |
2547 | return 1; |
2414 | return 1; |
|
|
2415 | |
2548 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2416 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2549 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2417 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2418 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2550 | } |
2419 | } |
2551 | |
|
|
2552 | |
|
|
2553 | |
2420 | |
2554 | /* |
2421 | /* |
2555 | * can_pick(picker, item): finds out if an object is possible to be |
2422 | * can_pick(picker, item): finds out if an object is possible to be |
2556 | * picked up by the picker. Returnes 1 if it can be |
2423 | * picked up by the picker. Returnes 1 if it can be |
2557 | * picked up, otherwise 0. |
2424 | * picked up, otherwise 0. |
… | |
… | |
2568 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2435 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2569 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2436 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2570 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2437 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2571 | } |
2438 | } |
2572 | |
2439 | |
2573 | |
|
|
2574 | /* |
2440 | /* |
2575 | * create clone from object to another |
2441 | * create clone from object to another |
2576 | */ |
2442 | */ |
2577 | object * |
2443 | object * |
2578 | object_create_clone (object *asrc) |
2444 | object_create_clone (object *asrc) |
2579 | { |
2445 | { |
2580 | object * |
|
|
2581 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2446 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2582 | |
2447 | |
2583 | if (!asrc) |
2448 | if (!asrc) |
2584 | return NULL; |
2449 | return 0; |
|
|
2450 | |
2585 | src = asrc; |
2451 | src = asrc; |
2586 | if (src->head) |
2452 | if (src->head) |
2587 | src = src->head; |
2453 | src = src->head; |
2588 | |
2454 | |
2589 | prev = NULL; |
2455 | prev = 0; |
2590 | for (part = src; part; part = part->more) |
2456 | for (part = src; part; part = part->more) |
2591 | { |
2457 | { |
2592 | tmp = get_object (); |
2458 | tmp = part->clone (); |
2593 | copy_object (part, tmp); |
|
|
2594 | tmp->x -= src->x; |
2459 | tmp->x -= src->x; |
2595 | tmp->y -= src->y; |
2460 | tmp->y -= src->y; |
|
|
2461 | |
2596 | if (!part->head) |
2462 | if (!part->head) |
2597 | { |
2463 | { |
2598 | dst = tmp; |
2464 | dst = tmp; |
2599 | tmp->head = NULL; |
2465 | tmp->head = 0; |
2600 | } |
2466 | } |
2601 | else |
2467 | else |
2602 | { |
|
|
2603 | tmp->head = dst; |
2468 | tmp->head = dst; |
2604 | } |
2469 | |
2605 | tmp->more = NULL; |
2470 | tmp->more = 0; |
|
|
2471 | |
2606 | if (prev) |
2472 | if (prev) |
2607 | prev->more = tmp; |
2473 | prev->more = tmp; |
|
|
2474 | |
2608 | prev = tmp; |
2475 | prev = tmp; |
2609 | } |
2476 | } |
2610 | |
2477 | |
2611 | /*** copy inventory ***/ |
|
|
2612 | for (item = src->inv; item; item = item->below) |
2478 | for (item = src->inv; item; item = item->below) |
2613 | { |
|
|
2614 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2479 | insert_ob_in_ob (object_create_clone (item), dst); |
2615 | } |
|
|
2616 | |
2480 | |
2617 | return dst; |
2481 | return dst; |
2618 | } |
2482 | } |
2619 | |
2483 | |
2620 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2621 | int |
|
|
2622 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2623 | { |
|
|
2624 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2625 | * robust */ |
|
|
2626 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2627 | } |
|
|
2628 | |
|
|
2629 | /* GROS - Creates an object using a string representing its content. */ |
2484 | /* GROS - Creates an object using a string representing its content. */ |
2630 | |
|
|
2631 | /* Basically, we save the content of the string to a temp file, then call */ |
2485 | /* Basically, we save the content of the string to a temp file, then call */ |
2632 | |
|
|
2633 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2486 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2634 | |
|
|
2635 | /* but it was simple to make and allows reusing the load_object function. */ |
2487 | /* but it was simple to make and allows reusing the load_object function. */ |
2636 | |
|
|
2637 | /* Remember not to use load_object_str in a time-critical situation. */ |
2488 | /* Remember not to use load_object_str in a time-critical situation. */ |
2638 | |
|
|
2639 | /* Also remember that multiparts objects are not supported for now. */ |
2489 | /* Also remember that multiparts objects are not supported for now. */ |
2640 | |
2490 | |
2641 | object * |
2491 | object * |
2642 | load_object_str (const char *obstr) |
2492 | load_object_str (const char *obstr) |
2643 | { |
2493 | { |
2644 | object * |
2494 | object *op; |
2645 | op; |
|
|
2646 | char |
|
|
2647 | filename[MAX_BUF]; |
2495 | char filename[MAX_BUF]; |
2648 | |
2496 | |
2649 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2497 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2650 | |
2498 | |
2651 | FILE * |
|
|
2652 | tempfile = fopen (filename, "w"); |
2499 | FILE *tempfile = fopen (filename, "w"); |
2653 | |
2500 | |
2654 | if (tempfile == NULL) |
2501 | if (tempfile == NULL) |
2655 | { |
2502 | { |
2656 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2503 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2657 | return NULL; |
2504 | return NULL; |
2658 | }; |
2505 | } |
|
|
2506 | |
2659 | fprintf (tempfile, obstr); |
2507 | fprintf (tempfile, obstr); |
2660 | fclose (tempfile); |
2508 | fclose (tempfile); |
2661 | |
2509 | |
2662 | op = get_object (); |
2510 | op = object::create (); |
2663 | |
2511 | |
2664 | object_thawer thawer (filename); |
2512 | object_thawer thawer (filename); |
2665 | |
2513 | |
2666 | if (thawer) |
2514 | if (thawer) |
2667 | load_object (thawer, op, 0); |
2515 | load_object (thawer, op, 0); |
… | |
… | |
2677 | * returns NULL if no match. |
2525 | * returns NULL if no match. |
2678 | */ |
2526 | */ |
2679 | object * |
2527 | object * |
2680 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2528 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2681 | { |
2529 | { |
2682 | object * |
2530 | object *tmp; |
2683 | tmp; |
|
|
2684 | |
2531 | |
2685 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2532 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2686 | if (tmp->type == type && tmp->subtype == subtype) |
2533 | if (tmp->type == type && tmp->subtype == subtype) |
2687 | return tmp; |
2534 | return tmp; |
2688 | |
2535 | |
… | |
… | |
2696 | * do the desired thing. |
2543 | * do the desired thing. |
2697 | */ |
2544 | */ |
2698 | key_value * |
2545 | key_value * |
2699 | get_ob_key_link (const object *ob, const char *key) |
2546 | get_ob_key_link (const object *ob, const char *key) |
2700 | { |
2547 | { |
2701 | key_value * |
2548 | key_value *link; |
2702 | link; |
|
|
2703 | |
2549 | |
2704 | for (link = ob->key_values; link != NULL; link = link->next) |
2550 | for (link = ob->key_values; link != NULL; link = link->next) |
2705 | { |
|
|
2706 | if (link->key == key) |
2551 | if (link->key == key) |
2707 | { |
|
|
2708 | return link; |
2552 | return link; |
2709 | } |
|
|
2710 | } |
|
|
2711 | |
2553 | |
2712 | return NULL; |
2554 | return NULL; |
2713 | } |
2555 | } |
2714 | |
2556 | |
2715 | /* |
2557 | /* |
… | |
… | |
2720 | * The returned string is shared. |
2562 | * The returned string is shared. |
2721 | */ |
2563 | */ |
2722 | const char * |
2564 | const char * |
2723 | get_ob_key_value (const object *op, const char *const key) |
2565 | get_ob_key_value (const object *op, const char *const key) |
2724 | { |
2566 | { |
2725 | key_value * |
2567 | key_value *link; |
2726 | link; |
2568 | shstr_cmp canonical_key (key); |
2727 | const char * |
|
|
2728 | canonical_key; |
|
|
2729 | |
2569 | |
2730 | canonical_key = shstr::find (key); |
|
|
2731 | |
|
|
2732 | if (canonical_key == NULL) |
2570 | if (!canonical_key) |
2733 | { |
2571 | { |
2734 | /* 1. There being a field named key on any object |
2572 | /* 1. There being a field named key on any object |
2735 | * implies there'd be a shared string to find. |
2573 | * implies there'd be a shared string to find. |
2736 | * 2. Since there isn't, no object has this field. |
2574 | * 2. Since there isn't, no object has this field. |
2737 | * 3. Therefore, *this* object doesn't have this field. |
2575 | * 3. Therefore, *this* object doesn't have this field. |
2738 | */ |
2576 | */ |
2739 | return NULL; |
2577 | return 0; |
2740 | } |
2578 | } |
2741 | |
2579 | |
2742 | /* This is copied from get_ob_key_link() above - |
2580 | /* This is copied from get_ob_key_link() above - |
2743 | * only 4 lines, and saves the function call overhead. |
2581 | * only 4 lines, and saves the function call overhead. |
2744 | */ |
2582 | */ |
2745 | for (link = op->key_values; link != NULL; link = link->next) |
2583 | for (link = op->key_values; link; link = link->next) |
2746 | { |
|
|
2747 | if (link->key == canonical_key) |
2584 | if (link->key == canonical_key) |
2748 | { |
|
|
2749 | return link->value; |
2585 | return link->value; |
2750 | } |
2586 | |
2751 | } |
|
|
2752 | return NULL; |
2587 | return 0; |
2753 | } |
2588 | } |
2754 | |
2589 | |
2755 | |
2590 | |
2756 | /* |
2591 | /* |
2757 | * Updates the canonical_key in op to value. |
2592 | * Updates the canonical_key in op to value. |
… | |
… | |
2843 | shstr key_ (key); |
2678 | shstr key_ (key); |
2844 | |
2679 | |
2845 | return set_ob_key_value_s (op, key_, value, add_key); |
2680 | return set_ob_key_value_s (op, key_, value, add_key); |
2846 | } |
2681 | } |
2847 | |
2682 | |
|
|
2683 | object::depth_iterator::depth_iterator (object *container) |
|
|
2684 | : iterator_base (container) |
|
|
2685 | { |
|
|
2686 | while (item->inv) |
|
|
2687 | item = item->inv; |
|
|
2688 | } |
|
|
2689 | |
2848 | void |
2690 | void |
2849 | object::deep_iterator::next () |
2691 | object::depth_iterator::next () |
2850 | { |
2692 | { |
2851 | if (item->inv) |
|
|
2852 | item = item->inv; |
|
|
2853 | else if (item->below) |
2693 | if (item->below) |
|
|
2694 | { |
2854 | item = item->below; |
2695 | item = item->below; |
|
|
2696 | |
|
|
2697 | while (item->inv) |
|
|
2698 | item = item->inv; |
|
|
2699 | } |
2855 | else |
2700 | else |
2856 | item = item->env->below; |
2701 | item = item->env; |
2857 | } |
2702 | } |
|
|
2703 | |
|
|
2704 | // return a suitable string describing an objetc in enough detail to find it |
|
|
2705 | const char * |
|
|
2706 | object::debug_desc (char *info) const |
|
|
2707 | { |
|
|
2708 | char info2[256 * 3]; |
|
|
2709 | char *p = info; |
|
|
2710 | |
|
|
2711 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
|
|
2712 | count, |
|
|
2713 | &name, |
|
|
2714 | title ? " " : "", |
|
|
2715 | title ? (const char *)title : ""); |
|
|
2716 | |
|
|
2717 | if (env) |
|
|
2718 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
|
|
2719 | |
|
|
2720 | if (map) |
|
|
2721 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
|
|
2722 | |
|
|
2723 | return info; |
|
|
2724 | } |
|
|
2725 | |
|
|
2726 | const char * |
|
|
2727 | object::debug_desc () const |
|
|
2728 | { |
|
|
2729 | static char info[256 * 3]; |
|
|
2730 | return debug_desc (info); |
|
|
2731 | } |
|
|
2732 | |