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.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.291 by root, Mon Oct 12 14:00:57 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines