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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22 The authors can be reached via e-mail at crossfire-devel@real-time.com
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. */
28#include <global.h> 27#include <global.h>
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h> 33#include <sproto.h>
35#include <loader.h> 34#include <loader.h>
36 35
36#include <bitset>
37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19;
38 41
39object *objects; /* Pointer to the list of used objects */ 42objectvec objects;
40object *active_objects; /* List of active objects that need to be processed */ 43activevec actives;
41 44
42short 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, 45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44}; 47};
45short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
… …
51int freedir[SIZEOFFREE] = { 54int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 57};
55 58
59static void
60write_uuid (void)
61{
62 char filename1[MAX_BUF], filename2[MAX_BUF];
63
64 sprintf (filename1, "%s/uuid", settings.localdir);
65 sprintf (filename2, "%s/uuid~", settings.localdir);
66
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78}
79
80static void
81read_uuid (void)
82{
83 char filename[MAX_BUF];
84
85 sprintf (filename, "%s/uuid", settings.localdir);
86
87 FILE *fp;
88
89 if (!(fp = fopen (filename, "r")))
90 {
91 if (errno == ENOENT)
92 {
93 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0;
95 write_uuid ();
96 return;
97 }
98
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1);
101 }
102
103 int version;
104 unsigned long long uid;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
106 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
108 _exit (1);
109 }
110
111 uuid.seq = uid;
112 write_uuid ();
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
114 fclose (fp);
115}
116
117UUID
118gen_uuid ()
119{
120 UUID uid;
121
122 uid.seq = ++uuid.seq;
123
124 if (!(uuid.seq & (UUID_SKIP - 1)))
125 write_uuid ();
126
127 return uid;
128}
129
130void
131init_uuid ()
132{
133 read_uuid ();
134}
135
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 137static int
58compare_ob_value_lists_one (const object *wants, const object *has) 138compare_ob_value_lists_one (const object *wants, const object *has)
59{ 139{
60 key_value *wants_field; 140 key_value *wants_field;
… …
63 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
64 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
65 */ 145 */
66 146
67 /* For each field in wants, */ 147 /* For each field in wants, */
68 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
69 { 149 {
70 key_value *has_field; 150 key_value *has_field;
71 151
72 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
73 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
107 * 187 *
108 * Note that this function appears a lot longer than the macro it 188 * Note that this function appears a lot longer than the macro it
109 * replaces - this is mostly for clarity - a decent compiler should hopefully 189 * replaces - this is mostly for clarity - a decent compiler should hopefully
110 * reduce this to the same efficiency. 190 * reduce this to the same efficiency.
111 * 191 *
112 * Check nrof variable *before* calling CAN_MERGE() 192 * Check nrof variable *before* calling can_merge()
113 * 193 *
114 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
115 * check weight 195 * check weight
116 */ 196 */
117
118bool object::can_merge (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
119{ 198{
120 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
121 if ((ob1 == ob2) || (ob1->type != ob2->type)) 200 if (ob1 == ob2
201 || ob1->type != ob2->type
202 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value
204 || ob1->name != ob2->name)
122 return 0; 205 return 0;
123 206
124 if (ob1->speed != ob2->speed) 207 //TODO: this ain't working well, use nicer and correct overflow check
125 return 0;
126
127 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128 * value could not be stored in a sint32 (which unfortunately sometimes is 209 * value could not be stored in a sint32 (which unfortunately sometimes is
129 * used to store nrof). 210 * used to store nrof).
130 */ 211 */
131 if (ob1->nrof + ob2->nrof >= 1UL << 31) 212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
141 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142 223
143 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145 226
146 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 228 || ob1->arch != ob2->arch
148 * being locked in inventory should prevent merging.
149 * 0x4 in flags3 is CLIENT_SENT
150 */
151 if ((ob1->arch != ob2->arch) ||
152 (ob1->flags[0] != ob2->flags[0]) ||
153 (ob1->flags[1] != ob2->flags[1]) ||
154 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156 (ob1->name != ob2->name) || 229 || ob1->name != ob2->name
157 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
158 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
159 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
160 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
163 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
164 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
165 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
166 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
167 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
168 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
169 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
170 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
171 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
172 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
173 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
174 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
175 (ob1->move_on != ob2->move_on) || 248 || ob1->move_on != ob2->move_on
176 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
177 return 0; 252 return 0;
178 253
179 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
180 * check all objects in the inventory. 255 * check all objects in the inventory.
181 */ 256 */
… …
184 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
185 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186 return 0; 261 return 0;
187 262
188 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
189 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
190 return 0; 265 return 0;
191 266
192 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
193 * if it is valid. 268 * if it is valid.
194 */ 269 */
… …
203 278
204 /* Note sure why the following is the case - either the object has to 279 /* Note sure why the following is the case - either the object has to
205 * be animated or have a very low speed. Is this an attempted monster 280 * be animated or have a very low speed. Is this an attempted monster
206 * check? 281 * check?
207 */ 282 */
208 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
209 return 0; 284 return 0;
210 285
211 switch (ob1->type) 286 switch (ob1->type)
212 { 287 {
213 case SCROLL: 288 case SCROLL:
… …
224 return 0; 299 return 0;
225 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
226 return 0; 301 return 0;
227 } 302 }
228 303
229 //TODO: generate an event or call into perl for additional checks
230 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
231 { 305 {
232 ob1->optimise (); 306 ob1->optimise ();
233 ob2->optimise (); 307 ob2->optimise ();
234 308
235 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
236 return 0; 311 return 0;
237 } 312 }
238 313
239 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
240 return 1; 315 return 1;
241} 316}
… …
249sum_weight (object *op) 324sum_weight (object *op)
250{ 325{
251 long sum; 326 long sum;
252 object *inv; 327 object *inv;
253 328
254 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
255 { 330 {
256 if (inv->inv) 331 if (inv->inv)
257 sum_weight (inv); 332 sum_weight (inv);
333
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
… …
275 op = op->env; 354 op = op->env;
276 return op; 355 return op;
277} 356}
278 357
279/* 358/*
280 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
281 * a better check. We basically keeping traversing up until we can't
282 * or find a player.
283 */
284
285object *
286is_player_inv (object *op)
287{
288 for (; op != NULL && op->type != PLAYER; op = op->env)
289 if (op->env == op)
290 op->env = NULL;
291 return op;
292}
293
294/*
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 360 * Some error messages.
297 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
298 */ 362 */
299 363char *
300void
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 364dump_object (object *op)
356{ 365{
357 if (op == NULL) 366 if (!op)
358 { 367 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 368
366void 369 object_freezer freezer;
367dump_all_objects (void) 370 op->write (freezer);
368{ 371 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 372}
377 373
378/* 374/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
380 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
381 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
382 */ 378 */
383
384object * 379object *
385get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
386{ 381{
387 object *tmp, *closest; 382 object *tmp, *closest;
388 int last_dist, i; 383 int last_dist, i;
… …
396} 391}
397 392
398/* 393/*
399 * Returns the object which has the count-variable equal to the argument. 394 * Returns the object which has the count-variable equal to the argument.
400 */ 395 */
401
402object * 396object *
403find_object (tag_t i) 397find_object (tag_t i)
404{ 398{
405 object *op; 399 for_all_objects (op)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 400 if (op->count == i)
409 break;
410 return op; 401 return op;
402
403 return 0;
411} 404}
412 405
413/* 406/*
414 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
415 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
416 * Enables features like "patch <name-of-other-player> food 999" 409 * Enables features like "patch <name-of-other-player> food 999"
417 */ 410 */
418
419object * 411object *
420find_object_name (const char *str) 412find_object_name (const char *str)
421{ 413{
422 const char *name = shstr::find (str); 414 shstr_cmp str_ (str);
423 object *op; 415 object *op;
424 416
425 for (op = objects; op != NULL; op = op->next) 417 for_all_objects (op)
426 if (&op->name == name) 418 if (op->name == str_)
427 break; 419 break;
428 420
429 return op; 421 return op;
430} 422}
431 423
… …
434{ 426{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 427 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436} 428}
437 429
438/* 430/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448object *
449object::get_owner ()
450{
451 if (!owner
452 || QUERY_FLAG (owner, FLAG_FREED)
453 || QUERY_FLAG (owner, FLAG_REMOVED))
454 owner = 0;
455
456 return owner;
457}
458
459/*
460 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
461 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
462 */ 434 */
463void 435void
464object::set_owner (object *owner) 436object::set_owner (object *owner)
465{ 437{
438 // allow objects which own objects
466 if (!owner) 439 if (owner)
467 return;
468
469 /* next line added to allow objects which own objects */
470 /* Add a check for ownercounts in here, as I got into an endless loop
471 * with the fireball owning a poison cloud which then owned the
472 * fireball. I believe that was caused by one of the objects getting
473 * freed and then another object replacing it. Since the ownercounts
474 * didn't match, this check is valid and I believe that cause is valid.
475 */
476 while (owner->owner) 440 while (owner->owner)
477 owner = owner->owner; 441 owner = owner->owner;
478 442
479 this->owner = owner; 443 this->owner = owner;
444}
445
446int
447object::slottype () const
448{
449 if (type == SKILL)
450 {
451 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
452 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
453 }
454 else
455 {
456 if (slot [body_combat].info) return slot_combat;
457 if (slot [body_range ].info) return slot_ranged;
458 }
459
460 return slot_none;
461}
462
463bool
464object::change_weapon (object *ob)
465{
466 if (current_weapon == ob)
467 return true;
468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = false;
471
472 current_weapon = ob;
473 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
474
475 if (chosen_skill)
476 chosen_skill->flag [FLAG_APPLIED] = true;
477
478 update_stats ();
479
480 if (ob)
481 {
482 // now check wether any body locations became invalid, in which case
483 // we cannot apply the weapon at the moment.
484 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
485 if (slot[i].used < 0)
486 {
487 current_weapon = chosen_skill = 0;
488 update_stats ();
489
490 new_draw_info_format (NDI_UNIQUE, 0, this,
491 "You try to balance all your items at once, "
492 "but the %s is just too much for your body. "
493 "[You need to unapply some items first.]", &ob->name);
494 return false;
495 }
496
497 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
498 }
499 else
500 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
501
502 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
503 {
504 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
505 &name, ob->debug_desc ());
506 return false;
507 }
508
509 return true;
480} 510}
481 511
482/* Zero the key_values on op, decrementing the shared-string 512/* Zero the key_values on op, decrementing the shared-string
483 * refcounts and freeing the links. 513 * refcounts and freeing the links.
484 */ 514 */
485static void 515static void
486free_key_values (object *op) 516free_key_values (object *op)
487{ 517{
488 for (key_value *i = op->key_values; i != 0;) 518 for (key_value *i = op->key_values; i; )
489 { 519 {
490 key_value *next = i->next; 520 key_value *next = i->next;
491 delete i; 521 delete i;
492 522
493 i = next; 523 i = next;
494 } 524 }
495 525
496 op->key_values = 0; 526 op->key_values = 0;
497} 527}
498 528
499void object::clear () 529object &
530object::operator =(const object &src)
500{ 531{
501 attachable_base::clear (); 532 bool is_freed = flag [FLAG_FREED];
533 bool is_removed = flag [FLAG_REMOVED];
502 534
503 free_key_values (this); 535 *(object_copy *)this = src;
504 536
505 owner = 0; 537 flag [FLAG_FREED] = is_freed;
506 name = 0; 538 flag [FLAG_REMOVED] = is_removed;
507 name_pl = 0;
508 title = 0;
509 race = 0;
510 slaying = 0;
511 skill = 0;
512 msg = 0;
513 lore = 0;
514 custom_name = 0;
515 materialname = 0;
516 contr = 0;
517 below = 0;
518 above = 0;
519 inv = 0;
520 container = 0;
521 env = 0;
522 more = 0;
523 head = 0;
524 map = 0;
525 active_next = 0;
526 active_prev = 0;
527
528 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
529
530 SET_FLAG (this, FLAG_REMOVED);
531
532 /* What is not cleared is next, prev, and count */
533
534 expmul = 1.0;
535 face = blank_face;
536 attacked_by_count = -1;
537
538 if (settings.casting_time)
539 casting_time = -1;
540}
541
542void object::clone (object *destination)
543{
544 *(object_copy *)destination = *this;
545 *(object_pod *)destination = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549}
550
551/*
552 * copy object first frees everything allocated by the second object,
553 * and then copies the contends of the first object into the second
554 * object, allocating what needs to be allocated. Basically, any
555 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
556 * if the first object is freed, the pointers in the new object
557 * will point at garbage.
558 */
559void
560copy_object (object *op2, object *op)
561{
562 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
563 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
564
565 op2->clone (op);
566
567 if (is_freed)
568 SET_FLAG (op, FLAG_FREED);
569 if (is_removed)
570 SET_FLAG (op, FLAG_REMOVED);
571
572 if (op2->speed < 0)
573 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
574 539
575 /* Copy over key_values, if any. */ 540 /* Copy over key_values, if any. */
576 if (op2->key_values) 541 if (src.key_values)
577 { 542 {
578 key_value *tail = 0; 543 key_value *tail = 0;
579 key_value *i;
580
581 op->key_values = 0; 544 key_values = 0;
582 545
583 for (i = op2->key_values; i; i = i->next) 546 for (key_value *i = src.key_values; i; i = i->next)
584 { 547 {
585 key_value *new_link = new key_value; 548 key_value *new_link = new key_value;
586 549
587 new_link->next = 0; 550 new_link->next = 0;
588 new_link->key = i->key; 551 new_link->key = i->key;
589 new_link->value = i->value; 552 new_link->value = i->value;
590 553
591 /* Try and be clever here, too. */ 554 /* Try and be clever here, too. */
592 if (!op->key_values) 555 if (!key_values)
593 { 556 {
594 op->key_values = new_link; 557 key_values = new_link;
595 tail = new_link; 558 tail = new_link;
596 } 559 }
597 else 560 else
598 { 561 {
599 tail->next = new_link; 562 tail->next = new_link;
600 tail = new_link; 563 tail = new_link;
601 } 564 }
602 } 565 }
603 } 566 }
567}
604 568
605 update_ob_speed (op); 569/*
570 * copy_to first frees everything allocated by the dst object,
571 * and then copies the contents of itself into the second
572 * object, allocating what needs to be allocated. Basically, any
573 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
574 * if the first object is freed, the pointers in the new object
575 * will point at garbage.
576 */
577void
578object::copy_to (object *dst)
579{
580 *dst = *this;
581
582 if (speed < 0)
583 dst->speed_left -= rndm ();
584
585 dst->set_speed (dst->speed);
586}
587
588void
589object::instantiate ()
590{
591 if (!uuid.seq) // HACK
592 uuid = gen_uuid ();
593
594 speed_left = -0.1f;
595 /* copy the body_info to the body_used - this is only really
596 * need for monsters, but doesn't hurt to do it for everything.
597 * by doing so, when a monster is created, it has good starting
598 * values for the body_used info, so when items are created
599 * for it, they can be properly equipped.
600 */
601 for (int i = NUM_BODY_LOCATIONS; i--; )
602 slot[i].used = slot[i].info;
603
604 attachable::instantiate ();
605}
606
607object *
608object::clone ()
609{
610 object *neu = create ();
611 copy_to (neu);
612 return neu;
606} 613}
607 614
608/* 615/*
609 * If an object with the IS_TURNABLE() flag needs to be turned due 616 * If an object with the IS_TURNABLE() flag needs to be turned due
610 * to the closest player being on the other side, this function can 617 * to the closest player being on the other side, this function can
611 * be called to update the face variable, _and_ how it looks on the map. 618 * be called to update the face variable, _and_ how it looks on the map.
612 */ 619 */
613
614void 620void
615update_turn_face (object *op) 621update_turn_face (object *op)
616{ 622{
617 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 623 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
618 return; 624 return;
625
619 SET_ANIMATION (op, op->direction); 626 SET_ANIMATION (op, op->direction);
620 update_object (op, UP_OBJ_FACE); 627 update_object (op, UP_OBJ_FACE);
621} 628}
622 629
623/* 630/*
624 * Updates the speed of an object. If the speed changes from 0 to another 631 * Updates the speed of an object. If the speed changes from 0 to another
625 * value, or vice versa, then add/remove the object from the active list. 632 * value, or vice versa, then add/remove the object from the active list.
626 * This function needs to be called whenever the speed of an object changes. 633 * This function needs to be called whenever the speed of an object changes.
627 */ 634 */
628
629void 635void
630update_ob_speed (object *op) 636object::set_speed (float speed)
631{ 637{
632 extern int arch_init; 638 if (flag [FLAG_FREED] && speed)
633
634 /* No reason putting the archetypes objects on the speed list,
635 * since they never really need to be updated.
636 */
637
638 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
639 { 639 {
640 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 640 LOG (llevError, "Object %s is freed but has speed.\n", &name);
641#ifdef MANY_CORES
642 abort ();
643#else
644 op->speed = 0; 641 speed = 0;
645#endif
646 }
647 if (arch_init)
648 { 642 }
649 return;
650 }
651 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652 {
653 /* If already on active list, don't do anything */
654 if (op->active_next || op->active_prev || op == active_objects)
655 return;
656 643
657 /* process_events() expects us to insert the object at the beginning 644 this->speed = speed;
658 * of the list. */ 645
659 op->active_next = active_objects; 646 if (has_active_speed ())
660 if (op->active_next != NULL) 647 activate ();
661 op->active_next->active_prev = op;
662 active_objects = op;
663 }
664 else 648 else
665 { 649 deactivate ();
666 /* If not on the active list, nothing needs to be done */
667 if (!op->active_next && !op->active_prev && op != active_objects)
668 return;
669
670 if (op->active_prev == NULL)
671 {
672 active_objects = op->active_next;
673 if (op->active_next != NULL)
674 op->active_next->active_prev = NULL;
675 }
676 else
677 {
678 op->active_prev->active_next = op->active_next;
679 if (op->active_next)
680 op->active_next->active_prev = op->active_prev;
681 }
682 op->active_next = NULL;
683 op->active_prev = NULL;
684 }
685} 650}
686 651
687/* This function removes object 'op' from the list of active
688 * objects.
689 * This should only be used for style maps or other such
690 * reference maps where you don't want an object that isn't
691 * in play chewing up cpu time getting processed.
692 * The reverse of this is to call update_ob_speed, which
693 * will do the right thing based on the speed of the object.
694 */
695void
696remove_from_active_list (object *op)
697{
698 /* If not on the active list, nothing needs to be done */
699 if (!op->active_next && !op->active_prev && op != active_objects)
700 return;
701
702 if (op->active_prev == NULL)
703 {
704 active_objects = op->active_next;
705 if (op->active_next != NULL)
706 op->active_next->active_prev = NULL;
707 }
708 else
709 {
710 op->active_prev->active_next = op->active_next;
711 if (op->active_next)
712 op->active_next->active_prev = op->active_prev;
713 }
714 op->active_next = NULL;
715 op->active_prev = NULL;
716}
717
718/* 652/*
719 * update_object() updates the array which represents the map. 653 * update_object() updates the the map.
720 * It takes into account invisible objects (and represent squares covered 654 * It takes into account invisible objects (and represent squares covered
721 * by invisible objects by whatever is below them (unless it's another 655 * by invisible objects by whatever is below them (unless it's another
722 * invisible object, etc...) 656 * invisible object, etc...)
723 * If the object being updated is beneath a player, the look-window 657 * If the object being updated is beneath a player, the look-window
724 * of that player is updated (this might be a suboptimal way of 658 * of that player is updated (this might be a suboptimal way of
725 * updating that window, though, since update_object() is called _often_) 659 * updating that window, though, since update_object() is called _often_)
726 * 660 *
727 * action is a hint of what the caller believes need to be done. 661 * action is a hint of what the caller believes need to be done.
728 * For example, if the only thing that has changed is the face (due to
729 * an animation), we don't need to call update_position until that actually
730 * comes into view of a player. OTOH, many other things, like addition/removal
731 * of walls or living creatures may need us to update the flags now.
732 * current action are: 662 * current action are:
733 * UP_OBJ_INSERT: op was inserted 663 * UP_OBJ_INSERT: op was inserted
734 * UP_OBJ_REMOVE: op was removed 664 * UP_OBJ_REMOVE: op was removed
735 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 665 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
736 * as that is easier than trying to look at what may have changed. 666 * as that is easier than trying to look at what may have changed.
737 * UP_OBJ_FACE: only the objects face has changed. 667 * UP_OBJ_FACE: only the objects face has changed.
738 */ 668 */
739
740void 669void
741update_object (object *op, int action) 670update_object (object *op, int action)
742{ 671{
743 int update_now = 0, flags;
744 MoveType move_on, move_off, move_block, move_slow;
745
746 if (op == NULL) 672 if (op == NULL)
747 { 673 {
748 /* this should never happen */ 674 /* this should never happen */
749 LOG (llevDebug, "update_object() called for NULL object.\n"); 675 LOG (llevDebug, "update_object() called for NULL object.\n");
750 return; 676 return;
751 } 677 }
752 678
753 if (op->env != NULL) 679 if (op->env)
754 { 680 {
755 /* Animation is currently handled by client, so nothing 681 /* Animation is currently handled by client, so nothing
756 * to do in this case. 682 * to do in this case.
757 */ 683 */
758 return; 684 return;
… …
763 */ 689 */
764 if (!op->map || op->map->in_memory == MAP_SAVING) 690 if (!op->map || op->map->in_memory == MAP_SAVING)
765 return; 691 return;
766 692
767 /* make sure the object is within map boundaries */ 693 /* make sure the object is within map boundaries */
768 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 694 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
769 { 695 {
770 LOG (llevError, "update_object() called for object out of map!\n"); 696 LOG (llevError, "update_object() called for object out of map!\n");
771#ifdef MANY_CORES 697#ifdef MANY_CORES
772 abort (); 698 abort ();
773#endif 699#endif
774 return; 700 return;
775 } 701 }
776 702
777 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 703 mapspace &m = op->ms ();
778 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
779 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
780 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
781 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
782 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
783 704
705 if (!(m.flags_ & P_UPTODATE))
706 /* nop */;
784 if (action == UP_OBJ_INSERT) 707 else if (action == UP_OBJ_INSERT)
785 { 708 {
709 // this is likely overkill, TODO: revisit (schmorp)
786 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 710 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
787 update_now = 1;
788
789 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 711 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790 update_now = 1; 712 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
791 713 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
714 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
792 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 715 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
793 update_now = 1;
794
795 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
796 update_now = 1;
797
798 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
799 update_now = 1;
800
801 if ((move_on | op->move_on) != move_on) 716 || (m.move_on | op->move_on ) != m.move_on
802 update_now = 1;
803
804 if ((move_off | op->move_off) != move_off) 717 || (m.move_off | op->move_off ) != m.move_off
805 update_now = 1; 718 || (m.move_slow | op->move_slow) != m.move_slow
806
807 /* This isn't perfect, but I don't expect a lot of objects to 719 /* This isn't perfect, but I don't expect a lot of objects to
808 * to have move_allow right now. 720 * to have move_allow right now.
809 */ 721 */
810 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 722 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
811 update_now = 1; 723 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
812 724 m.flags_ = 0;
813 if ((move_slow | op->move_slow) != move_slow)
814 update_now = 1;
815 } 725 }
816 /* if the object is being removed, we can't make intelligent 726 /* if the object is being removed, we can't make intelligent
817 * decisions, because remove_ob can't really pass the object 727 * decisions, because remove_ob can't really pass the object
818 * that is being removed. 728 * that is being removed.
819 */ 729 */
820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 730 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
821 update_now = 1; 731 m.flags_ = 0;
822 else if (action == UP_OBJ_FACE) 732 else if (action == UP_OBJ_FACE)
823 /* Nothing to do for that case */ ; 733 /* Nothing to do for that case */ ;
824 else 734 else
825 LOG (llevError, "update_object called with invalid action: %d\n", action); 735 LOG (llevError, "update_object called with invalid action: %d\n", action);
826 736
827 if (update_now)
828 {
829 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
830 update_position (op->map, op->x, op->y);
831 }
832
833 if (op->more != NULL) 737 if (op->more)
834 update_object (op->more, action); 738 update_object (op->more, action);
835}
836
837static unordered_vector<object *> mortals;
838static std::vector<object *> freed;
839
840void object::free_mortals ()
841{
842 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
843 if ((*i)->refcnt)
844 ++i; // further delay freeing
845 else
846 {
847 freed.push_back (*i);//D
848 //delete *i;
849 mortals.erase (i);
850 }
851
852 if (mortals.size())//D
853 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854} 739}
855 740
856object::object () 741object::object ()
857{ 742{
858 SET_FLAG (this, FLAG_REMOVED); 743 SET_FLAG (this, FLAG_REMOVED);
859 744
860 expmul = 1.0; 745 expmul = 1.0;
861 face = blank_face; 746 face = blank_face;
862 attacked_by_count = -1;
863} 747}
864 748
865object::~object () 749object::~object ()
866{ 750{
751 unlink ();
752
867 free_key_values (this); 753 free_key_values (this);
868} 754}
869 755
756static int object_count;
757
870void object::link () 758void object::link ()
871{ 759{
760 assert (!index);//D
761 uuid = gen_uuid ();
872 count = ++ob_count; 762 count = ++object_count;
873 763
874 prev = 0; 764 refcnt_inc ();
875 next = objects; 765 objects.insert (this);
876
877 if (objects)
878 objects->prev = this;
879
880 objects = this;
881} 766}
882 767
883void object::unlink () 768void object::unlink ()
884{ 769{
885 count = 0;
886
887 /* Remove this object from the list of used objects */
888 if (prev)
889 {
890 prev->next = next;
891 prev = 0;
892 }
893
894 if (next) 770 if (!index)
895 { 771 return;
896 next->prev = prev; 772
897 next = 0; 773 objects.erase (this);
774 refcnt_dec ();
775}
776
777void
778object::activate ()
779{
780 /* If already on active list, don't do anything */
781 if (active)
782 return;
783
784 if (has_active_speed ())
785 actives.insert (this);
786}
787
788void
789object::activate_recursive ()
790{
791 activate ();
792
793 for (object *op = inv; op; op = op->below)
794 op->activate_recursive ();
795}
796
797/* This function removes object 'op' from the list of active
798 * objects.
799 * This should only be used for style maps or other such
800 * reference maps where you don't want an object that isn't
801 * in play chewing up cpu time getting processed.
802 * The reverse of this is to call update_ob_speed, which
803 * will do the right thing based on the speed of the object.
804 */
805void
806object::deactivate ()
807{
808 /* If not on the active list, nothing needs to be done */
809 if (!active)
810 return;
811
812 actives.erase (this);
813}
814
815void
816object::deactivate_recursive ()
817{
818 for (object *op = inv; op; op = op->below)
819 op->deactivate_recursive ();
820
821 deactivate ();
822}
823
824void
825object::set_flag_inv (int flag, int value)
826{
827 for (object *op = inv; op; op = op->below)
898 } 828 {
829 op->flag [flag] = value;
830 op->set_flag_inv (flag, value);
831 }
832}
899 833
900 if (this == objects) 834/*
901 objects = next; 835 * Remove and free all objects in the inventory of the given object.
836 * object.c ?
837 */
838void
839object::destroy_inv (bool drop_to_ground)
840{
841 // need to check first, because the checks below might segfault
842 // as we might be on an invalid mapspace and crossfire code
843 // is too buggy to ensure that the inventory is empty.
844 // corollary: if you create arrows etc. with stuff in tis inventory,
845 // cf will crash below with off-map x and y
846 if (!inv)
847 return;
848
849 /* Only if the space blocks everything do we not process -
850 * if some form of movement is allowed, let objects
851 * drop on that space.
852 */
853 if (!drop_to_ground
854 || !map
855 || map->in_memory != MAP_IN_MEMORY
856 || map->nodrop
857 || ms ().move_block == MOVE_ALL)
858 {
859 while (inv)
860 {
861 inv->destroy_inv (drop_to_ground);
862 inv->destroy ();
863 }
864 }
865 else
866 { /* Put objects in inventory onto this space */
867 while (inv)
868 {
869 object *op = inv;
870
871 if (op->flag [FLAG_STARTEQUIP]
872 || op->flag [FLAG_NO_DROP]
873 || op->type == RUNE
874 || op->type == TRAP
875 || op->flag [FLAG_IS_A_TEMPLATE]
876 || op->flag [FLAG_DESTROY_ON_DEATH])
877 op->destroy ();
878 else
879 map->insert (op, x, y);
880 }
881 }
902} 882}
903 883
904object *object::create () 884object *object::create ()
905{ 885{
906 object *
907 op;
908
909 if (freed.empty ())
910 op = new object; 886 object *op = new object;
911 else
912 {
913 // highly annoying, but the only way to get it stable right now
914 op = freed.back ();
915 freed.pop_back ();
916 op->~object ();
917 new ((void *) op) object;
918 }
919
920 op->link (); 887 op->link ();
921 return op; 888 return op;
922} 889}
923 890
924/* 891void
925 * free_object() frees everything allocated by an object, removes 892object::do_destroy ()
926 * it from the list of used objects, and puts it on the list of
927 * free objects. The IS_FREED() flag is set in the object.
928 * The object must have been removed by remove_ob() first for
929 * this function to succeed.
930 *
931 * If free_inventory is set, free inventory as well. Else drop items in
932 * inventory to the ground.
933 */
934void object::free (bool free_inventory)
935{ 893{
936 if (QUERY_FLAG (this, FLAG_FREED)) 894 attachable::do_destroy ();
895
896 if (flag [FLAG_IS_LINKED])
897 remove_button_link (this);
898
899 if (flag [FLAG_FRIENDLY])
900 remove_friendly_object (this);
901
902 if (!flag [FLAG_REMOVED])
903 remove ();
904
905 destroy_inv (true);
906
907 deactivate ();
908 unlink ();
909
910 flag [FLAG_FREED] = 1;
911
912 // hack to ensure that freed objects still have a valid map
913 {
914 static maptile *freed_map; // freed objects are moved here to avoid crashes
915
916 if (!freed_map)
917 {
918 freed_map = new maptile;
919
920 freed_map->path = "<freed objects map>";
921 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3;
923 freed_map->height = 3;
924
925 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY;
927 }
928
929 map = freed_map;
930 x = 1;
931 y = 1;
932 }
933
934 if (more)
935 {
936 more->destroy ();
937 more = 0;
938 }
939
940 head = 0;
941
942 // clear those pointers that likely might cause circular references
943 owner = 0;
944 enemy = 0;
945 attacked_by = 0;
946 current_weapon = 0;
947}
948
949void
950object::destroy (bool destroy_inventory)
951{
952 if (destroyed ())
937 return; 953 return;
938 954
939 if (!QUERY_FLAG (this, FLAG_REMOVED)) 955 if (destroy_inventory)
940 remove_ob (this); 956 destroy_inv (false);
941 957
942 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 958 if (is_head ())
943 remove_friendly_object (this); 959 if (sound_destroy)
960 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
944 963
945 SET_FLAG (this, FLAG_FREED); 964 attachable::destroy ();
946
947 if (more)
948 {
949 more->free (free_inventory);
950 more = 0;
951 }
952
953 if (inv)
954 {
955 /* Only if the space blocks everything do we not process -
956 * if some form of movement is allowed, let objects
957 * drop on that space.
958 */
959 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
960 {
961 object *op = inv;
962
963 while (op)
964 {
965 object *tmp = op->below;
966 op->free (free_inventory);
967 op = tmp;
968 }
969 }
970 else
971 { /* Put objects in inventory onto this space */
972 object *op = inv;
973
974 while (op)
975 {
976 object *tmp = op->below;
977
978 remove_ob (op);
979
980 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
981 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
982 free_object (op);
983 else
984 {
985 op->x = x;
986 op->y = y;
987 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
988 }
989
990 op = tmp;
991 }
992 }
993 }
994
995 owner = 0;
996
997 /* Remove object from the active list */
998 speed = 0;
999 update_ob_speed (this);
1000
1001 unlink ();
1002
1003 mortals.push_back (this);
1004} 965}
1005 966
1006/* 967/*
1007 * sub_weight() recursively (outwards) subtracts a number from the 968 * sub_weight() recursively (outwards) subtracts a number from the
1008 * weight of an object (and what is carried by it's environment(s)). 969 * weight of an object (and what is carried by it's environment(s)).
1009 */ 970 */
1010
1011void 971void
1012sub_weight (object *op, signed long weight) 972sub_weight (object *op, signed long weight)
1013{ 973{
1014 while (op != NULL) 974 while (op != NULL)
1015 { 975 {
1016 if (op->type == CONTAINER) 976 if (op->type == CONTAINER)
1017 {
1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 977 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019 } 978
1020 op->carrying -= weight; 979 op->carrying -= weight;
1021 op = op->env; 980 op = op->env;
1022 } 981 }
1023} 982}
1024 983
1025/* remove_ob(op): 984/* op->remove ():
1026 * This function removes the object op from the linked list of objects 985 * This function removes the object op from the linked list of objects
1027 * which it is currently tied to. When this function is done, the 986 * which it is currently tied to. When this function is done, the
1028 * object will have no environment. If the object previously had an 987 * object will have no environment. If the object previously had an
1029 * environment, the x and y coordinates will be updated to 988 * environment, the x and y coordinates will be updated to
1030 * the previous environment. 989 * the previous environment.
1031 * Beware: This function is called from the editor as well!
1032 */ 990 */
1033
1034void 991void
1035remove_ob (object *op) 992object::do_remove ()
1036{ 993{
994 object *tmp, *last = 0;
1037 object * 995 object *otmp;
1038 tmp, *
1039 last = NULL;
1040 object *
1041 otmp;
1042 996
1043 tag_t
1044 tag;
1045 int
1046 check_walk_off;
1047 mapstruct *
1048 m;
1049
1050 sint16
1051 x,
1052 y;
1053
1054 if (QUERY_FLAG (op, FLAG_REMOVED)) 997 if (QUERY_FLAG (this, FLAG_REMOVED))
1055 return; 998 return;
1056 999
1057 SET_FLAG (op, FLAG_REMOVED); 1000 SET_FLAG (this, FLAG_REMOVED);
1001 INVOKE_OBJECT (REMOVE, this);
1058 1002
1059 if (op->more != NULL) 1003 if (more)
1060 remove_ob (op->more); 1004 more->remove ();
1061 1005
1062 /* 1006 /*
1063 * In this case, the object to be removed is in someones 1007 * In this case, the object to be removed is in someones
1064 * inventory. 1008 * inventory.
1065 */ 1009 */
1066 if (op->env != NULL) 1010 if (env)
1067 { 1011 {
1068 if (op->nrof) 1012 if (nrof)
1069 sub_weight (op->env, op->weight * op->nrof); 1013 sub_weight (env, weight * nrof);
1070 else 1014 else
1071 sub_weight (op->env, op->weight + op->carrying); 1015 sub_weight (env, weight + carrying);
1072 1016
1073 /* NO_FIX_PLAYER is set when a great many changes are being 1017 /* NO_FIX_PLAYER is set when a great many changes are being
1074 * made to players inventory. If set, avoiding the call 1018 * made to players inventory. If set, avoiding the call
1075 * to save cpu time. 1019 * to save cpu time.
1076 */ 1020 */
1077 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1021 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1078 fix_player (otmp); 1022 otmp->update_stats ();
1079 1023
1080 if (op->above != NULL) 1024 if (above)
1081 op->above->below = op->below; 1025 above->below = below;
1082 else 1026 else
1083 op->env->inv = op->below; 1027 env->inv = below;
1084 1028
1085 if (op->below != NULL) 1029 if (below)
1086 op->below->above = op->above; 1030 below->above = above;
1087 1031
1088 /* we set up values so that it could be inserted into 1032 /* we set up values so that it could be inserted into
1089 * the map, but we don't actually do that - it is up 1033 * the map, but we don't actually do that - it is up
1090 * to the caller to decide what we want to do. 1034 * to the caller to decide what we want to do.
1091 */ 1035 */
1092 op->x = op->env->x, op->y = op->env->y; 1036 x = env->x, y = env->y;
1093 op->map = op->env->map; 1037 map = env->map;
1094 op->above = NULL, op->below = NULL; 1038 above = 0, below = 0;
1095 op->env = NULL; 1039 env = 0;
1096 } 1040 }
1097 else if (op->map) 1041 else if (map)
1098 { 1042 {
1099 x = op->x; 1043 if (type == PLAYER)
1100 y = op->y;
1101 m = get_map_from_coord (op->map, &x, &y);
1102
1103 if (!m)
1104 {
1105 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1106 op->map->path, op->x, op->y);
1107 /* in old days, we used to set x and y to 0 and continue.
1108 * it seems if we get into this case, something is probablye
1109 * screwed up and should be fixed.
1110 */
1111 abort ();
1112 } 1044 {
1045 // leaving a spot always closes any open container on the ground
1046 if (container && !container->env)
1047 // this causes spurious floorbox updates, but it ensures
1048 // that the CLOSE event is being sent.
1049 close_container ();
1113 1050
1114 if (op->map != m) 1051 --map->players;
1115 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1052 map->touch ();
1116 op->map->path, m->path, op->x, op->y, x, y);
1117
1118 /* Re did the following section of code - it looks like it had
1119 * lots of logic for things we no longer care about
1120 */ 1053 }
1054
1055 map->dirty = true;
1056 mapspace &ms = this->ms ();
1121 1057
1122 /* link the object above us */ 1058 /* link the object above us */
1123 if (op->above) 1059 if (above)
1124 op->above->below = op->below; 1060 above->below = below;
1125 else 1061 else
1126 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1062 ms.top = below; /* we were top, set new top */
1127 1063
1128 /* Relink the object below us, if there is one */ 1064 /* Relink the object below us, if there is one */
1129 if (op->below) 1065 if (below)
1130 op->below->above = op->above; 1066 below->above = above;
1131 else 1067 else
1132 { 1068 {
1133 /* Nothing below, which means we need to relink map object for this space 1069 /* Nothing below, which means we need to relink map object for this space
1134 * use translated coordinates in case some oddness with map tiling is 1070 * use translated coordinates in case some oddness with map tiling is
1135 * evident 1071 * evident
1136 */ 1072 */
1137 if (GET_MAP_OB (m, x, y) != op) 1073 if (GET_MAP_OB (map, x, y) != this)
1138 {
1139 dump_object (op);
1140 LOG (llevError,
1141 "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); 1074 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1142 dump_object (GET_MAP_OB (m, x, y)); 1075
1143 LOG (llevError, "%s\n", errmsg); 1076 ms.bot = above; /* goes on above it. */
1144 } 1077 }
1145 1078
1146 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1147 }
1148
1149 op->above = 0; 1079 above = 0;
1150 op->below = 0; 1080 below = 0;
1151 1081
1152 if (op->map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1153 return; 1083 return;
1154 1084
1155 tag = op->count; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1156 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1157 1086
1158 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1087 if (object *pl = ms.player ())
1088 {
1089 if (pl->container == this)
1090 /* If a container that the player is currently using somehow gets
1091 * removed (most likely destroyed), update the player view
1092 * appropriately.
1093 */
1094 pl->close_container ();
1095
1096 pl->contr->ns->floorbox_update ();
1097 }
1098
1099 for (tmp = ms.bot; tmp; tmp = tmp->above)
1159 { 1100 {
1160 /* No point updating the players look faces if he is the object 1101 /* No point updating the players look faces if he is the object
1161 * being removed. 1102 * being removed.
1162 */ 1103 */
1163 1104
1164 if (tmp->type == PLAYER && tmp != op) 1105 /* See if object moving off should effect something */
1106 if (check_walk_off
1107 && ((move_type & tmp->move_off)
1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1165 { 1109 {
1166 /* If a container that the player is currently using somehow gets 1110 move_apply (tmp, this, 0);
1167 * removed (most likely destroyed), update the player view
1168 * appropriately.
1169 */
1170 if (tmp->container == op)
1171 {
1172 CLEAR_FLAG (op, FLAG_APPLIED);
1173 tmp->container = NULL;
1174 }
1175 1111
1176 tmp->contr->socket.update_look = 1; 1112 if (destroyed ())
1113 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1177 } 1114 }
1178 1115
1179 /* See if player moving off should effect something */
1180 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181 {
1182 move_apply (tmp, op, NULL);
1183
1184 if (was_destroyed (op, tag))
1185 {
1186 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1187 }
1188 }
1189
1190 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191
1192 if (tmp->above == tmp)
1193 tmp->above = NULL;
1194
1195 last = tmp; 1116 last = tmp;
1196 } 1117 }
1197 1118
1198 /* last == NULL of there are no objects on this space */ 1119 /* last == NULL if there are no objects on this space */
1120 //TODO: this makes little sense, why only update the topmost object?
1199 if (last == NULL) 1121 if (!last)
1200 { 1122 map->at (x, y).flags_ = 0;
1201 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1202 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1203 * those out anyways, and if there are any flags set right now, they won't
1204 * be correct anyways.
1205 */
1206 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1207 update_position (op->map, op->x, op->y);
1208 }
1209 else 1123 else
1210 update_object (last, UP_OBJ_REMOVE); 1124 update_object (last, UP_OBJ_REMOVE);
1211 1125
1212 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1126 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1213 update_all_los (op->map, op->x, op->y); 1127 update_all_los (map, x, y);
1214 } 1128 }
1215} 1129}
1216 1130
1217/* 1131/*
1218 * merge_ob(op,top): 1132 * merge_ob(op,top):
… …
1220 * This function goes through all objects below and including top, and 1134 * This function goes through all objects below and including top, and
1221 * merges op to the first matching object. 1135 * merges op to the first matching object.
1222 * If top is NULL, it is calculated. 1136 * If top is NULL, it is calculated.
1223 * Returns pointer to object if it succeded in the merge, otherwise NULL 1137 * Returns pointer to object if it succeded in the merge, otherwise NULL
1224 */ 1138 */
1225
1226object * 1139object *
1227merge_ob (object *op, object *top) 1140merge_ob (object *op, object *top)
1228{ 1141{
1229 if (!op->nrof) 1142 if (!op->nrof)
1230 return 0; 1143 return 0;
1231 1144
1232 if (top == NULL) 1145 if (top)
1233 for (top = op; top != NULL && top->above != NULL; top = top->above); 1146 for (top = op; top && top->above; top = top->above)
1147 ;
1234 1148
1235 for (; top != NULL; top = top->below) 1149 for (; top; top = top->below)
1236 { 1150 {
1237 if (top == op) 1151 if (top == op)
1238 continue; 1152 continue;
1239 if (CAN_MERGE (op, top)) 1153
1154 if (object::can_merge (op, top))
1240 { 1155 {
1241 top->nrof += op->nrof; 1156 top->nrof += op->nrof;
1242 1157
1243/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1158/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244 op->weight = 0; /* Don't want any adjustements now */ 1159 op->weight = 0; /* Don't want any adjustements now */
1245 remove_ob (op); 1160 op->destroy ();
1246 free_object (op);
1247 return top; 1161 return top;
1248 } 1162 }
1249 } 1163 }
1250 1164
1251 return NULL; 1165 return 0;
1252} 1166}
1253 1167
1168void
1169object::expand_tail ()
1170{
1171 if (more)
1172 return;
1173
1174 object *prev = this;
1175
1176 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1177 {
1178 object *op = arch_to_object (at);
1179
1180 op->name = name;
1181 op->name_pl = name_pl;
1182 op->title = title;
1183
1184 op->head = this;
1185 prev->more = op;
1186
1187 prev = op;
1188 }
1189}
1190
1254/* 1191/*
1255 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1192 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1256 * job preparing multi-part monsters 1193 * job preparing multi-part monsters.
1257 */ 1194 */
1258object * 1195object *
1259insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1196insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260{ 1197{
1261 object *tmp;
1262
1263 if (op->head)
1264 op = op->head;
1265
1266 for (tmp = op; tmp; tmp = tmp->more) 1198 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1267 { 1199 {
1268 tmp->x = x + tmp->arch->clone.x; 1200 tmp->x = x + tmp->arch->x;
1269 tmp->y = y + tmp->arch->clone.y; 1201 tmp->y = y + tmp->arch->y;
1270 } 1202 }
1271 1203
1272 return insert_ob_in_map (op, m, originator, flag); 1204 return insert_ob_in_map (op, m, originator, flag);
1273} 1205}
1274 1206
… …
1290 * Return value: 1222 * Return value:
1291 * new object if 'op' was merged with other object 1223 * new object if 'op' was merged with other object
1292 * NULL if 'op' was destroyed 1224 * NULL if 'op' was destroyed
1293 * just 'op' otherwise 1225 * just 'op' otherwise
1294 */ 1226 */
1295
1296object * 1227object *
1297insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1228insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298{ 1229{
1230 assert (!op->flag [FLAG_FREED]);
1231
1299 object *tmp, *top, *floor = NULL; 1232 object *top, *floor = NULL;
1300 sint16 x, y;
1301 1233
1302 if (QUERY_FLAG (op, FLAG_FREED)) 1234 op->remove ();
1303 {
1304 LOG (llevError, "Trying to insert freed object!\n");
1305 return NULL;
1306 }
1307
1308 if (m == NULL)
1309 {
1310 dump_object (op);
1311 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1312 return op;
1313 }
1314
1315 if (out_of_map (m, op->x, op->y))
1316 {
1317 dump_object (op);
1318 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1319#ifdef MANY_CORES
1320 /* Better to catch this here, as otherwise the next use of this object
1321 * is likely to cause a crash. Better to find out where it is getting
1322 * improperly inserted.
1323 */
1324 abort ();
1325#endif
1326 return op;
1327 }
1328
1329 if (!QUERY_FLAG (op, FLAG_REMOVED))
1330 {
1331 dump_object (op);
1332 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1333 return op;
1334 }
1335
1336 if (op->more != NULL)
1337 {
1338 /* The part may be on a different map. */
1339
1340 object *more = op->more;
1341
1342 /* We really need the caller to normalize coordinates - if
1343 * we set the map, that doesn't work if the location is within
1344 * a map and this is straddling an edge. So only if coordinate
1345 * is clear wrong do we normalize it.
1346 */
1347 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1348 more->map = get_map_from_coord (m, &more->x, &more->y);
1349 else if (!more->map)
1350 {
1351 /* For backwards compatibility - when not dealing with tiled maps,
1352 * more->map should always point to the parent.
1353 */
1354 more->map = m;
1355 }
1356
1357 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1358 {
1359 if (!op->head)
1360 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1361
1362 return NULL;
1363 }
1364 }
1365
1366 CLEAR_FLAG (op, FLAG_REMOVED);
1367 1235
1368 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1369 * of areas of callers (eg, anything that uses find_free_spot would now 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1370 * need extra work 1238 * need extra work
1371 */ 1239 */
1372 op->map = get_map_from_coord (m, &op->x, &op->y); 1240 if (!xy_normalise (m, op->x, op->y))
1373 x = op->x; 1241 {
1374 y = op->y; 1242 op->destroy ();
1243 return 0;
1244 }
1245
1246 if (object *more = op->more)
1247 if (!insert_ob_in_map (more, m, originator, flag))
1248 return 0;
1249
1250 CLEAR_FLAG (op, FLAG_REMOVED);
1251
1252 op->map = m;
1253 mapspace &ms = op->ms ();
1375 1254
1376 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
1377 */ 1256 */
1378 if (op->nrof && !(flag & INS_NO_MERGE)) 1257 if (op->nrof && !(flag & INS_NO_MERGE))
1379 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1258 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1380 if (CAN_MERGE (op, tmp)) 1259 if (object::can_merge (op, tmp))
1381 { 1260 {
1382 op->nrof += tmp->nrof; 1261 op->nrof += tmp->nrof;
1383 remove_ob (tmp); 1262 tmp->destroy ();
1384 free_object (tmp);
1385 } 1263 }
1386 1264
1387 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1265 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1388 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1266 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389 1267
… …
1402 op->below = originator->below; 1280 op->below = originator->below;
1403 1281
1404 if (op->below) 1282 if (op->below)
1405 op->below->above = op; 1283 op->below->above = op;
1406 else 1284 else
1407 SET_MAP_OB (op->map, op->x, op->y, op); 1285 ms.bot = op;
1408 1286
1409 /* since *below* originator, no need to update top */ 1287 /* since *below* originator, no need to update top */
1410 originator->below = op; 1288 originator->below = op;
1411 } 1289 }
1412 else 1290 else
1413 { 1291 {
1292 top = ms.bot;
1293
1414 /* If there are other objects, then */ 1294 /* If there are other objects, then */
1415 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1295 if (top)
1416 { 1296 {
1417 object *last = NULL; 1297 object *last = 0;
1418 1298
1419 /* 1299 /*
1420 * If there are multiple objects on this space, we do some trickier handling. 1300 * If there are multiple objects on this space, we do some trickier handling.
1421 * We've already dealt with merging if appropriate. 1301 * We've already dealt with merging if appropriate.
1422 * Generally, we want to put the new object on top. But if 1302 * Generally, we want to put the new object on top. But if
… …
1426 * once we get to them. This reduces the need to traverse over all of 1306 * once we get to them. This reduces the need to traverse over all of
1427 * them when adding another one - this saves quite a bit of cpu time 1307 * them when adding another one - this saves quite a bit of cpu time
1428 * when lots of spells are cast in one area. Currently, it is presumed 1308 * when lots of spells are cast in one area. Currently, it is presumed
1429 * that flying non pickable objects are spell objects. 1309 * that flying non pickable objects are spell objects.
1430 */ 1310 */
1431 1311 for (top = ms.bot; top; top = top->above)
1432 while (top != NULL)
1433 { 1312 {
1434 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1313 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1435 floor = top; 1314 floor = top;
1436 1315
1437 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1316 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1440 top = top->below; 1319 top = top->below;
1441 break; 1320 break;
1442 } 1321 }
1443 1322
1444 last = top; 1323 last = top;
1445 top = top->above;
1446 } 1324 }
1447 1325
1448 /* Don't want top to be NULL, so set it to the last valid object */ 1326 /* Don't want top to be NULL, so set it to the last valid object */
1449 top = last; 1327 top = last;
1450 1328
… …
1452 * looks like instead of lots of conditions here. 1330 * looks like instead of lots of conditions here.
1453 * makes things faster, and effectively the same result. 1331 * makes things faster, and effectively the same result.
1454 */ 1332 */
1455 1333
1456 /* Have object 'fall below' other objects that block view. 1334 /* Have object 'fall below' other objects that block view.
1457 * Unless those objects are exits, type 66 1335 * Unless those objects are exits.
1458 * If INS_ON_TOP is used, don't do this processing 1336 * If INS_ON_TOP is used, don't do this processing
1459 * Need to find the object that in fact blocks view, otherwise 1337 * Need to find the object that in fact blocks view, otherwise
1460 * stacking is a bit odd. 1338 * stacking is a bit odd.
1461 */ 1339 */
1462 if (!(flag & INS_ON_TOP) && 1340 if (!(flag & INS_ON_TOP)
1463 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1341 && ms.flags () & P_BLOCKSVIEW
1342 && (op->face && !faces [op->face].visibility))
1464 { 1343 {
1465 for (last = top; last != floor; last = last->below) 1344 for (last = top; last != floor; last = last->below)
1466 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1345 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1467 break; 1346 break;
1347
1468 /* Check to see if we found the object that blocks view, 1348 /* Check to see if we found the object that blocks view,
1469 * and make sure we have a below pointer for it so that 1349 * and make sure we have a below pointer for it so that
1470 * we can get inserted below this one, which requires we 1350 * we can get inserted below this one, which requires we
1471 * set top to the object below us. 1351 * set top to the object below us.
1472 */ 1352 */
1473 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1474 top = last->below; 1354 top = last->below;
1475 } 1355 }
1476 } /* If objects on this space */ 1356 } /* If objects on this space */
1477 1357
1478 if (flag & INS_MAP_LOAD)
1479 top = GET_MAP_TOP (op->map, op->x, op->y);
1480
1481 if (flag & INS_ABOVE_FLOOR_ONLY) 1358 if (flag & INS_ABOVE_FLOOR_ONLY)
1482 top = floor; 1359 top = floor;
1483 1360
1484 /* Top is the object that our object (op) is going to get inserted above. 1361 /* Top is the object that our object (op) is going to get inserted above.
1485 */ 1362 */
1486 1363
1487 /* First object on this space */ 1364 /* First object on this space */
1488 if (!top) 1365 if (!top)
1489 { 1366 {
1490 op->above = GET_MAP_OB (op->map, op->x, op->y); 1367 op->above = ms.bot;
1491 1368
1492 if (op->above) 1369 if (op->above)
1493 op->above->below = op; 1370 op->above->below = op;
1494 1371
1495 op->below = NULL; 1372 op->below = 0;
1496 SET_MAP_OB (op->map, op->x, op->y, op); 1373 ms.bot = op;
1497 } 1374 }
1498 else 1375 else
1499 { /* get inserted into the stack above top */ 1376 { /* get inserted into the stack above top */
1500 op->above = top->above; 1377 op->above = top->above;
1501 1378
… …
1504 1381
1505 op->below = top; 1382 op->below = top;
1506 top->above = op; 1383 top->above = op;
1507 } 1384 }
1508 1385
1509 if (op->above == NULL) 1386 if (!op->above)
1510 SET_MAP_TOP (op->map, op->x, op->y, op); 1387 ms.top = op;
1511 } /* else not INS_BELOW_ORIGINATOR */ 1388 } /* else not INS_BELOW_ORIGINATOR */
1512 1389
1513 if (op->type == PLAYER) 1390 if (op->type == PLAYER)
1391 {
1514 op->contr->do_los = 1; 1392 op->contr->do_los = 1;
1393 ++op->map->players;
1394 op->map->touch ();
1395 }
1515 1396
1516 /* If we have a floor, we know the player, if any, will be above 1397 op->map->dirty = true;
1517 * it, so save a few ticks and start from there. 1398
1518 */ 1399 if (object *pl = ms.player ())
1519 if (!(flag & INS_MAP_LOAD)) 1400 pl->contr->ns->floorbox_update ();
1520 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1521 if (tmp->type == PLAYER)
1522 tmp->contr->socket.update_look = 1;
1523 1401
1524 /* If this object glows, it may affect lighting conditions that are 1402 /* If this object glows, it may affect lighting conditions that are
1525 * visible to others on this map. But update_all_los is really 1403 * visible to others on this map. But update_all_los is really
1526 * an inefficient way to do this, as it means los for all players 1404 * an inefficient way to do this, as it means los for all players
1527 * on the map will get recalculated. The players could very well 1405 * on the map will get recalculated. The players could very well
1528 * be far away from this change and not affected in any way - 1406 * be far away from this change and not affected in any way -
1529 * this should get redone to only look for players within range, 1407 * this should get redone to only look for players within range,
1530 * or just updating the P_NEED_UPDATE for spaces within this area 1408 * or just updating the P_UPTODATE for spaces within this area
1531 * of effect may be sufficient. 1409 * of effect may be sufficient.
1532 */ 1410 */
1533 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1411 if (op->map->darkness && (op->glow_radius != 0))
1534 update_all_los (op->map, op->x, op->y); 1412 update_all_los (op->map, op->x, op->y);
1535 1413
1536 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1414 /* updates flags (blocked, alive, no magic, etc) for this map space */
1537 update_object (op, UP_OBJ_INSERT); 1415 update_object (op, UP_OBJ_INSERT);
1538 1416
1417 INVOKE_OBJECT (INSERT, op);
1418
1539 /* Don't know if moving this to the end will break anything. However, 1419 /* Don't know if moving this to the end will break anything. However,
1540 * we want to have update_look set above before calling this. 1420 * we want to have floorbox_update called before calling this.
1541 * 1421 *
1542 * check_move_on() must be after this because code called from 1422 * check_move_on() must be after this because code called from
1543 * check_move_on() depends on correct map flags (so functions like 1423 * check_move_on() depends on correct map flags (so functions like
1544 * blocked() and wall() work properly), and these flags are updated by 1424 * blocked() and wall() work properly), and these flags are updated by
1545 * update_object(). 1425 * update_object().
1546 */ 1426 */
1547 1427
1548 /* if this is not the head or flag has been passed, don't check walk on status */ 1428 /* if this is not the head or flag has been passed, don't check walk on status */
1549 if (!(flag & INS_NO_WALK_ON) && !op->head) 1429 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1550 { 1430 {
1551 if (check_move_on (op, originator)) 1431 if (check_move_on (op, originator))
1552 return NULL; 1432 return 0;
1553 1433
1554 /* If we are a multi part object, lets work our way through the check 1434 /* If we are a multi part object, lets work our way through the check
1555 * walk on's. 1435 * walk on's.
1556 */ 1436 */
1557 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1437 for (object *tmp = op->more; tmp; tmp = tmp->more)
1558 if (check_move_on (tmp, originator)) 1438 if (check_move_on (tmp, originator))
1559 return NULL; 1439 return 0;
1560 } 1440 }
1561 1441
1562 return op; 1442 return op;
1563} 1443}
1564 1444
1565/* this function inserts an object in the map, but if it 1445/* this function inserts an object in the map, but if it
1566 * finds an object of its own type, it'll remove that one first. 1446 * finds an object of its own type, it'll remove that one first.
1567 * op is the object to insert it under: supplies x and the map. 1447 * op is the object to insert it under: supplies x and the map.
1568 */ 1448 */
1569void 1449void
1570replace_insert_ob_in_map (const char *arch_string, object *op) 1450replace_insert_ob_in_map (const char *arch_string, object *op)
1571{ 1451{
1572 object * 1452 object *tmp, *tmp1;
1573 tmp;
1574 object *
1575 tmp1;
1576 1453
1577 /* first search for itself and remove any old instances */ 1454 /* first search for itself and remove any old instances */
1578 1455
1579 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1456 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1580 {
1581 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1457 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1582 { 1458 tmp->destroy ();
1583 remove_ob (tmp);
1584 free_object (tmp);
1585 }
1586 }
1587 1459
1588 tmp1 = arch_to_object (find_archetype (arch_string)); 1460 tmp1 = arch_to_object (archetype::find (arch_string));
1589 1461
1590 tmp1->x = op->x; 1462 tmp1->x = op->x;
1591 tmp1->y = op->y; 1463 tmp1->y = op->y;
1592 insert_ob_in_map (tmp1, op->map, op, 0); 1464 insert_ob_in_map (tmp1, op->map, op, 0);
1465}
1466
1467object *
1468object::insert_at (object *where, object *originator, int flags)
1469{
1470 return where->map->insert (this, where->x, where->y, originator, flags);
1593} 1471}
1594 1472
1595/* 1473/*
1596 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1474 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1597 * is returned contains nr objects, and the remaining parts contains 1475 * is returned contains nr objects, and the remaining parts contains
1598 * the rest (or is removed and freed if that number is 0). 1476 * the rest (or is removed and freed if that number is 0).
1599 * On failure, NULL is returned, and the reason put into the 1477 * On failure, NULL is returned, and the reason put into the
1600 * global static errmsg array. 1478 * global static errmsg array.
1601 */ 1479 */
1602
1603object * 1480object *
1604get_split_ob (object *orig_ob, uint32 nr) 1481get_split_ob (object *orig_ob, uint32 nr)
1605{ 1482{
1606 object * 1483 object *newob;
1607 newob;
1608 int
1609 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1484 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1610 1485
1611 if (orig_ob->nrof < nr) 1486 if (orig_ob->nrof < nr)
1612 { 1487 {
1613 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1488 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1614 return NULL; 1489 return NULL;
1615 } 1490 }
1616 1491
1617 newob = object_create_clone (orig_ob); 1492 newob = object_create_clone (orig_ob);
1618 1493
1619 if ((orig_ob->nrof -= nr) < 1) 1494 if ((orig_ob->nrof -= nr) < 1)
1620 { 1495 orig_ob->destroy (1);
1621 if (!is_removed)
1622 remove_ob (orig_ob);
1623 free_object2 (orig_ob, 1);
1624 }
1625 else if (!is_removed) 1496 else if (!is_removed)
1626 { 1497 {
1627 if (orig_ob->env != NULL) 1498 if (orig_ob->env != NULL)
1628 sub_weight (orig_ob->env, orig_ob->weight * nr); 1499 sub_weight (orig_ob->env, orig_ob->weight * nr);
1629 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1500 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1644 * the amount of an object. If the amount reaches 0, the object 1515 * the amount of an object. If the amount reaches 0, the object
1645 * is subsequently removed and freed. 1516 * is subsequently removed and freed.
1646 * 1517 *
1647 * Return value: 'op' if something is left, NULL if the amount reached 0 1518 * Return value: 'op' if something is left, NULL if the amount reached 0
1648 */ 1519 */
1649
1650object * 1520object *
1651decrease_ob_nr (object *op, uint32 i) 1521decrease_ob_nr (object *op, uint32 i)
1652{ 1522{
1653 object *tmp; 1523 object *tmp;
1654 player *pl;
1655 1524
1656 if (i == 0) /* objects with op->nrof require this check */ 1525 if (i == 0) /* objects with op->nrof require this check */
1657 return op; 1526 return op;
1658 1527
1659 if (i > op->nrof) 1528 if (i > op->nrof)
1660 i = op->nrof; 1529 i = op->nrof;
1661 1530
1662 if (QUERY_FLAG (op, FLAG_REMOVED)) 1531 if (QUERY_FLAG (op, FLAG_REMOVED))
1663 op->nrof -= i; 1532 op->nrof -= i;
1664 else if (op->env != NULL) 1533 else if (op->env)
1665 { 1534 {
1666 /* is this object in the players inventory, or sub container 1535 /* is this object in the players inventory, or sub container
1667 * therein? 1536 * therein?
1668 */ 1537 */
1669 tmp = is_player_inv (op->env); 1538 tmp = op->in_player ();
1670 /* nope. Is this a container the player has opened? 1539 /* nope. Is this a container the player has opened?
1671 * If so, set tmp to that player. 1540 * If so, set tmp to that player.
1672 * IMO, searching through all the players will mostly 1541 * IMO, searching through all the players will mostly
1673 * likely be quicker than following op->env to the map, 1542 * likely be quicker than following op->env to the map,
1674 * and then searching the map for a player. 1543 * and then searching the map for a player.
1675 */ 1544 */
1676 if (!tmp) 1545 if (!tmp)
1677 { 1546 for_all_players (pl)
1678 for (pl = first_player; pl; pl = pl->next)
1679 if (pl->ob->container == op->env) 1547 if (pl->ob->container == op->env)
1548 {
1549 tmp = pl->ob;
1680 break; 1550 break;
1681 if (pl)
1682 tmp = pl->ob;
1683 else
1684 tmp = NULL;
1685 } 1551 }
1686 1552
1687 if (i < op->nrof) 1553 if (i < op->nrof)
1688 { 1554 {
1689 sub_weight (op->env, op->weight * i); 1555 sub_weight (op->env, op->weight * i);
1690 op->nrof -= i; 1556 op->nrof -= i;
1691 if (tmp) 1557 if (tmp)
1692 {
1693 esrv_send_item (tmp, op); 1558 esrv_send_item (tmp, op);
1694 }
1695 } 1559 }
1696 else 1560 else
1697 { 1561 {
1698 remove_ob (op); 1562 op->remove ();
1699 op->nrof = 0; 1563 op->nrof = 0;
1700 if (tmp) 1564 if (tmp)
1701 {
1702 esrv_del_item (tmp->contr, op->count); 1565 esrv_del_item (tmp->contr, op->count);
1703 }
1704 } 1566 }
1705 } 1567 }
1706 else 1568 else
1707 { 1569 {
1708 object *above = op->above; 1570 object *above = op->above;
1709 1571
1710 if (i < op->nrof) 1572 if (i < op->nrof)
1711 op->nrof -= i; 1573 op->nrof -= i;
1712 else 1574 else
1713 { 1575 {
1714 remove_ob (op); 1576 op->remove ();
1715 op->nrof = 0; 1577 op->nrof = 0;
1716 } 1578 }
1717 1579
1718 /* Since we just removed op, op->above is null */ 1580 /* Since we just removed op, op->above is null */
1719 for (tmp = above; tmp != NULL; tmp = tmp->above) 1581 for (tmp = above; tmp; tmp = tmp->above)
1720 if (tmp->type == PLAYER) 1582 if (tmp->type == PLAYER)
1721 { 1583 {
1722 if (op->nrof) 1584 if (op->nrof)
1723 esrv_send_item (tmp, op); 1585 esrv_send_item (tmp, op);
1724 else 1586 else
… …
1728 1590
1729 if (op->nrof) 1591 if (op->nrof)
1730 return op; 1592 return op;
1731 else 1593 else
1732 { 1594 {
1733 free_object (op); 1595 op->destroy ();
1734 return NULL; 1596 return 0;
1735 } 1597 }
1736} 1598}
1737 1599
1738/* 1600/*
1739 * add_weight(object, weight) adds the specified weight to an object, 1601 * add_weight(object, weight) adds the specified weight to an object,
1740 * and also updates how much the environment(s) is/are carrying. 1602 * and also updates how much the environment(s) is/are carrying.
1741 */ 1603 */
1742
1743void 1604void
1744add_weight (object *op, signed long weight) 1605add_weight (object *op, signed long weight)
1745{ 1606{
1746 while (op != NULL) 1607 while (op != NULL)
1747 { 1608 {
… …
1751 op->carrying += weight; 1612 op->carrying += weight;
1752 op = op->env; 1613 op = op->env;
1753 } 1614 }
1754} 1615}
1755 1616
1617object *
1618insert_ob_in_ob (object *op, object *where)
1619{
1620 if (!where)
1621 {
1622 char *dump = dump_object (op);
1623 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1624 free (dump);
1625 return op;
1626 }
1627
1628 if (where->head_ () != where)
1629 {
1630 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1631 where = where->head;
1632 }
1633
1634 return where->insert (op);
1635}
1636
1756/* 1637/*
1757 * insert_ob_in_ob(op,environment): 1638 * env->insert (op)
1758 * This function inserts the object op in the linked list 1639 * This function inserts the object op in the linked list
1759 * inside the object environment. 1640 * inside the object environment.
1760 * 1641 *
1761 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1762 * the inventory at the last position or next to other objects of the same
1763 * type.
1764 * Frank: Now sorted by type, archetype and magic!
1765 *
1766 * The function returns now pointer to inserted item, and return value can 1642 * The function returns now pointer to inserted item, and return value can
1767 * be != op, if items are merged. -Tero 1643 * be != op, if items are merged. -Tero
1768 */ 1644 */
1769
1770object * 1645object *
1771insert_ob_in_ob (object *op, object *where) 1646object::insert (object *op)
1772{ 1647{
1773 object *
1774 tmp, *
1775 otmp;
1776
1777 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1648 if (!QUERY_FLAG (op, FLAG_REMOVED))
1778 { 1649 op->remove ();
1779 dump_object (op);
1780 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1781 return op;
1782 }
1783
1784 if (where == NULL)
1785 {
1786 dump_object (op);
1787 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1788 return op;
1789 }
1790
1791 if (where->head)
1792 {
1793 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1794 where = where->head;
1795 }
1796 1650
1797 if (op->more) 1651 if (op->more)
1798 { 1652 {
1799 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1653 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1800 return op; 1654 return op;
1801 } 1655 }
1802 1656
1803 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1657 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804 CLEAR_FLAG (op, FLAG_REMOVED); 1658 CLEAR_FLAG (op, FLAG_REMOVED);
1659
1805 if (op->nrof) 1660 if (op->nrof)
1806 { 1661 {
1807 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1662 for (object *tmp = inv; tmp; tmp = tmp->below)
1808 if (CAN_MERGE (tmp, op)) 1663 if (object::can_merge (tmp, op))
1809 { 1664 {
1810 /* return the original object and remove inserted object 1665 /* return the original object and remove inserted object
1811 (client needs the original object) */ 1666 (client needs the original object) */
1812 tmp->nrof += op->nrof; 1667 tmp->nrof += op->nrof;
1813 /* Weight handling gets pretty funky. Since we are adding to 1668 /* Weight handling gets pretty funky. Since we are adding to
1814 * tmp->nrof, we need to increase the weight. 1669 * tmp->nrof, we need to increase the weight.
1815 */ 1670 */
1816 add_weight (where, op->weight * op->nrof); 1671 add_weight (this, op->weight * op->nrof);
1817 SET_FLAG (op, FLAG_REMOVED); 1672 SET_FLAG (op, FLAG_REMOVED);
1818 free_object (op); /* free the inserted object */ 1673 op->destroy (); /* free the inserted object */
1819 op = tmp; 1674 op = tmp;
1820 remove_ob (op); /* and fix old object's links */ 1675 op->remove (); /* and fix old object's links */
1821 CLEAR_FLAG (op, FLAG_REMOVED); 1676 CLEAR_FLAG (op, FLAG_REMOVED);
1822 break; 1677 break;
1823 } 1678 }
1824 1679
1825 /* I assume combined objects have no inventory 1680 /* I assume combined objects have no inventory
1826 * We add the weight - this object could have just been removed 1681 * We add the weight - this object could have just been removed
1827 * (if it was possible to merge). calling remove_ob will subtract 1682 * (if it was possible to merge). calling remove_ob will subtract
1828 * the weight, so we need to add it in again, since we actually do 1683 * the weight, so we need to add it in again, since we actually do
1829 * the linking below 1684 * the linking below
1830 */ 1685 */
1831 add_weight (where, op->weight * op->nrof); 1686 add_weight (this, op->weight * op->nrof);
1832 } 1687 }
1833 else 1688 else
1834 add_weight (where, (op->weight + op->carrying)); 1689 add_weight (this, (op->weight + op->carrying));
1835 1690
1836 otmp = is_player_inv (where); 1691 if (object *otmp = this->in_player ())
1837 if (otmp && otmp->contr != NULL)
1838 {
1839 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1692 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840 fix_player (otmp); 1693 otmp->update_stats ();
1841 }
1842 1694
1695 op->owner = 0; // its his/hers now. period.
1843 op->map = NULL; 1696 op->map = 0;
1844 op->env = where; 1697 op->env = this;
1845 op->above = NULL; 1698 op->above = 0;
1846 op->below = NULL; 1699 op->below = 0;
1847 op->x = 0, op->y = 0; 1700 op->x = op->y = 0;
1848 1701
1849 /* reset the light list and los of the players on the map */ 1702 /* reset the light list and los of the players on the map */
1850 if ((op->glow_radius != 0) && where->map) 1703 if (op->glow_radius && map)
1851 { 1704 {
1852#ifdef DEBUG_LIGHTS 1705#ifdef DEBUG_LIGHTS
1853 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1854#endif /* DEBUG_LIGHTS */ 1707#endif /* DEBUG_LIGHTS */
1855 if (MAP_DARKNESS (where->map)) 1708 if (map->darkness)
1856 update_all_los (where->map, where->x, where->y); 1709 update_all_los (map, x, y);
1857 } 1710 }
1858 1711
1859 /* Client has no idea of ordering so lets not bother ordering it here. 1712 /* Client has no idea of ordering so lets not bother ordering it here.
1860 * It sure simplifies this function... 1713 * It sure simplifies this function...
1861 */ 1714 */
1862 if (where->inv == NULL) 1715 if (!inv)
1863 where->inv = op; 1716 inv = op;
1864 else 1717 else
1865 { 1718 {
1866 op->below = where->inv; 1719 op->below = inv;
1867 op->below->above = op; 1720 op->below->above = op;
1868 where->inv = op; 1721 inv = op;
1869 } 1722 }
1723
1724 INVOKE_OBJECT (INSERT, this);
1725
1870 return op; 1726 return op;
1871} 1727}
1872 1728
1873/* 1729/*
1874 * Checks if any objects has a move_type that matches objects 1730 * Checks if any objects has a move_type that matches objects
… …
1888 * 1744 *
1889 * MSW 2001-07-08: Check all objects on space, not just those below 1745 * MSW 2001-07-08: Check all objects on space, not just those below
1890 * object being inserted. insert_ob_in_map may not put new objects 1746 * object being inserted. insert_ob_in_map may not put new objects
1891 * on top. 1747 * on top.
1892 */ 1748 */
1893
1894int 1749int
1895check_move_on (object *op, object *originator) 1750check_move_on (object *op, object *originator)
1896{ 1751{
1897 object * 1752 object *tmp;
1898 tmp; 1753 maptile *m = op->map;
1899 tag_t
1900 tag;
1901 mapstruct *
1902 m = op->map;
1903 int
1904 x = op->x, y = op->y; 1754 int x = op->x, y = op->y;
1905 1755
1906 MoveType 1756 MoveType move_on, move_slow, move_block;
1907 move_on,
1908 move_slow,
1909 move_block;
1910 1757
1911 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1758 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912 return 0; 1759 return 0;
1913
1914 tag = op->count;
1915 1760
1916 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1761 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1762 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1763 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919 1764
… …
1935 1780
1936 /* The objects have to be checked from top to bottom. 1781 /* The objects have to be checked from top to bottom.
1937 * Hence, we first go to the top: 1782 * Hence, we first go to the top:
1938 */ 1783 */
1939 1784
1940 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1785 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1941 { 1786 {
1942 /* Trim the search when we find the first other spell effect 1787 /* Trim the search when we find the first other spell effect
1943 * this helps performance so that if a space has 50 spell objects, 1788 * this helps performance so that if a space has 50 spell objects,
1944 * we don't need to check all of them. 1789 * we don't need to check all of them.
1945 */ 1790 */
… …
1963 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1808 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1964 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1809 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1965 { 1810 {
1966 1811
1967 float 1812 float
1968 diff = tmp->move_slow_penalty * FABS (op->speed); 1813 diff = tmp->move_slow_penalty * fabs (op->speed);
1969 1814
1970 if (op->type == PLAYER) 1815 if (op->type == PLAYER)
1971 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1816 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1972 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1817 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1973 diff /= 4.0; 1818 diff /= 4.0;
… …
1980 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1825 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1826 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982 { 1827 {
1983 move_apply (tmp, op, originator); 1828 move_apply (tmp, op, originator);
1984 1829
1985 if (was_destroyed (op, tag)) 1830 if (op->destroyed ())
1986 return 1; 1831 return 1;
1987 1832
1988 /* what the person/creature stepped onto has moved the object 1833 /* what the person/creature stepped onto has moved the object
1989 * someplace new. Don't process any further - if we did, 1834 * someplace new. Don't process any further - if we did,
1990 * have a feeling strange problems would result. 1835 * have a feeling strange problems would result.
… …
2000/* 1845/*
2001 * present_arch(arch, map, x, y) searches for any objects with 1846 * present_arch(arch, map, x, y) searches for any objects with
2002 * a matching archetype at the given map and coordinates. 1847 * a matching archetype at the given map and coordinates.
2003 * The first matching object is returned, or NULL if none. 1848 * The first matching object is returned, or NULL if none.
2004 */ 1849 */
2005
2006object * 1850object *
2007present_arch (const archetype *at, mapstruct *m, int x, int y) 1851present_arch (const archetype *at, maptile *m, int x, int y)
2008{ 1852{
2009 object *
2010 tmp;
2011
2012 if (m == NULL || out_of_map (m, x, y)) 1853 if (!m || out_of_map (m, x, y))
2013 { 1854 {
2014 LOG (llevError, "Present_arch called outside map.\n"); 1855 LOG (llevError, "Present_arch called outside map.\n");
2015 return NULL; 1856 return NULL;
2016 } 1857 }
2017 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1858
1859 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2018 if (tmp->arch == at) 1860 if (tmp->arch == at)
2019 return tmp; 1861 return tmp;
1862
2020 return NULL; 1863 return NULL;
2021} 1864}
2022 1865
2023/* 1866/*
2024 * present(type, map, x, y) searches for any objects with 1867 * present(type, map, x, y) searches for any objects with
2025 * a matching type variable at the given map and coordinates. 1868 * a matching type variable at the given map and coordinates.
2026 * The first matching object is returned, or NULL if none. 1869 * The first matching object is returned, or NULL if none.
2027 */ 1870 */
2028
2029object * 1871object *
2030present (unsigned char type, mapstruct *m, int x, int y) 1872present (unsigned char type, maptile *m, int x, int y)
2031{ 1873{
2032 object *
2033 tmp;
2034
2035 if (out_of_map (m, x, y)) 1874 if (out_of_map (m, x, y))
2036 { 1875 {
2037 LOG (llevError, "Present called outside map.\n"); 1876 LOG (llevError, "Present called outside map.\n");
2038 return NULL; 1877 return NULL;
2039 } 1878 }
2040 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1879
1880 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2041 if (tmp->type == type) 1881 if (tmp->type == type)
2042 return tmp; 1882 return tmp;
1883
2043 return NULL; 1884 return NULL;
2044} 1885}
2045 1886
2046/* 1887/*
2047 * present_in_ob(type, object) searches for any objects with 1888 * present_in_ob(type, object) searches for any objects with
2048 * a matching type variable in the inventory of the given object. 1889 * a matching type variable in the inventory of the given object.
2049 * The first matching object is returned, or NULL if none. 1890 * The first matching object is returned, or NULL if none.
2050 */ 1891 */
2051
2052object * 1892object *
2053present_in_ob (unsigned char type, const object *op) 1893present_in_ob (unsigned char type, const object *op)
2054{ 1894{
2055 object *
2056 tmp;
2057
2058 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1895 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2059 if (tmp->type == type) 1896 if (tmp->type == type)
2060 return tmp; 1897 return tmp;
1898
2061 return NULL; 1899 return NULL;
2062} 1900}
2063 1901
2064/* 1902/*
2065 * present_in_ob (type, str, object) searches for any objects with 1903 * present_in_ob (type, str, object) searches for any objects with
… …
2073 * str is the string to match against. Note that we match against 1911 * str is the string to match against. Note that we match against
2074 * the object name, not the archetype name. this is so that the 1912 * the object name, not the archetype name. this is so that the
2075 * spell code can use one object type (force), but change it's name 1913 * spell code can use one object type (force), but change it's name
2076 * to be unique. 1914 * to be unique.
2077 */ 1915 */
2078
2079object * 1916object *
2080present_in_ob_by_name (int type, const char *str, const object *op) 1917present_in_ob_by_name (int type, const char *str, const object *op)
2081{ 1918{
2082 object *
2083 tmp;
2084
2085 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1919 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2086 {
2087 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1920 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2088 return tmp; 1921 return tmp;
2089 } 1922
2090 return NULL; 1923 return 0;
2091} 1924}
2092 1925
2093/* 1926/*
2094 * present_arch_in_ob(archetype, object) searches for any objects with 1927 * present_arch_in_ob(archetype, object) searches for any objects with
2095 * a matching archetype in the inventory of the given object. 1928 * a matching archetype in the inventory of the given object.
2096 * The first matching object is returned, or NULL if none. 1929 * The first matching object is returned, or NULL if none.
2097 */ 1930 */
2098
2099object * 1931object *
2100present_arch_in_ob (const archetype *at, const object *op) 1932present_arch_in_ob (const archetype *at, const object *op)
2101{ 1933{
2102 object *
2103 tmp;
2104
2105 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2106 if (tmp->arch == at) 1935 if (tmp->arch == at)
2107 return tmp; 1936 return tmp;
1937
2108 return NULL; 1938 return NULL;
2109} 1939}
2110 1940
2111/* 1941/*
2112 * activate recursively a flag on an object inventory 1942 * activate recursively a flag on an object inventory
2113 */ 1943 */
2114void 1944void
2115flag_inv (object *op, int flag) 1945flag_inv (object *op, int flag)
2116{ 1946{
2117 object *
2118 tmp;
2119
2120 if (op->inv) 1947 if (op->inv)
2121 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1948 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2122 { 1949 {
2123 SET_FLAG (tmp, flag); 1950 SET_FLAG (tmp, flag);
2124 flag_inv (tmp, flag); 1951 flag_inv (tmp, flag);
2125 } 1952 }
2126} /* 1953}
1954
1955/*
2127 * desactivate recursively a flag on an object inventory 1956 * deactivate recursively a flag on an object inventory
2128 */ 1957 */
2129void 1958void
2130unflag_inv (object *op, int flag) 1959unflag_inv (object *op, int flag)
2131{ 1960{
2132 object *
2133 tmp;
2134
2135 if (op->inv) 1961 if (op->inv)
2136 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1962 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2137 { 1963 {
2138 CLEAR_FLAG (tmp, flag); 1964 CLEAR_FLAG (tmp, flag);
2139 unflag_inv (tmp, flag); 1965 unflag_inv (tmp, flag);
2140 } 1966 }
2141}
2142
2143/*
2144 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2145 * all it's inventory (recursively).
2146 * If checksums are used, a player will get set_cheat called for
2147 * him/her-self and all object carried by a call to this function.
2148 */
2149
2150void
2151set_cheat (object *op)
2152{
2153 SET_FLAG (op, FLAG_WAS_WIZ);
2154 flag_inv (op, FLAG_WAS_WIZ);
2155} 1967}
2156 1968
2157/* 1969/*
2158 * find_free_spot(object, map, x, y, start, stop) will search for 1970 * find_free_spot(object, map, x, y, start, stop) will search for
2159 * a spot at the given map and coordinates which will be able to contain 1971 * a spot at the given map and coordinates which will be able to contain
… …
2173 * because arch_blocked (now ob_blocked) needs to know the movement type 1985 * because arch_blocked (now ob_blocked) needs to know the movement type
2174 * to know if the space in question will block the object. We can't use 1986 * to know if the space in question will block the object. We can't use
2175 * the archetype because that isn't correct if the monster has been 1987 * the archetype because that isn't correct if the monster has been
2176 * customized, changed states, etc. 1988 * customized, changed states, etc.
2177 */ 1989 */
2178
2179int 1990int
2180find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 1991find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181{ 1992{
2182 int
2183 i,
2184 index = 0, flag;
2185 static int
2186 altern[SIZEOFFREE]; 1993 int altern[SIZEOFFREE];
1994 int index = 0, flag;
2187 1995
2188 for (i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2189 { 1997 {
2190 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 mapxy pos (m, x, y); pos.move (i);
2191 if (!flag) 1999
2000 if (!pos.normalise ())
2001 continue;
2002
2003 mapspace &ms = *pos;
2004
2005 if (ms.flags () & P_IS_ALIVE)
2006 continue;
2007
2008 /* However, often
2009 * ob doesn't have any move type (when used to place exits)
2010 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2011 */
2012 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2013 {
2192 altern[index++] = i; 2014 altern [index++] = i;
2015 continue;
2016 }
2193 2017
2194 /* Basically, if we find a wall on a space, we cut down the search size. 2018 /* Basically, if we find a wall on a space, we cut down the search size.
2195 * In this way, we won't return spaces that are on another side of a wall. 2019 * In this way, we won't return spaces that are on another side of a wall.
2196 * This mostly work, but it cuts down the search size in all directions - 2020 * This mostly work, but it cuts down the search size in all directions -
2197 * if the space being examined only has a wall to the north and empty 2021 * if the space being examined only has a wall to the north and empty
2198 * spaces in all the other directions, this will reduce the search space 2022 * spaces in all the other directions, this will reduce the search space
2199 * to only the spaces immediately surrounding the target area, and 2023 * to only the spaces immediately surrounding the target area, and
2200 * won't look 2 spaces south of the target space. 2024 * won't look 2 spaces south of the target space.
2201 */ 2025 */
2202 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2026 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2027 {
2203 stop = maxfree[i]; 2028 stop = maxfree[i];
2029 continue;
2030 }
2031
2032 /* Note it is intentional that we check ob - the movement type of the
2033 * head of the object should correspond for the entire object.
2034 */
2035 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2036 continue;
2037
2038 altern [index++] = i;
2204 } 2039 }
2040
2205 if (!index) 2041 if (!index)
2206 return -1; 2042 return -1;
2043
2207 return altern[RANDOM () % index]; 2044 return altern [rndm (index)];
2208} 2045}
2209 2046
2210/* 2047/*
2211 * find_first_free_spot(archetype, mapstruct, x, y) works like 2048 * find_first_free_spot(archetype, maptile, x, y) works like
2212 * find_free_spot(), but it will search max number of squares. 2049 * find_free_spot(), but it will search max number of squares.
2213 * But it will return the first available spot, not a random choice. 2050 * But it will return the first available spot, not a random choice.
2214 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2051 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2215 */ 2052 */
2216
2217int 2053int
2218find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2054find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219{ 2055{
2220 int
2221 i;
2222
2223 for (i = 0; i < SIZEOFFREE; i++) 2056 for (int i = 0; i < SIZEOFFREE; i++)
2224 {
2225 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2057 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2226 return i; 2058 return i;
2227 } 2059
2228 return -1; 2060 return -1;
2229} 2061}
2230 2062
2231/* 2063/*
2232 * The function permute(arr, begin, end) randomly reorders the array 2064 * The function permute(arr, begin, end) randomly reorders the array
2233 * arr[begin..end-1]. 2065 * arr[begin..end-1].
2066 * now uses a fisher-yates shuffle, old permute was broken
2234 */ 2067 */
2235static void 2068static void
2236permute (int *arr, int begin, int end) 2069permute (int *arr, int begin, int end)
2237{ 2070{
2238 int 2071 arr += begin;
2239 i,
2240 j,
2241 tmp,
2242 len;
2243
2244 len = end - begin; 2072 end -= begin;
2245 for (i = begin; i < end; i++)
2246 {
2247 j = begin + RANDOM () % len;
2248 2073
2249 tmp = arr[i]; 2074 while (--end)
2250 arr[i] = arr[j]; 2075 swap (arr [end], arr [rndm (end + 1)]);
2251 arr[j] = tmp;
2252 }
2253} 2076}
2254 2077
2255/* new function to make monster searching more efficient, and effective! 2078/* new function to make monster searching more efficient, and effective!
2256 * This basically returns a randomized array (in the passed pointer) of 2079 * This basically returns a randomized array (in the passed pointer) of
2257 * the spaces to find monsters. In this way, it won't always look for 2080 * the spaces to find monsters. In this way, it won't always look for
… …
2260 * the 3x3 area will be searched, just not in a predictable order. 2083 * the 3x3 area will be searched, just not in a predictable order.
2261 */ 2084 */
2262void 2085void
2263get_search_arr (int *search_arr) 2086get_search_arr (int *search_arr)
2264{ 2087{
2265 int 2088 int i;
2266 i;
2267 2089
2268 for (i = 0; i < SIZEOFFREE; i++) 2090 for (i = 0; i < SIZEOFFREE; i++)
2269 {
2270 search_arr[i] = i; 2091 search_arr[i] = i;
2271 }
2272 2092
2273 permute (search_arr, 1, SIZEOFFREE1 + 1); 2093 permute (search_arr, 1, SIZEOFFREE1 + 1);
2274 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2094 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2275 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2095 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2276} 2096}
… …
2285 * Perhaps incorrectly, but I'm making the assumption that exclude 2105 * Perhaps incorrectly, but I'm making the assumption that exclude
2286 * is actually want is going to try and move there. We need this info 2106 * is actually want is going to try and move there. We need this info
2287 * because we have to know what movement the thing looking to move 2107 * because we have to know what movement the thing looking to move
2288 * there is capable of. 2108 * there is capable of.
2289 */ 2109 */
2290
2291int 2110int
2292find_dir (mapstruct *m, int x, int y, object *exclude) 2111find_dir (maptile *m, int x, int y, object *exclude)
2293{ 2112{
2294 int
2295 i,
2296 max = SIZEOFFREE, mflags; 2113 int i, max = SIZEOFFREE, mflags;
2297 2114
2298 sint16 nx, ny; 2115 sint16 nx, ny;
2299 object * 2116 object *tmp;
2300 tmp; 2117 maptile *mp;
2301 mapstruct *
2302 mp;
2303 2118
2304 MoveType blocked, move_type; 2119 MoveType blocked, move_type;
2305 2120
2306 if (exclude && exclude->head) 2121 if (exclude && exclude->head_ () != exclude)
2307 { 2122 {
2308 exclude = exclude->head; 2123 exclude = exclude->head;
2309 move_type = exclude->move_type; 2124 move_type = exclude->move_type;
2310 } 2125 }
2311 else 2126 else
… …
2319 mp = m; 2134 mp = m;
2320 nx = x + freearr_x[i]; 2135 nx = x + freearr_x[i];
2321 ny = y + freearr_y[i]; 2136 ny = y + freearr_y[i];
2322 2137
2323 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2138 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2139
2324 if (mflags & P_OUT_OF_MAP) 2140 if (mflags & P_OUT_OF_MAP)
2325 {
2326 max = maxfree[i]; 2141 max = maxfree[i];
2327 }
2328 else 2142 else
2329 { 2143 {
2330 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2144 mapspace &ms = mp->at (nx, ny);
2145
2146 blocked = ms.move_block;
2331 2147
2332 if ((move_type & blocked) == move_type) 2148 if ((move_type & blocked) == move_type)
2333 {
2334 max = maxfree[i]; 2149 max = maxfree[i];
2335 }
2336 else if (mflags & P_IS_ALIVE) 2150 else if (mflags & P_IS_ALIVE)
2337 { 2151 {
2338 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2152 for (tmp = ms.bot; tmp; tmp = tmp->above)
2339 { 2153 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2340 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2154 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2341 {
2342 break; 2155 break;
2343 } 2156
2344 }
2345 if (tmp) 2157 if (tmp)
2346 {
2347 return freedir[i]; 2158 return freedir[i];
2348 }
2349 } 2159 }
2350 } 2160 }
2351 } 2161 }
2162
2352 return 0; 2163 return 0;
2353} 2164}
2354 2165
2355/* 2166/*
2356 * distance(object 1, object 2) will return the square of the 2167 * distance(object 1, object 2) will return the square of the
2357 * distance between the two given objects. 2168 * distance between the two given objects.
2358 */ 2169 */
2359
2360int 2170int
2361distance (const object *ob1, const object *ob2) 2171distance (const object *ob1, const object *ob2)
2362{ 2172{
2363 int
2364 i;
2365
2366 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2173 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2367 return i;
2368} 2174}
2369 2175
2370/* 2176/*
2371 * find_dir_2(delta-x,delta-y) will return a direction in which 2177 * find_dir_2(delta-x,delta-y) will return a direction in which
2372 * an object which has subtracted the x and y coordinates of another 2178 * an object which has subtracted the x and y coordinates of another
2373 * object, needs to travel toward it. 2179 * object, needs to travel toward it.
2374 */ 2180 */
2375
2376int 2181int
2377find_dir_2 (int x, int y) 2182find_dir_2 (int x, int y)
2378{ 2183{
2379 int 2184 int q;
2380 q;
2381 2185
2382 if (y) 2186 if (y)
2383 q = x * 100 / y; 2187 q = x * 100 / y;
2384 else if (x) 2188 else if (x)
2385 q = -300 * x; 2189 q = -300 * x;
… …
2410 2214
2411 return 3; 2215 return 3;
2412} 2216}
2413 2217
2414/* 2218/*
2415 * absdir(int): Returns a number between 1 and 8, which represent
2416 * the "absolute" direction of a number (it actually takes care of
2417 * "overflow" in previous calculations of a direction).
2418 */
2419
2420int
2421absdir (int d)
2422{
2423 while (d < 1)
2424 d += 8;
2425 while (d > 8)
2426 d -= 8;
2427 return d;
2428}
2429
2430/*
2431 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2432 * between two directions (which are expected to be absolute (see absdir()) 2220 * between two directions (which are expected to be absolute (see absdir())
2433 */ 2221 */
2434
2435int 2222int
2436dirdiff (int dir1, int dir2) 2223dirdiff (int dir1, int dir2)
2437{ 2224{
2438 int 2225 int d;
2439 d;
2440 2226
2441 d = abs (dir1 - dir2); 2227 d = abs (dir1 - dir2);
2442 if (d > 4) 2228 if (d > 4)
2443 d = 8 - d; 2229 d = 8 - d;
2230
2444 return d; 2231 return d;
2445} 2232}
2446 2233
2447/* peterm: 2234/* peterm:
2448 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2235 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2451 * This basically means that if direction is 15, then it could either go 2238 * This basically means that if direction is 15, then it could either go
2452 * direction 4, 14, or 16 to get back to where we are. 2239 * direction 4, 14, or 16 to get back to where we are.
2453 * Moved from spell_util.c to object.c with the other related direction 2240 * Moved from spell_util.c to object.c with the other related direction
2454 * functions. 2241 * functions.
2455 */ 2242 */
2456
2457int
2458 reduction_dir[SIZEOFFREE][3] = { 2243int reduction_dir[SIZEOFFREE][3] = {
2459 {0, 0, 0}, /* 0 */ 2244 {0, 0, 0}, /* 0 */
2460 {0, 0, 0}, /* 1 */ 2245 {0, 0, 0}, /* 1 */
2461 {0, 0, 0}, /* 2 */ 2246 {0, 0, 0}, /* 2 */
2462 {0, 0, 0}, /* 3 */ 2247 {0, 0, 0}, /* 3 */
2463 {0, 0, 0}, /* 4 */ 2248 {0, 0, 0}, /* 4 */
… …
2511 * find a path to that monster that we found. If not, 2296 * find a path to that monster that we found. If not,
2512 * we don't bother going toward it. Returns 1 if we 2297 * we don't bother going toward it. Returns 1 if we
2513 * can see a direct way to get it 2298 * can see a direct way to get it
2514 * Modified to be map tile aware -.MSW 2299 * Modified to be map tile aware -.MSW
2515 */ 2300 */
2516
2517
2518int 2301int
2519can_see_monsterP (mapstruct *m, int x, int y, int dir) 2302can_see_monsterP (maptile *m, int x, int y, int dir)
2520{ 2303{
2521 sint16 dx, dy; 2304 sint16 dx, dy;
2522 int
2523 mflags; 2305 int mflags;
2524 2306
2525 if (dir < 0) 2307 if (dir < 0)
2526 return 0; /* exit condition: invalid direction */ 2308 return 0; /* exit condition: invalid direction */
2527 2309
2528 dx = x + freearr_x[dir]; 2310 dx = x + freearr_x[dir];
… …
2541 return 0; 2323 return 0;
2542 2324
2543 /* yes, can see. */ 2325 /* yes, can see. */
2544 if (dir < 9) 2326 if (dir < 9)
2545 return 1; 2327 return 1;
2328
2546 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2329 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2547 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2330 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2331 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2548} 2332}
2549
2550
2551 2333
2552/* 2334/*
2553 * can_pick(picker, item): finds out if an object is possible to be 2335 * can_pick(picker, item): finds out if an object is possible to be
2554 * picked up by the picker. Returnes 1 if it can be 2336 * picked up by the picker. Returnes 1 if it can be
2555 * picked up, otherwise 0. 2337 * picked up, otherwise 0.
… …
2557 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2339 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2558 * core dumps if they do. 2340 * core dumps if they do.
2559 * 2341 *
2560 * Add a check so we can't pick up invisible objects (0.93.8) 2342 * Add a check so we can't pick up invisible objects (0.93.8)
2561 */ 2343 */
2562
2563int 2344int
2564can_pick (const object *who, const object *item) 2345can_pick (const object *who, const object *item)
2565{ 2346{
2566 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2347 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2567 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2348 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2568 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2349 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2569} 2350}
2570 2351
2571
2572/* 2352/*
2573 * create clone from object to another 2353 * create clone from object to another
2574 */ 2354 */
2575object * 2355object *
2576object_create_clone (object *asrc) 2356object_create_clone (object *asrc)
2577{ 2357{
2578 object *
2579 dst = NULL, *tmp, *src, *part, *prev, *item; 2358 object *dst = 0, *tmp, *src, *prev, *item;
2580 2359
2581 if (!asrc) 2360 if (!asrc)
2582 return NULL; 2361 return 0;
2583 src = asrc; 2362
2584 if (src->head)
2585 src = src->head; 2363 src = asrc->head_ ();
2586 2364
2587 prev = NULL; 2365 prev = 0;
2588 for (part = src; part; part = part->more) 2366 for (object *part = src; part; part = part->more)
2589 { 2367 {
2590 tmp = get_object (); 2368 tmp = part->clone ();
2591 copy_object (part, tmp);
2592 tmp->x -= src->x; 2369 tmp->x -= src->x;
2593 tmp->y -= src->y; 2370 tmp->y -= src->y;
2371
2594 if (!part->head) 2372 if (!part->head)
2595 { 2373 {
2596 dst = tmp; 2374 dst = tmp;
2597 tmp->head = NULL; 2375 tmp->head = 0;
2598 } 2376 }
2599 else 2377 else
2600 {
2601 tmp->head = dst; 2378 tmp->head = dst;
2602 } 2379
2603 tmp->more = NULL; 2380 tmp->more = 0;
2381
2604 if (prev) 2382 if (prev)
2605 prev->more = tmp; 2383 prev->more = tmp;
2384
2606 prev = tmp; 2385 prev = tmp;
2607 } 2386 }
2608 2387
2609 /*** copy inventory ***/
2610 for (item = src->inv; item; item = item->below) 2388 for (item = src->inv; item; item = item->below)
2611 {
2612 (void) insert_ob_in_ob (object_create_clone (item), dst); 2389 insert_ob_in_ob (object_create_clone (item), dst);
2613 }
2614 2390
2615 return dst; 2391 return dst;
2616}
2617
2618/* return true if the object was destroyed, 0 otherwise */
2619int
2620was_destroyed (const object *op, tag_t old_tag)
2621{
2622 /* checking for FLAG_FREED isn't necessary, but makes this function more
2623 * robust */
2624 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625}
2626
2627/* GROS - Creates an object using a string representing its content. */
2628
2629/* Basically, we save the content of the string to a temp file, then call */
2630
2631/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633/* but it was simple to make and allows reusing the load_object function. */
2634
2635/* Remember not to use load_object_str in a time-critical situation. */
2636
2637/* Also remember that multiparts objects are not supported for now. */
2638
2639object *
2640load_object_str (const char *obstr)
2641{
2642 object *
2643 op;
2644 char
2645 filename[MAX_BUF];
2646
2647 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648
2649 FILE *
2650 tempfile = fopen (filename, "w");
2651
2652 if (tempfile == NULL)
2653 {
2654 LOG (llevError, "Error - Unable to access load object temp file\n");
2655 return NULL;
2656 };
2657 fprintf (tempfile, obstr);
2658 fclose (tempfile);
2659
2660 op = get_object ();
2661
2662 object_thawer thawer (filename);
2663
2664 if (thawer)
2665 load_object (thawer, op, 0);
2666
2667 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2668 CLEAR_FLAG (op, FLAG_REMOVED);
2669
2670 return op;
2671} 2392}
2672 2393
2673/* This returns the first object in who's inventory that 2394/* This returns the first object in who's inventory that
2674 * has the same type and subtype match. 2395 * has the same type and subtype match.
2675 * returns NULL if no match. 2396 * returns NULL if no match.
2676 */ 2397 */
2677object * 2398object *
2678find_obj_by_type_subtype (const object *who, int type, int subtype) 2399find_obj_by_type_subtype (const object *who, int type, int subtype)
2679{ 2400{
2680 object *
2681 tmp;
2682
2683 for (tmp = who->inv; tmp; tmp = tmp->below) 2401 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2684 if (tmp->type == type && tmp->subtype == subtype) 2402 if (tmp->type == type && tmp->subtype == subtype)
2685 return tmp; 2403 return tmp;
2686 2404
2687 return NULL; 2405 return 0;
2688} 2406}
2689 2407
2690/* If ob has a field named key, return the link from the list, 2408/* If ob has a field named key, return the link from the list,
2691 * otherwise return NULL. 2409 * otherwise return NULL.
2692 * 2410 *
… …
2694 * do the desired thing. 2412 * do the desired thing.
2695 */ 2413 */
2696key_value * 2414key_value *
2697get_ob_key_link (const object *ob, const char *key) 2415get_ob_key_link (const object *ob, const char *key)
2698{ 2416{
2699 key_value *
2700 link;
2701
2702 for (link = ob->key_values; link != NULL; link = link->next) 2417 for (key_value *link = ob->key_values; link; link = link->next)
2703 {
2704 if (link->key == key) 2418 if (link->key == key)
2705 {
2706 return link; 2419 return link;
2707 }
2708 }
2709 2420
2710 return NULL; 2421 return 0;
2711} 2422}
2712 2423
2713/* 2424/*
2714 * Returns the value of op has an extra_field for key, or NULL. 2425 * Returns the value of op has an extra_field for key, or NULL.
2715 * 2426 *
… …
2718 * The returned string is shared. 2429 * The returned string is shared.
2719 */ 2430 */
2720const char * 2431const char *
2721get_ob_key_value (const object *op, const char *const key) 2432get_ob_key_value (const object *op, const char *const key)
2722{ 2433{
2723 key_value * 2434 key_value *link;
2724 link; 2435 shstr_cmp canonical_key (key);
2725 const char *
2726 canonical_key;
2727 2436
2728 canonical_key = shstr::find (key);
2729
2730 if (canonical_key == NULL) 2437 if (!canonical_key)
2731 { 2438 {
2732 /* 1. There being a field named key on any object 2439 /* 1. There being a field named key on any object
2733 * implies there'd be a shared string to find. 2440 * implies there'd be a shared string to find.
2734 * 2. Since there isn't, no object has this field. 2441 * 2. Since there isn't, no object has this field.
2735 * 3. Therefore, *this* object doesn't have this field. 2442 * 3. Therefore, *this* object doesn't have this field.
2736 */ 2443 */
2737 return NULL; 2444 return 0;
2738 } 2445 }
2739 2446
2740 /* This is copied from get_ob_key_link() above - 2447 /* This is copied from get_ob_key_link() above -
2741 * only 4 lines, and saves the function call overhead. 2448 * only 4 lines, and saves the function call overhead.
2742 */ 2449 */
2743 for (link = op->key_values; link != NULL; link = link->next) 2450 for (link = op->key_values; link; link = link->next)
2744 {
2745 if (link->key == canonical_key) 2451 if (link->key == canonical_key)
2746 {
2747 return link->value; 2452 return link->value;
2748 } 2453
2749 }
2750 return NULL; 2454 return 0;
2751} 2455}
2752
2753 2456
2754/* 2457/*
2755 * Updates the canonical_key in op to value. 2458 * Updates the canonical_key in op to value.
2756 * 2459 *
2757 * canonical_key is a shared string (value doesn't have to be). 2460 * canonical_key is a shared string (value doesn't have to be).
… …
2762 * Returns TRUE on success. 2465 * Returns TRUE on success.
2763 */ 2466 */
2764int 2467int
2765set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2468set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2766{ 2469{
2767 key_value *
2768 field = NULL, *last = NULL; 2470 key_value *field = NULL, *last = NULL;
2769 2471
2770 for (field = op->key_values; field != NULL; field = field->next) 2472 for (field = op->key_values; field != NULL; field = field->next)
2771 { 2473 {
2772 if (field->key != canonical_key) 2474 if (field->key != canonical_key)
2773 { 2475 {
… …
2782 /* Basically, if the archetype has this key set, 2484 /* Basically, if the archetype has this key set,
2783 * we need to store the null value so when we save 2485 * we need to store the null value so when we save
2784 * it, we save the empty value so that when we load, 2486 * it, we save the empty value so that when we load,
2785 * we get this value back again. 2487 * we get this value back again.
2786 */ 2488 */
2787 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2489 if (get_ob_key_link (op->arch, canonical_key))
2788 field->value = 0; 2490 field->value = 0;
2789 else 2491 else
2790 { 2492 {
2791 if (last) 2493 if (last)
2792 last->next = field->next; 2494 last->next = field->next;
… …
2801 /* IF we get here, key doesn't exist */ 2503 /* IF we get here, key doesn't exist */
2802 2504
2803 /* No field, we'll have to add it. */ 2505 /* No field, we'll have to add it. */
2804 2506
2805 if (!add_key) 2507 if (!add_key)
2806 {
2807 return FALSE; 2508 return FALSE;
2808 } 2509
2809 /* There isn't any good reason to store a null 2510 /* There isn't any good reason to store a null
2810 * value in the key/value list. If the archetype has 2511 * value in the key/value list. If the archetype has
2811 * this key, then we should also have it, so shouldn't 2512 * this key, then we should also have it, so shouldn't
2812 * be here. If user wants to store empty strings, 2513 * be here. If user wants to store empty strings,
2813 * should pass in "" 2514 * should pass in ""
… …
2840{ 2541{
2841 shstr key_ (key); 2542 shstr key_ (key);
2842 2543
2843 return set_ob_key_value_s (op, key_, value, add_key); 2544 return set_ob_key_value_s (op, key_, value, add_key);
2844} 2545}
2546
2547object::depth_iterator::depth_iterator (object *container)
2548: iterator_base (container)
2549{
2550 while (item->inv)
2551 item = item->inv;
2552}
2553
2554void
2555object::depth_iterator::next ()
2556{
2557 if (item->below)
2558 {
2559 item = item->below;
2560
2561 while (item->inv)
2562 item = item->inv;
2563 }
2564 else
2565 item = item->env;
2566}
2567
2568const char *
2569object::flag_desc (char *desc, int len) const
2570{
2571 char *p = desc;
2572 bool first = true;
2573
2574 *p = 0;
2575
2576 for (int i = 0; i < NUM_FLAGS; i++)
2577 {
2578 if (len <= 10) // magic constant!
2579 {
2580 snprintf (p, len, ",...");
2581 break;
2582 }
2583
2584 if (flag [i])
2585 {
2586 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2587 len -= cnt;
2588 p += cnt;
2589 first = false;
2590 }
2591 }
2592
2593 return desc;
2594}
2595
2596// return a suitable string describing an object in enough detail to find it
2597const char *
2598object::debug_desc (char *info) const
2599{
2600 char flagdesc[512];
2601 char info2[256 * 4];
2602 char *p = info;
2603
2604 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2605 count, uuid.seq,
2606 &name,
2607 title ? "\",title:\"" : "",
2608 title ? (const char *)title : "",
2609 flag_desc (flagdesc, 512), type);
2610
2611 if (!this->flag[FLAG_REMOVED] && env)
2612 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2613
2614 if (map)
2615 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2616
2617 return info;
2618}
2619
2620const char *
2621object::debug_desc () const
2622{
2623 static char info[3][256 * 4];
2624 static int info_idx;
2625
2626 return debug_desc (info [++info_idx % 3]);
2627}
2628
2629struct region *
2630object::region () const
2631{
2632 return map ? map->region (x, y)
2633 : region::default_region ();
2634}
2635
2636const materialtype_t *
2637object::dominant_material () const
2638{
2639 if (materialtype_t *mt = name_to_material (materialname))
2640 return mt;
2641
2642 return name_to_material (shstr_unknown);
2643}
2644
2645void
2646object::open_container (object *new_container)
2647{
2648 if (container == new_container)
2649 return;
2650
2651 if (object *old_container = container)
2652 {
2653 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2654 return;
2655
2656#if 0
2657 // remove the "Close old_container" object.
2658 if (object *closer = old_container->inv)
2659 if (closer->type == CLOSE_CON)
2660 closer->destroy ();
2661#endif
2662
2663 old_container->flag [FLAG_APPLIED] = 0;
2664 container = 0;
2665
2666 esrv_update_item (UPD_FLAGS, this, old_container);
2667 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2668 play_sound (sound_find ("chest_close"));
2669 }
2670
2671 if (new_container)
2672 {
2673 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2674 return;
2675
2676 // TODO: this does not seem to serve any purpose anymore?
2677#if 0
2678 // insert the "Close Container" object.
2679 if (archetype *closer = new_container->other_arch)
2680 {
2681 object *closer = arch_to_object (new_container->other_arch);
2682 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2683 new_container->insert (closer);
2684 }
2685#endif
2686
2687 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2688
2689 new_container->flag [FLAG_APPLIED] = 1;
2690 container = new_container;
2691
2692 esrv_update_item (UPD_FLAGS, this, new_container);
2693 esrv_send_inventory (this, new_container);
2694 play_sound (sound_find ("chest_open"));
2695 }
2696}
2697
2698object *
2699object::force_find (const shstr name)
2700{
2701 /* cycle through his inventory to look for the MARK we want to
2702 * place
2703 */
2704 for (object *tmp = inv; tmp; tmp = tmp->below)
2705 if (tmp->type == FORCE && tmp->slaying == name)
2706 return splay (tmp);
2707
2708 return 0;
2709}
2710
2711void
2712object::force_add (const shstr name, int duration)
2713{
2714 if (object *force = force_find (name))
2715 force->destroy ();
2716
2717 object *force = get_archetype (FORCE_NAME);
2718
2719 force->slaying = name;
2720 force->stats.food = 1;
2721 force->speed_left = -1.f;
2722
2723 force->set_speed (duration ? 1.f / duration : 0.f);
2724 force->flag [FLAG_IS_USED_UP] = true;
2725 force->flag [FLAG_APPLIED] = true;
2726
2727 insert (force);
2728}
2729
2730void
2731object::play_sound (faceidx sound) const
2732{
2733 if (!sound)
2734 return;
2735
2736 if (flag [FLAG_REMOVED])
2737 return;
2738
2739 if (env)
2740 {
2741 if (object *pl = in_player ())
2742 pl->contr->play_sound (sound);
2743 }
2744 else
2745 map->play_sound (sound, x, y);
2746}
2747

Diff Legend

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