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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines