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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines