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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines