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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines