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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines