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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines