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.69 by root, Mon Dec 18 03:00:02 2006 UTC vs.
Revision 1.289 by root, Sun Oct 11 05:31:54 2009 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines