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.105 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines