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.78 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines