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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines