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.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

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

Diff Legend

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