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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines