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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.268 by root, Fri Dec 26 13:33:22 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines