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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines