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.249 by root, Tue Jul 15 20:41:58 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines