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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines