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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines