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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines