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.96 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines