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.64 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.265 by root, Tue Dec 23 00:39:48 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines