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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines