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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines