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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines