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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines